diff --git a/AUTHORS.txt b/AUTHORS.txt index 618f24a82..85c601249 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -32,11 +32,11 @@ Martin Lavery Tree Luigi Calori Mike Wittman +Chris Hanson Roland Smeenk Roger James Jeremy Moles Jason Beverage -Chris Hanson Jan Peciva J.P. Delport Mattias Helsing @@ -81,6 +81,7 @@ Daniel Sj Bryan Thrall Torben Dannhauer Fabien Lavignotte +Mike Connell Melchior Franz Martin Naylor Johannes Baeuerle @@ -88,7 +89,6 @@ Jan Ciger Andreas Ekstrand Rafa Gaitan Neil Hughes -Mike Connell Martin Beckett Joran Jessurun Gino van den Bergen @@ -107,6 +107,7 @@ Riccardo Corsi Rainer Oder Martin Aumueller Mario Valle +Lukasz Izdebski Jorge Izquierdo Gordon Tomlinson Frederic Bouvier @@ -123,6 +124,7 @@ Loic Dachary Joseph Steel John Shue Brad Colbert +Aurelien Albert Vivek Rajan Uwe Woessner Tony Horrobin @@ -139,14 +141,12 @@ Mihai Radu Michael Hartman Martins Innus Maciej Krol -Lukasz Izdebski Leandro Motta Barros Johan Nouvel Hartwig Wiesmann Donn Mielcarek Corbin Holtz Blasius Czink -Aurelien Albert Alexander Irion Toshiyuki Takahei Sebastien Grignard @@ -158,6 +158,7 @@ Maria Ten Lilin Xiong Liang Aibin Katharina Plugge +Jordi Torres John Vidar Larring John Kelso John Ivar @@ -409,7 +410,6 @@ Julian Scheid Juergen Rensen Juan Hernando Josh Portway -Jordi Torres John Tan John Grant John Donovan diff --git a/CMakeLists.txt b/CMakeLists.txt index e67a9eb3d..73aa65ad8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 3) SET(OPENSCENEGRAPH_MINOR_VERSION 1) -SET(OPENSCENEGRAPH_PATCH_VERSION 5) +SET(OPENSCENEGRAPH_PATCH_VERSION 6) SET(OPENSCENEGRAPH_SOVERSION 97) # set to 0 when not a release candidate, non zero means that any generated diff --git a/ChangeLog b/ChangeLog index 888c61ccb..76c27f577 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,151 @@ +2013-03-21 16:22 robert + + * include/osg/State: Added check against + isVertexBufferObjectSupported() in set*Pointer() methods + +2013-03-21 11:35 robert + + * examples/osgkeystone/osgkeystone.cpp: Added keystone grid to aid + editing + +2013-03-20 14:03 robert + + * examples/osgkeystone/osgkeystone.cpp: Added arrow key support. + Added support for using ctrl and shift keys to modulate how + senstive the mouse and key movement is when modifying the + keystone parameters. + +2013-03-19 16:43 robert + + * examples/osgkeystone/osgkeystone.cpp: Improve corner point + tracking/keystone computation + +2013-03-19 12:44 robert + + * examples/osgkeystone/osgkeystone.cpp: Added event handle for + interactive setting of keystone variables + +2013-03-15 17:35 robert + + * examples/osgkeystone/osgkeystone.cpp: Experiments with modifying + the projection matrix to provide keystoning. + +2013-03-14 16:24 robert + + * examples/CMakeLists.txt, examples/osgkeystone, + examples/osgkeystone/CMakeLists.txt, + examples/osgkeystone/osgkeystone.cpp: Initial skeleton of new + osgkeystone example + +2013-03-11 17:16 robert + + * src/osg/Group.cpp: From Aurelien Albert, "There is a little bug + in the osg::Group::insertChild method : + + If the index is more than the size of _children vector, the new + child is pushed at the end of the vector, but the index value is + unmodified, so an incorrect value is passed to the + "childInserted" method." + +2013-02-22 17:42 robert + + * src/osgSim/LightPointNode.cpp: From Chris Hanson, " Adds missing + copy for _bbox member variable to copy constructor: + + LightPointNode::LightPointNode(const LightPointNode& lpn,const + osg::CopyOp& copyop): + osg::Node(lpn,copyop), + _bbox(lpn._bbox), + _lightPointList(lpn._lightPointList), + _minPixelSize(lpn._minPixelSize), + _maxPixelSize(lpn._maxPixelSize), + _maxVisibleDistance2(lpn._maxVisibleDistance2), + _lightSystem(lpn._lightSystem), + _pointSprites(lpn._pointSprites) + { + } + + + Lacking this causes _bbox to be uninitialized after LOD changes + when paged databases refer to shared subgraphs. + + " + +2013-02-13 16:29 robert + + * include/osg/SampleMaski, include/osg/StateAttribute, + src/osg/CMakeLists.txt, src/osg/SampleMaski.cpp, + src/osgWrappers/serializers/osg/SampleMaski.cpp: From Lukasz + Izdebski,"added support for gl_SampleMaski." + +2013-02-13 16:03 robert + + * PlatformSpecifics/Android/AndroidManifest.xml.master.in: From + Jordi Torres, "This error occurs when compiling current OSG with + the NDK >=r8c: + + android-ndk-r8d/build/gmsl/__ + gmsl:512: *** non-numeric second argument to `wordlist' function: + ''. Stop. + + This is discussed in this thread[1]. + The solution is to add to + the manifest as the OSG library will only run in devices with + Android>=2.2 (Froyo) with API level 8 [2]. + + The fix does not affect to older sdk's. + + Thanks to Jan Ciger for spotting the bug and find a possible + solution. " + +2013-02-12 15:44 robert + + * include/osg/Math: From Jordi Torres, Android build fix + +2013-02-12 15:40 robert + + * src/osgPlugins/osc/osc/OscHostEndianness.h: From Jordi Torres, + fix for Android build + +2013-02-12 15:18 robert + + * src/osgPlugins/osc/OscSendingDevice.cpp, + src/osgPlugins/osc/ReaderWriterOscDevice.cpp: From Stephan Huber, + fixed bug in setting _numMessagesPerEvent and added more debug + information + +2013-02-07 19:16 robert + + * src/osgPlugins/3ds/ReaderWriter3DS.cpp: From Mike Connell, "3 + smaller fixes for the 3DS loader (against trunk) + + 1. Respect "noMatrixTransforms" option for matrices attached to + meshes, not only those attached to nodes + + 2. traverse_nodes variable did the exact opposite of it's + description. + + 3. Always try to load referenced textures, even if we can't find + the files (in order to the the registry's ReadFileCallback have a + stab at it) + " + +2013-02-07 11:10 robert + + * src/osgDB/InputStream.cpp, src/osgDB/OutputStream.cpp: From + Lukasz Izdebski , "I added write and read numInstances in + PrimitiveSet." + +2013-02-07 11:08 robert + + * CMakeLists.txt, include/osg/Version: Updated SO version in prep + for serialization foramt change + +2013-02-07 08:46 robert + + * AUTHORS.txt, ChangeLog, applications/osgversion/Contributors.cpp: + Updated AUTHORS list + 2013-02-06 16:04 robert * src/osgPlugins/OpenFlight/Document.cpp, diff --git a/include/osg/Version b/include/osg/Version index 6e8a99e1f..166c52bfd 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -20,7 +20,7 @@ extern "C" { #define OPENSCENEGRAPH_MAJOR_VERSION 3 #define OPENSCENEGRAPH_MINOR_VERSION 1 -#define OPENSCENEGRAPH_PATCH_VERSION 5 +#define OPENSCENEGRAPH_PATCH_VERSION 6 #define OPENSCENEGRAPH_SOVERSION 97 /* Convenience macro that can be used to decide whether a feature is present or not i.e.