Changeset 3203

Timestamp:

07/29/04 12:13:02 (9 years ago)

Author:

robert

Message:

Added detection and disabling of flattening of static transforms which a
LightPointNode? exists in the scene graph.

Location:

OpenSceneGraph/trunk

Files:

• include/osgUtil/Optimizer (modified) (2 diffs)
• src/osgUtil/Optimizer.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/include/osgUtil/Optimizer

@@ -126 +126 @@
                     _optimizer(optimizer) {}
 
+                virtual void apply(osg::Node& geode);
                 virtual void apply(osg::Geode& geode);
                 virtual void apply(osg::Billboard& geode);
@@ -143 +144 @@
                 typedef std::set<osg::Drawable*>                    DrawableSet;
                 typedef std::set<osg::Billboard*>                   BillboardSet;
+                typedef std::set<osg::Node* >                       NodeSet;
                 typedef std::set<osg::Transform*>                   TransformSet;
                 
                 Optimizer*      _optimizer;
                 TransformStack  _transformStack;
+                NodeSet         _excludedNodeSet;
                 DrawableSet     _drawableSet;
                 BillboardSet    _billboardSet;

OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

@@ -549 +549 @@
         
 
+        void collectDataFor(osg::Node* node)
+        {
+            _currentObjectList.push_back(node);
+            
+            node->accept(*this);
+            
+            _currentObjectList.pop_back();
+        }
+
         void collectDataFor(osg::Billboard* billboard)
         {
@@ -579 +588 @@
         inline bool isOperationPermissableForObject(const osg::Object* object)
         {
+            // disable if cannot apply transform functor.
             const osg::Drawable* drawable = dynamic_cast<const osg::Drawable*>(object);
             if (drawable && !drawable->supports(_transformFunctor)) return false;
             
+            // disable if object is a light point node.
+            if (strcmp(object->className(),"LightPointNode")==0) return false;
+
             return _optimizer ? _optimizer->isOperationPermissableForObject(object,Optimizer::FLATTEN_STATIC_TRANSFORMS) :  true; 
         }
@@ -904 +917 @@
 }
 
+void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Node& node)
+{
+    if (strcmp(node.className(),"LightPointNode")==0)
+    {
+        _excludedNodeSet.insert(&node);
+    }
+    traverse(node);
+}
+
 void Optimizer::FlattenStaticTransformsVisitor::apply(osg::Geode& geode)
 {
-
     if (!_transformStack.empty())
     {
@@ -945 +966 @@
 {
     CollectLowestTransformsVisitor cltv(_optimizer);
+
+    for(NodeSet::iterator nitr=_excludedNodeSet.begin();
+        nitr!=_excludedNodeSet.end();
+        ++nitr)
+    {
+        cltv.collectDataFor(*nitr);
+    }
 
     for(DrawableSet::iterator ditr=_drawableSet.begin();