From 3eb6e67bfa6364624469ed56a6afe2e43a8506d2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 6 Aug 2007 11:50:40 +0000 Subject: [PATCH] Updated ChangeLog, and AUTHORS file for release --- AUTHORS.txt | 11 ++-- ChangeLog | 76 ++++++++++++++++++++++++++ applications/osgversion/osgversion.cpp | 5 ++ src/osgViewer/Viewer.cpp | 13 +++-- 4 files changed, 95 insertions(+), 10 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index 26457c062..86d02fc81 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ -OpenSceneGraph Library 2.1.3 +OpenSceneGraph Library 2.1.4 -268 Contributors: +269 Contributors: Firstname Surname ----------------- @@ -15,8 +15,8 @@ Farshid Lashkari Paul Martz Bob Kuehne Stephan Huber -Ulrich Hertlein Martin Lavery +Ulrich Hertlein Eric Sokolowsky Tree Trajce Nikolov @@ -55,6 +55,7 @@ Jason Daly Jason Beverage David Spilling Ben Discoe +Andy Skinner Sasa Bistrovic Rainer Oder Paul Melis @@ -74,9 +75,9 @@ Michael Platings Michael Hartman Loic Dachary Joseph Steel +John Shue David Guthrie Corbin Holtz -Andy Skinner Toshiyuki Takahei Thom DeCarlo Terry Welsh @@ -86,7 +87,6 @@ Romano Magacho Paul de Repentigny Leandro Motta Barros Laurens Voerman -John Shue Jean-Sebastien Guay Carlo Camporesi Bryan Thrall @@ -169,6 +169,7 @@ Vaclav Bilek Tyge Troy Yee Tino Schwarze +Tim Moore Thom Carlo Tery Welsh Tanguy Fautré diff --git a/ChangeLog b/ChangeLog index 1ca75cb7f..85423b1e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,79 @@ +2007-08-06 09:28 +0000 [r7189] robert: + + * Changed debug message to INFO level + +2007-08-05 17:06 +0000 [r7188] robert: + + * Added support for enabling the stencil buffer when horizontal and + vertical split stereo are used. + +2007-08-05 14:59 +0000 [r7187] robert: + + * From Tim More, "This patch causes GraphicsWindowX11 to not send + key release events when a key press / release is caused by + auto-repeat. This is consistent with Windows and Mac behavior, as + well as other toolkits such as SDL." + +2007-08-05 14:51 +0000 [r7186] robert: + + * From Andy Skinner, fixes for avoiding warnings about mixing c and + c++ versions of c libs. + +2007-08-04 17:04 +0000 [r7185] robert: + + * Disable the selection of CullPerCameraDrawPerContext until I am + able to fix this threading model + +2007-08-04 10:30 +0000 [r7184] robert: + + * From John Shue, "Recent changes to sockstream.cpp and + sockinet.cpp to better deal with various operating system + differences between socklen_t and int have broken the FreeBSD + build. Change was to add __FreeBSD__ to the list of defines that + are checked." + +2007-08-03 16:08 +0000 [r7183] robert: + + * Updated wrappers + +2007-08-03 14:50 +0000 [r7182] robert: + + * Added perlimnary support for reading the DISPLAY variable. + +2007-08-02 16:23 +0000 [r7181] robert: + + * Changed the projection matrix resize policy. + +2007-08-02 12:36 +0000 [r7180] robert: + + * From Martin Lavery, XCode updates for the new Renderer class + +2007-08-02 12:27 +0000 [r7179] robert: + + * Added return 0; + +2007-08-02 11:02 +0000 [r7178] robert: + + * Introduce new osgViewer::Renderer class for implementing of the + rendering of cameras in viewers + +2007-08-02 08:50 +0000 [r7177] robert: + + * Added save and restoring of the cull mask to Camera handling code + +2007-07-31 17:28 +0000 [r7176] robert: + + * From Andy Skinner,adding c includes to avoid problems with mixing + c and c++ versions of c functions. + +2007-07-30 16:02 +0000 [r7174] robert: + + * Updated AUTHORS file for release + +2007-07-30 15:56 +0000 [r7173] robert: + + * Updated ChangeLog for release + 2007-07-30 15:25 +0000 [r7172] robert: * Updated version number for 2.1.3 dev release diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp index cf96b07b9..acb4476c3 100644 --- a/applications/osgversion/osgversion.cpp +++ b/applications/osgversion/osgversion.cpp @@ -309,6 +309,11 @@ std::string typoCorrection(const std::string& name) void nameCorrection(NamePair& name) { + if (name.first=="Tim" && name.second=="More") + { + name.first = "Tim"; + name.second = "Moore"; + } if (name.first=="Andre" && name.second=="Garneau") { name.first = "André"; diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index c233a0447..793c6f305 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -243,6 +243,14 @@ void Viewer::setSceneData(osg::Node* node) _scene->setSceneData(node); _scene->setFrameStamp(_frameStamp.get()); + if (getSceneData()) + { + // now make sure the scene graph is set up with the correct DataVariance to protect the dyamic elements of + // the scene graph from being run in parallel. + osgUtil::Optimizer::StaticObjectDetectionVisitor sodv; + getSceneData()->accept(sodv); + } + computeActiveCoordinateSystemNodePath(); setReferenceTime(0.0); @@ -539,11 +547,6 @@ void Viewer::startThreading() if (!osg::Referenced::getDeleteHandler()) osg::Referenced::setDeleteHandler(new osg::DeleteHandler(2)); else osg::Referenced::getDeleteHandler()->setNumFramesToRetainObjects(2); - - // now make sure the scene graph is set up with the correct DataVariance to protect the dyamic elements of - // the scene graph from being run in parallel. - osgUtil::Optimizer::StaticObjectDetectionVisitor sodv; - getSceneData()->accept(sodv); } if (numThreadsOnBarrier>1)