Changeset 13041 for OpenSceneGraph/trunk/include/osgUtil/Optimizer

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osgUtil/Optimizer (modified) (43 diffs)

OpenSceneGraph/trunk/include/osgUtil/Optimizer

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -45 +45 @@
         inline bool isOperationPermissibleForObject(const osg::StateSet* object) const;
         inline bool isOperationPermissibleForObject(const osg::StateAttribute* object) const;
-        inline bool isOperationPermissibleForObject(const osg::Drawable* object) const;        
+        inline bool isOperationPermissibleForObject(const osg::Drawable* object) const;
         inline bool isOperationPermissibleForObject(const osg::Node* object) const;
 
@@ -57 +57 @@
   * For example of usage see examples/osgimpostor or osgviewer.
   */
-  
+
 class OSGUTIL_EXPORT Optimizer
 {
@@ -118 +118 @@
         /** Reset internal data to initial state - the getPermissibleOptionsMap is cleared.*/
         void reset();
-        
+
         /** Traverse the node and its subgraph with a series of optimization
           * visitors, specified by the OptimizationOptions.*/
@@ -128 +128 @@
 
 
-        /** Callback for customizing what operations are permitted on objects in the scene graph.*/        
+        /** Callback for customizing what operations are permitted on objects in the scene graph.*/
         struct IsOperationPermissibleForObjectCallback : public osg::Referenced
         {
@@ -135 +135 @@
                 return optimizer->isOperationPermissibleForObjectImplementation(stateset,option);
             }
-            
+
             virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::StateAttribute* attribute,unsigned int option) const
             {
                 return optimizer->isOperationPermissibleForObjectImplementation(attribute,option);
             }
-            
+
             virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::Drawable* drawable,unsigned int option) const
             {
                 return optimizer->isOperationPermissibleForObjectImplementation(drawable,option);
             }
-            
+
             virtual bool isOperationPermissibleForObjectImplementation(const Optimizer* optimizer, const osg::Node* node,unsigned int option) const
             {
                 return optimizer->isOperationPermissibleForObjectImplementation(node,option);
             }
-            
-        };
-        
-        /** Set the callback for customizing what operations are permitted on objects in the scene graph.*/        
+
+        };
+
+        /** Set the callback for customizing what operations are permitted on objects in the scene graph.*/
         void setIsOperationPermissibleForObjectCallback(IsOperationPermissibleForObjectCallback* callback) { _isOperationPermissibleForObjectCallback=callback; }
 
-        /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/        
+        /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/
         IsOperationPermissibleForObjectCallback* getIsOperationPermissibleForObjectCallback() { return _isOperationPermissibleForObjectCallback.get(); }
 
-        /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/        
+        /** Get the callback for customizing what operations are permitted on objects in the scene graph.*/
         const IsOperationPermissibleForObjectCallback* getIsOperationPermissibleForObjectCallback() const { return _isOperationPermissibleForObjectCallback.get(); }
 
@@ -167 +167 @@
             _permissibleOptimizationsMap[object] = options;
         }
-        
+
         inline unsigned int getPermissibleOptimizationsForObject(const osg::Object* object) const
         {
@@ -180 +180 @@
             if (_isOperationPermissibleForObjectCallback.valid())
                 return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
-            else 
-                return isOperationPermissibleForObjectImplementation(object,option); 
+            else
+                return isOperationPermissibleForObjectImplementation(object,option);
         }
 
@@ -188 +188 @@
             if (_isOperationPermissibleForObjectCallback.valid())
                 return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
-            else 
-                return isOperationPermissibleForObjectImplementation(object,option); 
+            else
+                return isOperationPermissibleForObjectImplementation(object,option);
         }
 
@@ -196 +196 @@
             if (_isOperationPermissibleForObjectCallback.valid())
                 return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
-            else 
-                return isOperationPermissibleForObjectImplementation(object,option); 
+            else
+                return isOperationPermissibleForObjectImplementation(object,option);
         }
 
@@ -204 +204 @@
             if (_isOperationPermissibleForObjectCallback.valid())
                 return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
-            else 
-                return isOperationPermissibleForObjectImplementation(object,option); 
+            else
+                return isOperationPermissibleForObjectImplementation(object,option);
         }
 
@@ -212 +212 @@
             return (option & getPermissibleOptimizationsForObject(stateset))!=0;
         }
-        
+
         bool isOperationPermissibleForObjectImplementation(const osg::StateAttribute* attribute, unsigned int option) const
         {
@@ -246 +246 @@
             return (option & getPermissibleOptimizationsForObject(node))!=0;
         }
-        
+
     protected:
 
@@ -252 +252 @@
 
         typedef std::map<const osg::Object*,unsigned int> PermissibleOptimizationsMap;
-        PermissibleOptimizationsMap _permissibleOptimizationsMap;    
-    
+        PermissibleOptimizationsMap _permissibleOptimizationsMap;
+
     public:
 
         /** Flatten Static Transform nodes by applying their transform to the
-          * geometry on the leaves of the scene graph, then removing the 
+          * geometry on the leaves of the scene graph, then removing the
           * now redundant transforms.  Static transformed Subgraphs that have multiple
           * parental paths above them are not flattened, if you require this then
-          * the subgraphs have to be duplicated - for this use the 
+          * the subgraphs have to be duplicated - for this use the
           * FlattenStaticTransformsDuplicatingSharedSubgraphsVisitor. */
         class OSGUTIL_EXPORT FlattenStaticTransformsVisitor : public BaseOptimizerVisitor
@@ -285 +285 @@
                 typedef std::set<osg::Node* >                       NodeSet;
                 typedef std::set<osg::Transform*>                   TransformSet;
-                
+
                 TransformStack  _transformStack;
                 NodeSet         _excludedNodeSet;
@@ -299 +299 @@
           * of duplicated and flatten individually.  This results in more static transforms
           * being removed, but also means that more data is generated, and as a result may
-          * not always be the most appropriate flatten visitor to use.*/  
+          * not always be the most appropriate flatten visitor to use.*/
         class OSGUTIL_EXPORT FlattenStaticTransformsDuplicatingSharedSubgraphsVisitor : public BaseOptimizerVisitor
         {
@@ -325 +325 @@
         };
 
-        /** Combine Static Transform nodes that sit above one another.*/        
+        /** Combine Static Transform nodes that sit above one another.*/
         class OSGUTIL_EXPORT CombineStaticTransformsVisitor : public BaseOptimizerVisitor
         {
@@ -357 +357 @@
                 virtual void apply(osg::Geode& geode);
                 virtual void apply(osg::Group& group);
-                
+
                 void removeEmptyNodes();
 
@@ -372 +372 @@
                 RemoveRedundantNodesVisitor(Optimizer* optimizer=0):
                     BaseOptimizerVisitor(optimizer, REMOVE_REDUNDANT_NODES) {}
-                
+
                 virtual void apply(osg::Group& group);
                 virtual void apply(osg::Transform& transform);
-                
+
                 bool isOperationPermissible(osg::Node& node);
-                
+
                 void removeRedundantNodes();
 
@@ -392 +392 @@
                 RemoveLoadedProxyNodesVisitor(Optimizer* optimizer=0):
                     BaseOptimizerVisitor(optimizer, REMOVE_LOADED_PROXY_NODES) {}
-                
+
                 virtual void apply(osg::ProxyNode& group);
-                
+
                 void removeRedundantNodes();
 
@@ -431 +431 @@
 
         };
- 
+
         /** Optimize State in the scene graph by removing duplicate state,
           * replacing it with shared instances, both for StateAttributes,
@@ -451 +451 @@
                 }
 
-                /** empty visitor, make it ready for next traversal.*/        
+                /** empty visitor, make it ready for next traversal.*/
                 virtual void reset();
 
@@ -463 +463 @@
 
                 void addStateSet(osg::StateSet* stateset,osg::Object* obj);
-                
+
                 inline bool optimize(osg::Object::DataVariance variance)
                 {
@@ -474 +474 @@
                 // note, one element for DYNAMIC, STATIC and UNSPECIFIED
                 bool _optimize[3];
-                
+
                 StateSetMap _statesets;
 
@@ -510 +510 @@
 
                 void checkGeode(osg::Geode& geode);
-                
-        };
-        
+
+        };
+
         class OSGUTIL_EXPORT MakeFastGeometryVisitor : public BaseOptimizerVisitor
         {
@@ -524 +524 @@
 
                 void checkGeode(osg::Geode& geode);
-                
-        };        
-        
+
+        };
+
         class OSGUTIL_EXPORT MergeGeometryVisitor : public BaseOptimizerVisitor
         {
@@ -540 +540 @@
                     _targetMaximumNumberOfVertices = num;
                 }
-                
+
                 unsigned int getTargetMaximumNumberOfVertices() const
                 {
@@ -574 +574 @@
                 SpatializeGroupsVisitor(Optimizer* optimizer=0):
                     BaseOptimizerVisitor(optimizer, SPATIALIZE_GROUPS) {}
-                
+
                 virtual void apply(osg::Group& group);
                 virtual void apply(osg::Geode& geode);
-                
+
                 bool divide(unsigned int maxNumTreesPerCell=8);
-                
+
                 bool divide(osg::Group* group, unsigned int maxNumTreesPerCell);
                 bool divide(osg::Geode* geode, unsigned int maxNumTreesPerCell);
-                
+
                 typedef std::set<osg::Group*> GroupsToDivideList;
                 GroupsToDivideList _groupsToDivideList;
@@ -597 +597 @@
                 CopySharedSubgraphsVisitor(Optimizer* optimizer=0):
                     BaseOptimizerVisitor(optimizer, COPY_SHARED_NODES) {}
-                
+
                 virtual void apply(osg::Node& node);
 
                 void copySharedNodes();
-                
+
                 typedef std::set<osg::Node*> SharedNodeList;
                 SharedNodeList _sharedNodeList;
-                
+
         };
 
@@ -621 +621 @@
                         _changeClientImageStorage(changeClientImageStorage), _valueClientImageStorage(valueClientImageStorage),
                         _changeAnisotropy(changeAnisotropy), _valueAnisotropy(valueAnisotropy) {}
-                
+
                 virtual void apply(osg::Geode& node);
                 virtual void apply(osg::Node& node);
@@ -634 +634 @@
 
         };
-        
+
         /** Flatten MatrixTransform/Billboard pairs.*/
         class OSGUTIL_EXPORT FlattenBillboardVisitor : public BaseOptimizerVisitor
@@ -649 +649 @@
                 virtual void apply(osg::Billboard& billboard);
 
-                void process();    
+                void process();
 
                 BillboardNodePathMap _billboards;
 
         };
-        
+
         /** Texture Atlas Builder creates a set of textures/images which each contain multiple images.
           * Texture Atlas' are used to make it possible to use much wider batching of data. */
@@ -661 +661 @@
         public:
             TextureAtlasBuilder();
-            
+
             void reset();
-            
+
             void setMaximumAtlasSize(int width, int height);
 
             int getMaximumAtlasWidth() const { return _maximumAtlasWidth; }
             int getMaximumAtlasHeight() const { return _maximumAtlasHeight; }
-            
+
             void setMargin(int margin);
             int getMargin() const { return _margin; }
@@ -674 +674 @@
             void addSource(const osg::Image* image);
             void addSource(const osg::Texture2D* texture);
-            
+
             unsigned int getNumSources() const { return _sourceList.size(); }
             const osg::Image* getSourceImage(unsigned int i) { return _sourceList[i]->_image.get(); }
             const osg::Texture2D* getSourceTexture(unsigned int i) { return _sourceList[i]->_texture.get(); }
- 
+
             void buildAtlas();
             osg::Image* getImageAtlas(unsigned int i);
             osg::Texture2D* getTextureAtlas(unsigned int i);
             osg::Matrix getTextureMatrix(unsigned int i);
-            
+
             osg::Image* getImageAtlas(const osg::Image* image);
             osg::Texture2D* getTextureAtlas(const osg::Image* image);
             osg::Matrix getTextureMatrix(const osg::Image* image);
-            
+
             osg::Image* getImageAtlas(const osg::Texture2D* textue);
             osg::Texture2D* getTextureAtlas(const osg::Texture2D* texture);
             osg::Matrix getTextureMatrix(const osg::Texture2D* texture);
-            
+
         protected:
-        
+
             int _maximumAtlasWidth;
             int _maximumAtlasHeight;
             int _margin;
-            
+
 
             // forward declare
             class Atlas;
-    
+
             class Source : public osg::Referenced
             {
@@ -713 +713 @@
                 Source(const osg::Texture2D* texture):
                     _x(0),_y(0),_atlas(0),_texture(texture) { if (texture) _image = texture->getImage(); }
-            
+
                 int _x;
                 int _y;
@@ -720 +720 @@
                 osg::ref_ptr<const osg::Image> _image;
                 osg::ref_ptr<const osg::Texture2D> _texture;
-                
+
                 bool suitableForAtlas(int maximumAtlasWidth, int maximumAtlasHeight, int margin);
                 osg::Matrix computeTextureMatrix() const;
-                
-                
-            protected:
-            
+
+
+            protected:
+
                 virtual ~Source() {}
             };
@@ -744 +744 @@
                     _height(0),
                     _indexFirstOfRow(0){}
-        
+
                 int _maximumAtlasWidth;
                 int _maximumAtlasHeight;
@@ -751 +751 @@
                 osg::ref_ptr<osg::Texture2D> _texture;
                 osg::ref_ptr<osg::Image> _image;
-            
+
                 SourceList _sourceList;
-                
+
                 int _x;
                 int _y;
@@ -769 +769 @@
                 void clampToNearestPowerOfTwoSize();
                 void copySources();
-                
+
             protected:
                 virtual ~Atlas() {}
             };
-            
+
             typedef std::vector< osg::ref_ptr<Atlas> > AtlasList;
-            
+
             Source* getSource(const osg::Image* image);
             Source* getSource(const osg::Texture2D* texture);
@@ -792 +792 @@
         };
 
- 
-        /** Optimize texture usage in the scene graph by combining textures into texture atlas 
+
+        /** Optimize texture usage in the scene graph by combining textures into texture atlas
           * Use of texture atlas cuts down on the number of seperate states in the scene, reducing
           * state changes and improving the chances of use larger batches of geomertry.*/
@@ -807 +807 @@
                 TextureAtlasBuilder& getTextureAtlasBuilder() { return _builder; }
 
-                /** empty visitor, make it ready for next traversal.*/        
+                /** empty visitor, make it ready for next traversal.*/
                 virtual void reset();
 
@@ -851 +851 @@
 
                 void applyStateSet(osg::StateSet& stateset);
-                
+
                 void applyDrawable(osg::Drawable& drawable);
 
@@ -859 +859 @@
 inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::StateSet* object) const
 {
-    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true; 
+    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true;
 }
 
 inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::StateAttribute* object) const
 {
-    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true; 
+    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true;
 }
 
 inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::Drawable* object) const
 {
-    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true; 
+    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true;
 }
 
 inline bool BaseOptimizerVisitor::isOperationPermissibleForObject(const osg::Node* object) const
 {
-    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true; 
+    return _optimizer ? _optimizer->isOperationPermissibleForObject(object,_operationType) :  true;
 }