diff --git a/AUTHORS.txt b/AUTHORS.txt index c62346cd8..8805e87db 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ -OpenSceneGraph Library 3.3.4 +OpenSceneGraph Library 3.3.5 -542 Contributors: +543 Contributors: Firstname Surname ----------------- @@ -197,6 +197,7 @@ Piotr Domagalski Phil Atkin Pawel Ksiezopolski Nathan Monteleone +Miha Rav¨elj Miguel Escriva Mattias Linde Mark Sciabica @@ -208,6 +209,7 @@ Ken Sewell Julian Ortiz Julen Garcia John Kaniarz +Johannes Scholz Jim Vaughan Jeremy Bell Jaromir Vitek @@ -259,7 +261,7 @@ Nguyen Van Truong Nathan Cournia Morten Haukness Morné Pistorius -Miha Rav¨elj +Michael Mc Donnell Michael Henheffer Michael Guerrero Maya Leonard @@ -279,7 +281,6 @@ Kevin Moiule Keith Steffen Joseph Winston John Aughey -Johannes Scholz Joachim Pouderoux Jean-Christophe Lombardo Jan Klimke @@ -407,7 +408,6 @@ Michal Durkovic Michael Schanne Michael Polak Michael Morrison -Michael Mc Donnell Michael Logan Michael Kapelko Michael Bach Jensen @@ -463,6 +463,7 @@ Jeffrey Kinross Jay Zuckerman Jason Howlett Jason Ballenger +Jannik Heller Jamie Robertson James Killian James Athey diff --git a/ChangeLog b/ChangeLog index 9ce09116e..90455e414 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,116 @@ +2015-03-03 14:59 robert + + * src/osgWrappers/serializers/osg/ClusterCullingCallback.cpp: Fixed + ClusterCullingCallback parser problem due to osg::Callback not + being included in inheritance list + +2015-03-03 12:56 robert + + * src/osgUtil/Optimizer.cpp: Restructed the checks in the + CollectLowestTransformsVisitor::removeTransforms() to avoid + benign case being flagged as warning. + +2015-03-03 12:03 robert + + * include/osgDB/ObjectWrapper, include/osgDB/Serializer, + src/osgWrappers/serializers/osg/Camera.cpp, + src/osgWrappers/serializers/osg/ClearNode.cpp, + src/osgWrappers/serializers/osgText/TextBase.cpp: From Miha + Ravselj, "Regarding previous submission it was only partial + solution. After further testing I found similar bug also in + ClearNode serializer. + + //GLbitfield mask = GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT; + This line was problematic since it produced incorrect result when + let's say COLOR flag is serialized + it should be null as in Camera serializer or in a proposed + BitFlagsSerializer + + + This line of code caused that whenever only GL_COLOR_BUFFER_BIT + bit was written and on value read + GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT was restored instead of + GL_COLOR_BUFFER_BIT only. + + //GLbitfield mask = 0; //this resolves the issue same as in + camera + Also same bit-wise comparison bug was also present in write + method. + ------------------------------------------------------------------------------------- + + As you can see there are total 3 bit mask serializers in OSG and + all 3 had bugs so I decided to add ADD_BITFLAGS_SERIALIZER and + replace USER serializers in osg::Camera, osg::ClearNode and + osgText::TextBase. I have made sure that bitflags serializer does + not break backwards-compatibility since it uses same code as user + serializer does in all 3 cases. (see tester.cpp on how + compatibility test was performed)" + +2015-03-03 12:00 robert + + * src/osg/PolygonMode.cpp: Re-organized the #ifdef's to avoid usage + of glPolyginMode under GLES + +2015-03-02 14:38 robert + + * CMakeLists.txt: Updated SO_VERSION to take account of API changes + in osgDB + +2015-03-02 12:11 robert + + * include/osgDB/ConvertBase64, src/osgDB/CMakeLists.txt, + src/osgDB/ConvertBase64.cpp, src/osgDB/InputStream.cpp, + src/osgDB/OutputStream.cpp: From Johannes Scholz, "Attached you + find a patch for osgDB::OutputStream and osgDB::InputStream to + include osg::Image::data() using Base64 encoding inside the ASCII + OSGT, if WriteImageHint=IncludeData is set, only." + +2015-03-02 12:09 robert + + * examples/osgtessellationshaders/osgtessellationshaders.cpp, + include/osg/GLDefines: From Michael McDonnel, "The tessellation + shader example has a small bug.The middle of the + geometry is clipped as soon as it is tessellated. The clipping is + probably caused by rounding errors because it is only in one + spot. The + clipping disappears when the camera is moved, and reappears when + it is + moved back. Expanding the the bounding box fixed the clipping + bug." + + Tweaked by Robert Osfield to expand it to a -1 to 1 unit box. + Actual clipping bug is not due to rounding errors but the shaders + creating vertices outside the bounding box of the original input + vertices + +2015-03-01 15:20 robert + + * examples/osgshadercomposition/osgshadercomposition.cpp: Fixed + StateSet::Define names to match OpenSceneGraph-Data/shaders. + +2015-03-01 11:08 robert + + * src/osgGA/OrbitManipulator.cpp, + src/osgGA/StandardManipulator.cpp: From Jannik Heller, "I noticed + the rotation in the OrbitManipulator depends on the framerate. To + reproduce this issue, start the osganimate example, rotate the + model with the left mouse button, then let go of the mouse button + while still moving. You will notice that with V-Sync enabled, the + model rotates slower. + + The OrbitManipulator calculates a scale to counteract the + framerate dependency, but it turns out this scale wasn't used for + the rotation yet." + +2015-02-27 10:01 robert + + * CMakeLists.txt: Updated version number after dev release. + +2015-02-27 09:47 robert + + * ChangeLog, applications/osgversion/Contributors.cpp: Updated + ChangeLog and Contributors to fix trailing spaces + 2015-02-27 09:05 robert * src/osgPlugins/lua/lua-5.2.3/src/ldo.c, diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp index 9fa1635f7..66f885c41 100644 --- a/applications/osgversion/Contributors.cpp +++ b/applications/osgversion/Contributors.cpp @@ -472,10 +472,14 @@ TypoCorrection typoCorrections[] = {"Messershmidt","Messerschmidt"}, {"Auelien","Aurelien"}, {"AurĂ©lien","Aurélien"}, + {"McDonnel","Mc Donnell"}, {"McDonnell","Mc Donnell"}, {"DelallĂ©e","Delallée"}, {"Gjøl","Gjřl"}, - {"Ravšelj","Rav¨elj"} + {"Ravšelj","Rav¨elj"}, + {"Ravsel", "Rav¨elj"}, + {"Ravselj", "Rav¨elj"} + }; @@ -653,8 +657,6 @@ NameCorrection nameCorrections[] = "Laurens", "Voerman"}, {"Pjotr", "Sventachov", "Pjotr", "Svetachov"}, - {"Miha", "Ravsel", - "Miha", "Rav¨elj"}, {"Bradley", "Baker", "Bradley", "Baker Searles"}, {"PawelKsiezopolski", "",