FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into shader_pipeline

Browse Source
This commit is contained in:
Robert Osfield 2017-12-03 14:27:41 +00:00
commit d0d00eafa8
3 changed files with 172 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
AUTHORS.txt
View File

@ -1,4 +1,4 @@
OpenSceneGraph Library 3.5.9
OpenSceneGraph Library 3.5.10
568 Contributors:
@ -8,11 +8,11 @@ Robert Osfield
Stephan Huber
Paul Martz
Farshid Lashkari
Mathias Fröhlich
Mathias Frhlich
Laurens Voerman
Marco Jez
Wang Rui
Jean-Sébastien Guay
Jean-Sbastien Guay
Ulrich Hertlein
Mike Weiblen
Sukender
@ -48,6 +48,7 @@ Magnus Kessler
David Fries
Tom Jolley
Paul Melis
Jordi Torres
Luc Frauciel
Aurelien Albert
Torben Dannhauer
@ -65,11 +66,11 @@ Norman Vine
Chris Denham
Sherman Wilcox
Serge Lages
Romano José Magacho da Silva
Romano Jos Magacho da Silva
Mourad Boufarguine
Alberto Farre
Glenn Waldron
André Garneau
Andr Garneau
Adrian Egli
Sebastian Messerschmidt
Randall Hopper
@ -84,7 +85,7 @@ Michael Gronager
Martin Naylor
Joakim Simonsson
David Spilling
Daniel Sjölie
Daniel Sjlie
Bryan Thrall
Andreas Ekstrand
Rafa Gaitan
@ -94,7 +95,6 @@ Fabien Lavignotte
Thomas Hogarth
Riccardo Corsi
Melchior Franz
Jordi Torres
Johannes Baeuerle
Neil Hughes
Martin Beckett
@ -122,7 +122,7 @@ Gordon Tomlinson
Frederic Marmond
Frederic Bouvier
Carlo Camporesi
Björn Blissing
Bjrn Blissing
Alexander Sinditskiy
Vladimir Chebaev
Thibault Genessay
@ -141,7 +141,7 @@ Uwe Woessner
Tony Horrobin
Thom DeCarlo
Tatsuhiro Nishioka
Tanguy Fautré
Tanguy Fautr
Sean Spicer
Ryan Kawicki
Richard Schmidt
@ -202,7 +202,7 @@ Phil Atkin
Pawel Ksiezopolski
Patrick Neary
Nathan Monteleone
Miha Rav¨elj
Miha Ravelj
Miguel Escriva
Mattias Linde
Mark Sciabica
@ -234,8 +234,8 @@ Christian Ruzicka
Christian Buchner
Charles Cole
Blake Williams
Björn Hein
Aurélien Chatelain
Bjrn Hein
Aurlien Chatelain
Antoine Hue
Andrew Bettison
Andreas Henne
@ -264,7 +264,7 @@ Paul Obermeier
Nguyen Van Truong
Nathan Cournia
Morten Haukness
Morné Pistorius
Morn Pistorius
Michael Mc Donnell
Michael Henheffer
Michael Guerrero
@ -297,7 +297,7 @@ Guillaume Taze
Guillaume Chouvenc
Giuseppe Donvito
Gill Peacegood
Giampaolo Viganò
Giampaolo Vigan
Gerrick Bivins
George Tarantilis
Ferdi Smit
@ -305,7 +305,7 @@ Eduardo Poyart
Edgar Ellis
Dmitry Marakasov
Dimi Christopoulos
Diane Delallée
Diane Delalle
David Longest
David Ergo
Daniel Trstenjak
@ -337,7 +337,7 @@ Vasily Radostev
Valery Bickov
Valeriy Dubov
Vaclav Bilek
Tyge Løvset
Tyge Lvset
Troy Yee
Torben Dannahauer
Tony Vasile
@ -387,7 +387,7 @@ Piotr Rak
Pierre Bourdin
Philipp Svehla
Philipp Siemoleit
Philipp Mächler
Philipp Mchler
Philip Lamb
Petr Salinger
Peter Bear
@ -412,7 +412,7 @@ Nick Thu
Nick Black
Mojtaba Fathi
Mirko Viviani
Mikkel Gjøl
Mikkel Gjl
Mike Krus
Mike Garrity
Mick Thu
@ -465,7 +465,7 @@ Juan Hernando
Josh Portway
Jonathan Greig
John Tan
John Hedström
John Hedstrm
John Grant
John Farrier
John Donovan
@ -524,11 +524,11 @@ David Jung
Danny Valente
Daniel Stien
Dan Minor
César L. B. Silveira
Csar L. B. Silveira
Cyril Brulebois
Curtis Rubel
Cory Slep
Clément B½sch
Clment Bsch
Clay Fowler
Claus Steuer
Chuck Sembroski

149
ChangeLog
View File

@ -1,3 +1,152 @@
Sun, 3 Dec 2017 11:17:34 +0000
Author : Robert Osfield
Renamed chanels to array to be consistent with the rest of the usage
Sun, 3 Dec 2017 11:12:20 +0000
Author : OpenSceneGraph git repository
Merge pull request #398 from marchelbling/sharedarrayoptimizer-fixImprove SharedArrayOptimizer
Sun, 3 Dec 2017 10:49:39 +0000
Author : Robert Osfield
Removed redundent !ps
Sun, 3 Dec 2017 09:49:09 +0000
Author : Robert Osfield
Removed unused local variable and associated typedef
Sun, 3 Dec 2017 09:45:37 +0000
Author : Robert Osfield
Quietened down cppcheck false positive.
Sun, 3 Dec 2017 09:38:32 +0000
Author : Robert Osfield
Fixed leak and clean up formatting.
Sun, 3 Dec 2017 09:34:43 +0000
Author : Robert Osfield
From Jordi Torres, fixed leak and inappropriate read bug
Sun, 3 Dec 2017 09:32:50 +0000
Author : Robert Osfield
From Jordi Torres, removed unused local variable
Sun, 3 Dec 2017 09:30:35 +0000
Author : Robert Osfield
From Jordi Torres, fix indentation and removed redundent break;
Sun, 3 Dec 2017 09:27:41 +0000
Author : Robert Osfield
From Jordi Torres, added ref_ptr<> usage to quieten cppcheck false positive
Sat, 2 Dec 2017 18:07:13 +0000
Author : Robert Osfield
From Jordi Torres, removed unused local variables
Sat, 2 Dec 2017 18:04:43 +0000
Author : Robert Osfield
From Jordi Torres, removed unused local variables
Sat, 2 Dec 2017 18:00:03 +0000
Author : Robert Osfield
From Jordi Torres, Removed unused local variables
Sat, 2 Dec 2017 17:58:17 +0000
Author : Robert Osfield
From Jordi Torres, removed unused local variables
Sat, 2 Dec 2017 17:52:47 +0000
Author : Robert Osfield
From Jordi Torres, removed unused local variables
Sat, 2 Dec 2017 17:42:53 +0000
Author : Robert Osfield
Commented out unused local variables
Sat, 2 Dec 2017 17:41:27 +0000
Author : Robert Osfield
From Jordi Torres, removed unused local variable
Sat, 2 Dec 2017 17:35:36 +0000
Author : Robert Osfield
Fixed string parsing and substituion bugs isn substitudeEnvVars(..)
Sat, 2 Dec 2017 17:08:14 +0000
Author : Robert Osfield
From Jordi Torres, removed unused local variables
Sat, 2 Dec 2017 16:49:47 +0000
Author : Jordi Torres
same values in || so one of them not needed
Sat, 2 Dec 2017 16:35:16 +0000
Author : Robert Osfield
Improved readaibility of text by removing redundent indirection.
Sat, 2 Dec 2017 16:20:34 +0000
Author : Robert Osfield
Fixes for cppcheck reported issues
Fri, 1 Dec 2017 12:26:00 +0100
Author : Marc Helbling
Improve SharedArrayOptimizerWhen an array is shared within and outside a geometry, it's still worth it and safe
to recreate the reference within each individual geometry.
Thu, 30 Nov 2017 14:13:21 +0000
Author : OpenSceneGraph git repository
Merge pull request #396 from bjornblissing/feature/DPIAwareScalingApplications declared as DPI-aware in the Windows environment
Thu, 30 Nov 2017 14:12:05 +0000
Author : OpenSceneGraph git repository
Added return to last line
Thu, 30 Nov 2017 12:48:47 +0000
Author : Robert Osfield
Quieted down dubug output
Thu, 30 Nov 2017 13:00:54 +0100
Author : Björn Blissing
Applications declared DPI-aware in the Windows environmentApplications that run on a Windows computer with desktop scaling enabled
gets scaled incorrectly since windows assumes that applications are
DPI-unaware unless declared otherwise.
This change declares the application DPI-aware, thus not automatically
scaled by the operating system.
The corresponding library call requires Windows 8.1 or later.
Thu, 30 Nov 2017 12:53:24 +0100
Author : Björn Blissing
Added script to identify Windows versionAdded script to identify the Windows version used to compile the source.
Currently the windows version for Windows NT is hard coded into the
source. By running this CMake script the _WIN32_WINNT preprocessor
variable gets set to the corresponding windows version.
Thu, 30 Nov 2017 12:47:57 +0100
Author : Björn Blissing
Removed unnecessary define in FileUtilsThe define of _WIN32_WINNT was added to handle an error case from MinGW
,as described in commit 712ca432196cd797cc3c265adb2847465551461f
This was later giving warnings and thus undefined for MinGW by commit
3bf6fb1778687c45d389b91675b55f709ef1f67b
Since the two operations cancel each other out, they should be removed.
Wed, 29 Nov 2017 21:20:10 +0000
Author : Robert Osfield
Typo fix
Wed, 29 Nov 2017 15:06:53 +0000
Author : Robert Osfield
Update version to 3.5.10
Wed, 29 Nov 2017 14:49:00 +0000
Author : Robert Osfield
Updated ChangeLog and AUTHORS for 3.5.9 dev release
Wed, 29 Nov 2017 14:44:00 +0000
Author : Robert Osfield
Fixed build with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF

3
applications/osgversion/Contributors.cpp
View File

@ -279,7 +279,8 @@ const char* invalidNames[] =
"StreamOperator",
"SceneLoader",
"OpenGL",
"FindLIBLAS"
"FindLIBLAS",
"MinGW"
};