Changeset 9041 for OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/GeometryRecords.cpp

Timestamp:

10/21/08 17:51:56 (5 years ago)

Author:

robert

Message:

#if'd out an premature StateSet? optimization that was causing problems with datasets that mixed multi-texture coord geometry with single texture coord geometries in a single scene graph.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/GeometryRecords.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/GeometryRecords.cpp

@@ -393 +393 @@
         }
 
+#if 0
+// note from Robert Osfield, this "optimization" breaks multi-textured datasets that mix single texture 
+// and mulit-texture geometries as the Multitexture parsing can come after the below code, and accidentally 
+// polute the non multi-texture geometries StateSet.
+
         // A simple share stateset optimization.
         static osg::ref_ptr<osg::StateSet> lastStateset;
@@ -399 +404 @@
         else
             lastStateset = stateset;
+#endif
 
         _geode->setStateSet(stateset.get());
@@ -956 +962 @@
         }
 
+#if 0
+// note from Robert Osfield, this "optimization" breaks multi-textured datasets that mix single texture 
+// and mulit-texture geometries as the Multitexture parsing can come after the below code, and accidentally 
+// polute the non multi-texture geometries StateSet.
+
         // A simple share stateset optimization.
         static osg::ref_ptr<osg::StateSet> lastStateset;
@@ -962 +973 @@
         else
             lastStateset = stateset;
+#endif
 
         _geode->setStateSet(stateset.get());