diff --git a/AUTHORS.txt b/AUTHORS.txt index c6d7aa555..fcde576bd 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ -OpenSceneGraph Library 2.1.6 +OpenSceneGraph Library 2.1.7 -271 Contributors: +272 Contributors: Firstname Surname ----------------- @@ -42,6 +42,7 @@ Daniel Sj Per Fahlberg Joran Jessurun David Callu +Jean-Sebastien Guay Frederic Marmond David Fries Boris Bralo @@ -63,7 +64,6 @@ Martin Naylor Martin Aumueller Markus Trenkwalder Joakim Simonsson -Jean-Sebastien Guay Gordon Tomlinson Brad Colbert Andreas Ekstrand @@ -234,6 +234,7 @@ Glenn Waldrom Gian Lorenzetto George Papagiannakis Gary Quinn +Galen Faidley Frashid Lashkari Frank Warmerdam Frank Lindeman diff --git a/CMakeLists.txt b/CMakeLists.txt index a57166196..a41ef0afe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,8 +16,8 @@ PROJECT(OpenSceneGraph) SET(OPENSCENEGRAPH_MAJOR_VERSION 2) SET(OPENSCENEGRAPH_MINOR_VERSION 1) -SET(OPENSCENEGRAPH_PATCH_VERSION 6) -SET(OPENSCENEGRAPH_SOVERSION 17) +SET(OPENSCENEGRAPH_PATCH_VERSION 7) +SET(OPENSCENEGRAPH_SOVERSION 18) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) diff --git a/ChangeLog b/ChangeLog index 3f2c09204..9c1e38702 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,152 @@ +2007-08-23 14:35 +0000 [r7278] robert: + + * From Stephan Huber, fix for crash on exit + +2007-08-23 14:31 +0000 [r7277] robert: + + * From Galen Faidley," Please find attached the modifications to + get the new checkerboard stereo format to work. It's a good thing + I tested these on a TV before submitting them since I did indeed + have a bug. One thing I did not test was to see how this would + work in windowed mode. Does the interlaced stereo code have + support for 'absolute' positions? For example a given pixel on + the screen is always shown in a given eye no matter where the + graphics context is placed? " + +2007-08-23 14:10 +0000 [r7276] robert: + + * From Jean-Sebastien Guay,"As discussed yesterday on the osg-users + list, I have altered src/osgDB/FileUtils.cpp to implement the + official Windows DLL search order as described on the page + http://msdn2.microsoft.com/en-us/library/ms682586.aspx . As + mentioned, the search order is now: 1. The directory from which + the application loaded. 2. The system directory. + (C:\Windows\System32 by default, gotten using the + GetSystemDirectory function) 3. The 16-bit system directory. + (C:\Windows\System by default, gotten by adding "\System" to the + path gotten in the next step...) 4. The Windows directory. + (C:\Windows by default, gotten using the GetWindowsDirectory + function) 5. The current directory. (".") 6. The directories that + are listed in the PATH environment variable. (as before) The + first four directories are obtained using Win32 API calls, so + they should work correctly even on non-standard Windows installs. + The changes are well commented and should be clear, even to + someone not familiar with the Win32 API. I have tested in a few + scenarios and it works as expected. Serge Lages has also tested + the changes and confirmed they worked as described. I have not + had any other reports though (positive or negative). I also fixed + the issue with a trailing semicolon on the PATH adding an empty + string to the end of the search paths, as this was an + inconsistent side effect rather than a desirable effect. This + change will take effect on other platforms as well, but since it + tests for an empty string in the last item added to the search + paths, it should have no adverse effect. " + +2007-08-23 11:06 +0000 [r7275] robert: + + * Updated wrappers + +2007-08-23 11:00 +0000 [r7274] robert: + + * Addd control for serializing draw dispatch. + +2007-08-22 19:31 +0000 [r7273] robert: + + * From Jean-Sebastien Guay, "After a bit more testing, it was still + not 100% robust, so this fix will bring the change in line with + what is done on other OSes (Linux) and works in all tested cases. + For reference, this was tested with: osgviewer .wrl (file + in current directory) osgviewer \.wrl (file in child + directory, relative) osgviewer .\\.wrl (file in child + directory, specify current) osgviewer :\\.wrl + (absolute path) " + +2007-08-22 19:26 +0000 [r7272] robert: + + * Updated wrappers + +2007-08-22 17:18 +0000 [r7270-7271] robert: + + * Updated wrappers + + * Refactored the implementation of cull/draw for + DrawThreadPerContex and CullThreadPerCameraDrawThreadPerContex + and added an experimental draw serialization. + +2007-08-22 14:32 +0000 [r7269] ewing: + + * Documentation updates. + +2007-08-22 12:33 +0000 [r7268] robert: + + * Updated wrappers + +2007-08-22 12:21 +0000 [r7267] robert: + + * Cleaned up the thread setup and fixed the + CullThreadPerCameraDrawThreadPerContext path + +2007-08-22 12:14 +0000 [r7266] robert: + + * Added thread safe ref/unref by default. + +2007-08-22 11:04 +0000 [r7265] ewing: + + * Fixes to DMG script to reflect removal of GDAL and external + OpenThreads. Support for OpenSceneGraph-Data repo aside + OpenSceneGraph repo. Added background image support to DMG. + Pre-laid-out .DS_Store included. + +2007-08-22 10:56 +0000 [r7264] ewing: + + * Removed missing shadow examples from Xcode project. + +2007-08-22 10:34 +0000 [r7263] robert: + + * Set main scene graph elements to use thread safe ref/unref by + default + +2007-08-22 09:50 +0000 [r7256-7262] robert: + + * Cleaned up copy constructor and switched on thread safe + ref/unref. + + * Added debug ENFORCE_THREADSAFE paths into osg::Referenced, these + are off by default. + + * Simplified the thread set up. + + * Added thread safe ref/unref + + * Added debug message to destructor + + * Added setting of thread safe ref/unref. + + * Added default setting of use of thread safe ref/unref. + +2007-08-22 09:05 +0000 [r7255] robert: + + * Changed ReadFileCallback and WriteFileCallback to use virtual + inhertinace. + +2007-08-21 09:32 +0000 [r7254] robert: + + * Added missing clear() implementation + +2007-08-20 13:09 +0000 [r7253] robert: + + * Fixed the install path of plugins under Windows. + +2007-08-20 10:15 +0000 [r7250-7251] robert: + + * Updated README date + + * Updated AUTHORS file for 2.1.6 release + +2007-08-20 10:06 +0000 [r7249] robert: + + * Updated ChangeLog + 2007-08-20 09:28 +0000 [r7247-7248] robert: * Updated version number for 2.1.6 release and updated wrappers diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp index 696f98770..4e725a3ff 100644 --- a/applications/osgversion/osgversion.cpp +++ b/applications/osgversion/osgversion.cpp @@ -33,6 +33,7 @@ bool validName(const std::string& first) if (first.size()>=2 && (first[1]<'a' || first[1]>'z') && (first[1]!='.') && (first[1]!=',')) return false; + if (first=="Xcode") return false; if (first=="Added") return false; if (first=="Camera") return false; if (first=="CameraNode") return false; diff --git a/include/osg/Version b/include/osg/Version index d56cb5ce9..f19b437b7 100644 --- a/include/osg/Version +++ b/include/osg/Version @@ -20,7 +20,7 @@ extern "C" { #define OSG_VERSION_MAJOR 2 #define OSG_VERSION_MINOR 1 -#define OSG_VERSION_PATCH 6 +#define OSG_VERSION_PATCH 7 #define OSG_VERSION_RELEASE OSG_VERSION_PATCH #define OSG_VERSION_REVISION 0