Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp (modified) (183 diffs)

OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp

@@ -1 +1 @@
 /* -*-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.
 */
@@ -61 +61 @@
 {
     unsigned int options = 0;
-    
-    
+
+
     const char* env = getenv("OSG_OPTIMIZER");
     if (env)
@@ -117 +117 @@
         if(str.find("~MAKE_FAST_GEOMETRY")!=std::string::npos) options ^= MAKE_FAST_GEOMETRY;
         else if(str.find("MAKE_FAST_GEOMETRY")!=std::string::npos) options |= MAKE_FAST_GEOMETRY;
-        
+
         if(str.find("~FLATTEN_BILLBOARDS")!=std::string::npos) options ^= FLATTEN_BILLBOARDS;
         else if(str.find("FLATTEN_BILLBOARDS")!=std::string::npos) options |= FLATTEN_BILLBOARDS;
-        
+
         if(str.find("~TEXTURE_ATLAS_BUILDER")!=std::string::npos) options ^= TEXTURE_ATLAS_BUILDER;
         else if(str.find("TEXTURE_ATLAS_BUILDER")!=std::string::npos) options |= TEXTURE_ATLAS_BUILDER;
-        
+
         if(str.find("~STATIC_OBJECT_DETECTION")!=std::string::npos) options ^= STATIC_OBJECT_DETECTION;
         else if(str.find("STATIC_OBJECT_DETECTION")!=std::string::npos) options |= STATIC_OBJECT_DETECTION;
@@ -149 +149 @@
 {
     StatsVisitor stats;
-    
+
     if (osg::getNotifyLevel()>=osg::INFO)
     {
@@ -169 +169 @@
 
         TessellateVisitor tsv;
-        node->accept(tsv);        
-    }
-    
+        node->accept(tsv);
+    }
+
     if (options & REMOVE_LOADED_PROXY_NODES)
     {
@@ -187 +187 @@
 
         CombineLODsVisitor clv(this);
-        node->accept(clv);        
+        node->accept(clv);
         clv.combineLODs();
     }
-    
+
     if (options & OPTIMIZE_TEXTURE_SETTINGS)
     {
         OSG_INFO<<"Optimizer::optimize() doing OPTIMIZE_TEXTURE_SETTINGS"<<std::endl;
 
-        TextureVisitor tv(true,true, // unref image 
+        TextureVisitor tv(true,true, // unref image
                           false,false, // client storage
                           false,1.0, // anisotropic filtering
@@ -214 +214 @@
         osv.optimize();
     }
-    
+
     if (options & TEXTURE_ATLAS_BUILDER)
     {
         OSG_INFO<<"Optimizer::optimize() doing TEXTURE_ATLAS_BUILDER"<<std::endl;
-        
+
         // traverse the scene collecting textures into texture atlas.
         TextureAtlasVisitor tav(this);
@@ -233 +233 @@
         osv.optimize();
     }
-    
+
     if (options & COPY_SHARED_NODES)
     {
@@ -242 +242 @@
         cssv.copySharedNodes();
     }
-    
+
     if (options & FLATTEN_STATIC_TRANSFORMS)
     {
@@ -284 +284 @@
 
         osg::Timer_t endTick = osg::Timer::instance()->tick();
-        
+
         OSG_INFO<<"MERGE_GEODES took "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
     }
@@ -318 +318 @@
         OSG_INFO<<"MERGE_GEOMETRY took "<<osg::Timer::instance()->delta_s(startTick,endTick)<<std::endl;
     }
-    
+
     if (options & TRISTRIP_GEOMETRY)
     {
@@ -341 +341 @@
 
     }
-    
+
     if (options & FLATTEN_BILLBOARDS)
     {
@@ -415 +415 @@
 
 template<typename T>
-struct LessDerefFunctor 
+struct LessDerefFunctor
 {
     bool operator () (const T* lhs,const T* rhs) const
     {
-        return (*lhs<*rhs); 
+        return (*lhs<*rhs);
     }
 };
@@ -427 +427 @@
     bool operator () (const osg::StateSet* lhs,const osg::StateSet* rhs) const
     {
-        return (*lhs<*rhs); 
+        return (*lhs<*rhs);
     }
 };
@@ -445 +445 @@
 void Optimizer::StateVisitor::apply(osg::Node& node)
 {
-    
+
     osg::StateSet* ss = node.getStateSet();
-    if (ss && ss->getDataVariance()==osg::Object::STATIC) 
+    if (ss && ss->getDataVariance()==osg::Object::STATIC)
     {
         if (isOperationPermissibleForObject(&node) &&
@@ -464 +464 @@
 
     osg::StateSet* ss = geode.getStateSet();
-    
-    
+
+
     if (ss && ss->getDataVariance()==osg::Object::STATIC)
     {
@@ -505 +505 @@
         typedef std::set<osg::StateSet*>                    StateSetSet;
         typedef std::map<osg::Uniform*,StateSetSet>         UniformToStateSetMap;
-        
+
         const unsigned int NON_TEXTURE_ATTRIBUTE = 0xffffffff;
-        
+
         UniformToStateSetMap  uniformToStateSetMap;
 
@@ -607 +607 @@
             }
         }
-        
-                
+
+
         if (uniformToStateSetMap.size()>=2)
         {
@@ -637 +637 @@
             // find the duplicates.
             UniformList::iterator first_unique_uniform = uniformList.begin();
-            UniformList::iterator current_uniform = first_unique_uniform; 
+            UniformList::iterator current_uniform = first_unique_uniform;
             ++current_uniform;
             for(; current_uniform!=uniformList.end();++current_uniform)
@@ -659 +659 @@
 
     }
-    
+
     // duplicate state attributes removed.
     // now need to look at duplicate state sets.
@@ -700 +700 @@
                         drawable->setStateSet(*first_unique);
                     }
-                    else 
+                    else
                     {
                         osg::Node* node = dynamic_cast<osg::Node*>(obj);
@@ -713 +713 @@
         }
     }
-    
+
 }
 
@@ -759 +759 @@
             registerWithCurrentObjects(&transform);
         }
-        
+
         virtual void apply(osg::Geode& geode)
         {
             traverse(geode);
         }
-        
+
         virtual void apply(osg::Billboard& geode)
         {
             traverse(geode);
         }
-        
+
 
         void collectDataFor(osg::Node* node)
         {
             _currentObjectList.push_back(node);
-            
+
             node->accept(*this);
-            
+
             _currentObjectList.pop_back();
         }
@@ -783 +783 @@
         {
             _currentObjectList.push_back(billboard);
-            
+
             billboard->accept(*this);
-            
+
             _currentObjectList.pop_back();
         }
-        
+
         void collectDataFor(osg::Drawable* drawable)
         {
@@ -812 +812 @@
             const osg::Drawable* drawable = dynamic_cast<const osg::Drawable*>(object);
             if (drawable) return isOperationPermissibleForObject(drawable);
-            
+
             const osg::Node* node = dynamic_cast<const osg::Node*>(object);
             if (node) return isOperationPermissibleForObject(node);
@@ -825 +825 @@
             return BaseOptimizerVisitor::isOperationPermissibleForObject(drawable);
         }
-            
+
         inline bool isOperationPermissibleForObject(const osg::Node* node) const
         {
@@ -835 +835 @@
         }
 
-    protected:        
+    protected:
 
         struct TransformStruct
@@ -877 +877 @@
                 else
                 {
-                    if (!_transformSet.empty()) 
+                    if (!_transformSet.empty())
                     {
                         if (!_firstMatrix.isIdentity()) _moreThanOneMatrixRequired=true;
@@ -890 +890 @@
             osg::Matrix     _firstMatrix;
             TransformSet    _transformSet;
-        };    
+        };
 
 
@@ -914 +914 @@
         void disableObject(ObjectMap::iterator itr);
         void doTransform(osg::Object* obj,osg::Matrix& matrix);
-        
+
         osgUtil::TransformAttributeFunctor _transformFunctor;
         TransformMap    _transformMap;
@@ -941 +941 @@
         osg::Matrix matrix_no_trans = matrix;
         matrix_no_trans.setTrans(0.0f,0.0f,0.0f);
-        
+
         osg::Vec3 v111(1.0f,1.0f,1.0f);
         osg::Vec3 new_v111 = v111*matrix_no_trans;
@@ -948 +948 @@
         // move center point.
         lod->setCenter(lod->getCenter()*matrix);
-        
+
         // adjust ranges to new scale.
         for(unsigned int i=0;i<lod->getNumRanges();++i)
@@ -954 +954 @@
             lod->setRange(i,lod->getMinRange(i)*ratio,lod->getMaxRange(i)*ratio);
         }
-        
+
         lod->dirtyBound();
         return;
@@ -964 +964 @@
         osg::Matrix matrix_no_trans = matrix;
         matrix_no_trans.setTrans(0.0f,0.0f,0.0f);
-  
+
         osgUtil::TransformAttributeFunctor tf(matrix_no_trans);
 
@@ -982 +982 @@
             billboard->getDrawable(i)->dirtyBound();
         }
-        
+
         billboard->dirtyBound();
 
@@ -994 +994 @@
     {
         return;
-    }    
+    }
 
     if (itr->second._canBeApplied)
@@ -1017 +1017 @@
     {
         return;
-    }    
+    }
 
     if (itr->second._canBeApplied)
     {
-    
+
         // we havn't been disabled yet so we need to disable,
         itr->second._canBeApplied = false;
@@ -1044 +1044 @@
         osg::Object* object = oitr->first;
         ObjectStruct& os = oitr->second;
-        
+
         for(ObjectStruct::TransformSet::iterator titr = os._transformSet.begin();
             titr != os._transformSet.end();
@@ -1053 +1053 @@
     }
 
-    // disable all the objects which have more than one matrix associated 
-    // with them, and then disable all transforms which have an object associated 
+    // disable all the objects which have more than one matrix associated
+    // with them, and then disable all transforms which have an object associated
     // them that can't be applied, and then disable all objects which have
-    // disabled transforms associated, recursing until all disabled 
+    // disabled transforms associated, recursing until all disabled
     // associativity.
     // and disable all objects that the operation is not permisable for)
@@ -1143 +1143 @@
                     }
                 }
-                
-            }                
+
+            }
         }
     }
     _objectMap.clear();
     _transformMap.clear();
-    
+
     return transformRemoved;
 }
@@ -1247 +1247 @@
         cltv.collectDataFor(*bitr);
     }
-    
+
     cltv.setUpMaps();
-    
+
     for(TransformSet::iterator titr=_transformSet.begin();
         titr!=_transformSet.end();
@@ -1256 +1256 @@
         cltv.disableTransform(*titr);
     }
-    
+
 
     return cltv.removeTransforms(nodeWeCannotRemove);
@@ -1276 +1276 @@
         _transformSet.insert(&transform);
     }
-    
+
     traverse(transform);
 }
@@ -1288 +1288 @@
         if (itr!=_transformSet.end()) _transformSet.erase(itr);
     }
-    
+
     bool transformRemoved = false;
 
@@ -1296 +1296 @@
         osg::ref_ptr<osg::MatrixTransform> transform = *_transformSet.begin();
         _transformSet.erase(_transformSet.begin());
-        
+
         if (transform->getNumChildren()==1 &&
             transform->getChild(0)->asTransform()!=0 &&
@@ -1304 +1304 @@
             // now combine with its child.
             osg::MatrixTransform* child = transform->getChild(0)->asTransform()->asMatrixTransform();
-            
+
             osg::Matrix newMatrix = child->getMatrix()*transform->getMatrix();
             child->setMatrix(newMatrix);
@@ -1312 +1312 @@
                 else child->setStateSet(transform->getStateSet());
             }
-            
+
             transformRemoved = true;
 
@@ -1322 +1322 @@
                 (*pitr)->replaceChild(transform.get(),child);
             }
-            
-        }
-        
+
+        }
+
     }
     return transformRemoved;
@@ -1355 +1355 @@
     {
         // only remove empty groups, but not empty occluders.
-        if (group.getNumChildren()==0 && isOperationPermissibleForObject(&group) && 
+        if (group.getNumChildren()==0 && isOperationPermissibleForObject(&group) &&
             (typeid(group)==typeid(osg::Group) || (dynamic_cast<osg::Transform*>(&group) && !dynamic_cast<osg::CameraView*>(&group))))
         {
@@ -1376 +1376 @@
             ++itr)
         {
-            
+
             osg::ref_ptr<osg::Node> nodeToRemove = (*itr);
-            
+
             // take a copy of parents list since subsequent removes will modify the original one.
             osg::Node::ParentList parents = nodeToRemove->getParents();
@@ -1388 +1388 @@
                 osg::Group* parent = *pitr;
                 if (!dynamic_cast<osg::Sequence*>(parent) &&
-                    !dynamic_cast<osg::Switch*>(parent) && 
+                    !dynamic_cast<osg::Switch*>(parent) &&
                     strcmp(parent->className(),"MultiSwitch")!=0)
                 {
@@ -1394 +1394 @@
                     if (parent->getNumChildren()==0) newEmptyGroups.insert(*pitr);
                 }
-            }                
+            }
         }
 
@@ -1416 +1416 @@
            !node.getUpdateCallback() &&
            node.getDescriptions().empty() &&
-           isOperationPermissibleForObject(&node);    
+           isOperationPermissibleForObject(&node);
 }
 
 void Optimizer::RemoveRedundantNodesVisitor::apply(osg::Group& group)
 {
-    if (group.getNumChildren()==1 && 
+    if (group.getNumChildren()==1 &&
         typeid(group)==typeid(osg::Group) &&
         isOperationPermissible(group))
@@ -1478 +1478 @@
         {
             OSG_WARN<<"Optimizer::RemoveRedundantNodesVisitor::removeRedundantNodes() - failed dynamic_cast"<<std::endl;
-        }                                
+        }
     }
     _redundantNodeList.clear();
@@ -1510 +1510 @@
         if (group.valid())
         {
-            
+
             // first check to see if data was attached to the ProxyNode that we need to keep.
             bool keepData = false;
@@ -1524 +1524 @@
                 // create a group to store all proxy's children and data.
                 osg::ref_ptr<osg::Group> newGroup = new osg::Group(*group,osg::CopyOp::SHALLOW_COPY);
-                
+
 
                 // take a copy of parents list since subsequent removes will modify the original one.
@@ -1559 +1559 @@
         {
             OSG_WARN<<"Optimizer::RemoveLoadedProxyNodesVisitor::removeRedundantNodes() - failed dynamic_cast"<<std::endl;
-        }                                
+        }
     }
     _redundantNodeList.clear();
@@ -1572 +1572 @@
 {
     if (dynamic_cast<osg::PagedLOD*>(&lod)==0)
-    {    
+    {
         for(unsigned int i=0;i<lod.getNumParents();++i)
         {
@@ -1683 +1683 @@
         if (lhs->getStateSet()<rhs->getStateSet()) return true;
         if (rhs->getStateSet()<lhs->getStateSet()) return false;
-        
+
         if (rhs->getVertexIndices()) { if (!lhs->getVertexIndices()) return true; }
         else if (lhs->getVertexIndices()) return false;
-        
+
         if (lhs->getNormalBinding()<rhs->getNormalBinding()) return true;
         if (rhs->getNormalBinding()<lhs->getNormalBinding()) return false;
@@ -1695 +1695 @@
         if (lhs->getColorBinding()<rhs->getColorBinding()) return true;
         if (rhs->getColorBinding()<lhs->getColorBinding()) return false;
-        
+
         if (rhs->getColorIndices()) { if (!lhs->getColorIndices()) return true; }
         else if (lhs->getColorIndices()) return false;
@@ -1713 +1713 @@
         if (lhs->getNumTexCoordArrays()<rhs->getNumTexCoordArrays()) return true;
         if (rhs->getNumTexCoordArrays()<lhs->getNumTexCoordArrays()) return false;
-    
+
         // therefore lhs->getNumTexCoordArrays()==rhs->getNumTexCoordArrays()
-        
+
         unsigned int i;
         for(i=0;i<lhs->getNumTexCoordArrays();++i)
         {
-            if (rhs->getTexCoordArray(i)) 
+            if (rhs->getTexCoordArray(i))
             {
                 if (!lhs->getTexCoordArray(i)) return true;
@@ -1728 +1728 @@
             else if (lhs->getTexCoordIndices(i)) return false;
         }
-        
+
         for(i=0;i<lhs->getNumVertexAttribArrays();++i)
         {
-            if (rhs->getVertexAttribArray(i)) 
+            if (rhs->getVertexAttribArray(i))
             {
                 if (!lhs->getVertexAttribArray(i)) return true;
@@ -1740 +1740 @@
             else if (lhs->getVertexAttribIndices(i)) return false;
         }
-        
-        
+
+
         if (lhs->getNormalBinding()==osg::Geometry::BIND_OVERALL)
         {
@@ -1768 +1768 @@
             }
         }
-        
+
         if (lhs->getColorBinding()==osg::Geometry::BIND_OVERALL)
         {
@@ -1792 +1792 @@
                     break;
             }
-            
+
         }
 
@@ -1901 +1901 @@
     if (geode.getNumDrawables()>=2)
     {
-    
+
         // OSG_NOTICE<<"Before "<<geode.getNumDrawables()<<std::endl;
-    
+
         typedef std::vector<osg::Geometry*>                         DuplicateList;
         typedef std::map<osg::Geometry*,DuplicateList,LessGeometry> GeometryDuplicateMap;
@@ -1932 +1932 @@
             }
             else
-            {            
+            {
                 standardDrawables.push_back(geode.getDrawable(i));
             }
@@ -2019 +2019 @@
             unsigned int numVertices(duplicateList.front()->getVertexArray() ? duplicateList.front()->getVertexArray()->getNumElements() : 0);
             DuplicateList::iterator eachGeom(duplicateList.begin()+1);
-            // until all geometries have been checked or _targetMaximumNumberOfVertices is reached 
+            // until all geometries have been checked or _targetMaximumNumberOfVertices is reached
             for (;eachGeom!=duplicateList.end(); ++eachGeom)
             {
@@ -2050 +2050 @@
             }
         }
-        
+
         if (needToDoMerge)
         {
@@ -2060 +2060 @@
                 keepDrawables[i] = geode.getDrawable(i);
             }
-            
+
             // now clear the drawable list of the Geode so we don't have to remove items one by one (which is slow)
             geode.removeDrawables(0, geode.getNumDrawables());
-            
+
             // add back in the standard drawables which arn't possible to merge.
             for(osg::Geode::DrawableList::iterator sitr = standardDrawables.begin();
@@ -2071 +2071 @@
                 geode.addDrawable(sitr->get());
             }
-                
+
             // now do the merging of geometries
             for(MergeList::iterator mitr = mergeList.begin();
@@ -2110 +2110 @@
                     ++dupItr)
                 {
-                
+
                     osg::Geometry* rhs = *dupItr;
-                    
+
                     if (lhs->getVertexArray() && lhs->getVertexArray()->getNumElements()>=_targetMaximumNumberOfVertices)
                     {
@@ -2123 +2123 @@
                         continue;
                     }
-                    
-                    if (lhs->getVertexArray() && rhs->getVertexArray() && 
+
+                    if (lhs->getVertexArray() && rhs->getVertexArray() &&
                         (lhs->getVertexArray()->getNumElements()+rhs->getVertexArray()->getNumElements())>=_targetMaximumNumberOfVertices)
                     {
                         continue;
                     }
-                    
+
                     if (mergeGeometry(*lhs,*rhs))
                     {
@@ -2187 +2187 @@
                 geom->getFogCoordBinding()!=osg::Geometry::BIND_PER_PRIMITIVE_SET)
             {
-            
+
 #if 1
                 bool doneCombine = false;
@@ -2198 +2198 @@
                     osg::PrimitiveSet* lhs = primitives[lhsNo].get();
                     osg::PrimitiveSet* rhs = primitives[rhsNo].get();
- 
+
                     bool combine = false;
 
@@ -2211 +2211 @@
                         case(osg::PrimitiveSet::TRIANGLES):
                         case(osg::PrimitiveSet::QUADS):
-                            combine = true;       
+                            combine = true;
                             break;
                         }
-                        
+
                     }
 
                     if (combine)
                     {
-                    
+
                         switch(lhs->getType())
                         {
@@ -2257 +2257 @@
                 }
 
-    #if 1                
+    #if 1
                 if (doneCombine)
                 {
@@ -2265 +2265 @@
                     osg::Geometry::PrimitiveSetList oldPrimitives;
                     primitives.swap(oldPrimitives);
-                    
+
                     // now add the active primitive sets
                     for(osg::Geometry::PrimitiveSetList::iterator pitr = oldPrimitives.begin();
@@ -2276 +2276 @@
     #endif
 
-#else            
+#else
 
                 osg::Geometry::PrimitiveSetList& primitives = geom->getPrimitiveSetList();
@@ -2284 +2284 @@
                     osg::PrimitiveSet* lhs = primitives[primNo].get();
                     osg::PrimitiveSet* rhs = primitives[primNo+1].get();
- 
+
                     bool combine = false;
 
@@ -2297 +2297 @@
                         case(osg::PrimitiveSet::TRIANGLES):
                         case(osg::PrimitiveSet::QUADS):
-                            combine = true;       
+                            combine = true;
                             break;
                         }
-                        
+
                     }
 
                     if (combine)
                     {
-                    
+
                         switch(lhs->getType())
                         {
@@ -2357 +2357 @@
     if (geom.getSecondaryColorArray() && geom.getSecondaryColorArray()->referenceCount()>1) return true;
     if (geom.getFogCoordArray() && geom.getFogCoordArray()->referenceCount()>1) return true;
-    
+
 
     for(unsigned int unit=0;unit<geom.getNumTexCoordArrays();++unit)
@@ -2364 +2364 @@
         if (tex && tex->referenceCount()>1) return true;
     }
-    
+
     // shift the indices of the incoming primitives to account for the pre existing geometry.
     for(osg::Geometry::PrimitiveSetList::iterator primItr=geom.getPrimitiveSetList().begin();
@@ -2372 +2372 @@
         if ((*primItr)->referenceCount()>1) return true;
     }
-    
-    
+
+
     return false;
 }
@@ -2387 +2387 @@
             _lhs(0),
             _offset(0) {}
-            
-            
+
+
         /// try to merge the content of two arrays.
         bool merge(osg::Array* lhs,osg::Array* rhs, int offset=0)
@@ -2394 +2394 @@
             if (lhs==0 || rhs==0) return true;
             if (lhs->getType()!=rhs->getType()) return false;
-            
+
             _lhs = lhs;
             _offset = offset;
-            
+
             rhs->accept(*this);
             return true;
         }
-        
+
         template<typename T>
         void _merge(T& rhs)
         {
-            T* lhs = static_cast<T*>(_lhs); 
+            T* lhs = static_cast<T*>(_lhs);
             lhs->insert(lhs->end(),rhs.begin(),rhs.end());
         }
-        
+
         template<typename T>
         void _mergeAndOffset(T& rhs)
         {
-            T* lhs = static_cast<T*>(_lhs); 
+            T* lhs = static_cast<T*>(_lhs);
 
             typename T::iterator itr;
@@ -2422 +2422 @@
             }
         }
-            
+
         virtual void apply(osg::Array&) { OSG_WARN << "Warning: Optimizer's MergeArrayVisitor cannot merge Array type." << std::endl; }
 
@@ -2437 +2437 @@
         virtual void apply(osg::Vec3Array& rhs) { _merge(rhs); }
         virtual void apply(osg::Vec4Array& rhs) { _merge(rhs); }
-        
+
         virtual void apply(osg::DoubleArray& rhs) { _merge(rhs); }
         virtual void apply(osg::Vec2dArray& rhs) { _merge(rhs); }
         virtual void apply(osg::Vec3dArray& rhs) { _merge(rhs); }
         virtual void apply(osg::Vec4dArray& rhs) { _merge(rhs); }
-        
+
         virtual void apply(osg::Vec2bArray&  rhs) { _merge(rhs); }
         virtual void apply(osg::Vec3bArray&  rhs) { _merge(rhs); }
-        virtual void apply(osg::Vec4bArray&  rhs) { _merge(rhs); }        
+        virtual void apply(osg::Vec4bArray&  rhs) { _merge(rhs); }
         virtual void apply(osg::Vec2sArray& rhs) { _merge(rhs); }
         virtual void apply(osg::Vec3sArray& rhs) { _merge(rhs); }
@@ -2455 +2455 @@
 
     MergeArrayVisitor merger;
- 
+
     unsigned int base = 0;
-    unsigned int vbase = lhs.getVertexArray() ? lhs.getVertexArray()->getNumElements() : 0; 
+    unsigned int vbase = lhs.getVertexArray() ? lhs.getVertexArray()->getNumElements() : 0;
     if (lhs.getVertexArray() && rhs.getVertexArray())
     {
@@ -2472 +2472 @@
         lhs.setVertexArray(rhs.getVertexArray());
     }
-    
+
     if (lhs.getVertexIndices() && rhs.getVertexIndices())
     {
@@ -2487 +2487 @@
         lhs.setVertexIndices(rhs.getVertexIndices());
     }
-    
-
-    unsigned int nbase = lhs.getNormalArray() ? lhs.getNormalArray()->getNumElements() : 0; 
+
+
+    unsigned int nbase = lhs.getNormalArray() ? lhs.getNormalArray()->getNumElements() : 0;
     if (lhs.getNormalArray() && rhs.getNormalArray() && lhs.getNormalBinding()!=osg::Geometry::BIND_OVERALL)
     {
@@ -2516 +2516 @@
 
 
-    unsigned int cbase = lhs.getColorArray() ? lhs.getColorArray()->getNumElements() : 0; 
+    unsigned int cbase = lhs.getColorArray() ? lhs.getColorArray()->getNumElements() : 0;
     if (lhs.getColorArray() && rhs.getColorArray() && lhs.getColorBinding()!=osg::Geometry::BIND_OVERALL)
     {
@@ -2528 +2528 @@
         lhs.setColorArray(rhs.getColorArray());
     }
-    
+
     if (lhs.getColorIndices() && rhs.getColorIndices() && lhs.getColorBinding()!=osg::Geometry::BIND_OVERALL)
     {
@@ -2542 +2542 @@
     }
 
-    unsigned int scbase = lhs.getSecondaryColorArray() ? lhs.getSecondaryColorArray()->getNumElements() : 0; 
+    unsigned int scbase = lhs.getSecondaryColorArray() ? lhs.getSecondaryColorArray()->getNumElements() : 0;
     if (lhs.getSecondaryColorArray() && rhs.getSecondaryColorArray() && lhs.getSecondaryColorBinding()!=osg::Geometry::BIND_OVERALL)
     {
@@ -2554 +2554 @@
         lhs.setSecondaryColorArray(rhs.getSecondaryColorArray());
     }
-    
+
     if (lhs.getSecondaryColorIndices() && rhs.getSecondaryColorIndices() && lhs.getSecondaryColorBinding()!=osg::Geometry::BIND_OVERALL)
     {
@@ -2568 +2568 @@
     }
 
-    unsigned int fcbase = lhs.getFogCoordArray() ? lhs.getFogCoordArray()->getNumElements() : 0; 
+    unsigned int fcbase = lhs.getFogCoordArray() ? lhs.getFogCoordArray()->getNumElements() : 0;
     if (lhs.getFogCoordArray() && rhs.getFogCoordArray() && lhs.getFogCoordBinding()!=osg::Geometry::BIND_OVERALL)
     {
@@ -2598 +2598 @@
     for(unit=0;unit<lhs.getNumTexCoordArrays();++unit)
     {
-        unsigned int tcbase = lhs.getTexCoordArray(unit) ? lhs.getTexCoordArray(unit)->getNumElements() : 0; 
+        unsigned int tcbase = lhs.getTexCoordArray(unit) ? lhs.getTexCoordArray(unit)->getNumElements() : 0;
         if (!merger.merge(lhs.getTexCoordArray(unit),rhs.getTexCoordArray(unit)))
         {
@@ -2612 +2612 @@
         }
     }
-    
+
     for(unit=0;unit<lhs.getNumVertexAttribArrays();++unit)
     {
-        unsigned int vabase = lhs.getVertexAttribArray(unit) ? lhs.getVertexAttribArray(unit)->getNumElements() : 0; 
+        unsigned int vabase = lhs.getVertexAttribArray(unit) ? lhs.getVertexAttribArray(unit)->getNumElements() : 0;
         if (!merger.merge(lhs.getVertexAttribArray(unit),rhs.getVertexAttribArray(unit)))
         {
             OSG_DEBUG << "MergeGeometry: vertex attrib array not merged. Some data may be lost." <<std::endl;
         }
-        
+
         if (lhs.getVertexAttribIndices(unit) && rhs.getVertexAttribIndices(unit))
         {
@@ -2636 +2636 @@
     {
         osg::PrimitiveSet* primitive = primItr->get();
-        
+
         switch(primitive->getType())
         {
@@ -2704 +2704 @@
         }
     }
-    
+
     for(primItr=rhs.getPrimitiveSetList().begin(); primItr!=rhs.getPrimitiveSetList().end(); ++primItr)
     {
@@ -2712 +2712 @@
     lhs.dirtyBound();
     lhs.dirtyDisplayList();
-    
+
     return true;
 }
@@ -2795 +2795 @@
         if (divide(*itr,maxNumTreesPerCell)) divided = true;
     }
-    
+
     for(GeodesToDivideList::iterator geode_itr=_geodesToDivideList.begin();
         geode_itr!=_geodesToDivideList.end();
@@ -2802 +2802 @@
         if (divide(*geode_itr,maxNumTreesPerCell)) divided = true;
     }
-    
+
     return divided;
 }
@@ -2809 +2809 @@
 {
     if (group->getNumChildren()<=maxNumTreesPerCell) return false;
-    
+
     // create the original box.
     osg::BoundingBox bb;
@@ -2817 +2817 @@
         bb.expandBy(group->getChild(i)->getBound().center());
     }
-    
+
     float radius = bb.radius();
     float divide_distance = radius*0.7f;
@@ -2825 +2825 @@
 
     OSG_INFO<<"Dividing "<<group->className()<<"  num children = "<<group->getNumChildren()<<"  xAxis="<<xAxis<<"  yAxis="<<yAxis<<"   zAxis="<<zAxis<<std::endl;
-    
+
     if (!xAxis && !yAxis && !zAxis)
     {
@@ -2831 +2831 @@
         return false;
     }
-    
+
     unsigned int numChildrenOnEntry = group->getNumChildren();
-    
+
     typedef std::pair< osg::BoundingBox, osg::ref_ptr<osg::Group> > BoxGroupPair;
     typedef std::vector< BoxGroupPair > Boxes;
@@ -2839 +2839 @@
     boxes.push_back( BoxGroupPair(bb,new osg::Group) );
 
-    // divide up on each axis    
+    // divide up on each axis
     if (xAxis)
     {
@@ -2890 +2890 @@
 
     // create the groups to drop the children into
-    
+
 
     // bin each child into associated bb group
@@ -2921 +2921 @@
     //      add in the bb groups
     //      add then the unassigned children.
-    
-    
+
+
     // first removing from the original group,
     group->removeChildren(0,group->getNumChildren());
-    
+
     // add in the bb groups
     typedef std::vector< osg::ref_ptr<osg::Group> > GroupList;
@@ -2951 +2951 @@
         }
     }
-    
-    
+
+
     // add then the unassigned children.
     for(NodeList::iterator nitr=unassignedList.begin();
@@ -2970 +2970 @@
 
     return (numChildrenOnEntry<group->getNumChildren());
-    
+
 }
 
@@ -2977 +2977 @@
 
     if (geode->getNumDrawables()<=maxNumTreesPerCell) return false;
-    
+
     // create the original box.
     osg::BoundingBox bb;
@@ -2985 +2985 @@
         bb.expandBy(geode->getDrawable(i)->getBound().center());
     }
-    
+
     float radius = bb.radius();
     float divide_distance = radius*0.7f;
@@ -2993 +2993 @@
 
     OSG_INFO<<"INFO "<<geode->className()<<"  num drawables = "<<geode->getNumDrawables()<<"  xAxis="<<xAxis<<"  yAxis="<<yAxis<<"   zAxis="<<zAxis<<std::endl;
-    
+
     if (!xAxis && !yAxis && !zAxis)
     {
@@ -2999 +2999 @@
         return false;
     }
-    
+
     osg::Node::ParentList parents = geode->getParents();
-    if (parents.empty()) 
+    if (parents.empty())
     {
         OSG_INFO<<"  Cannot perform spatialize on root Geode, add a Group above it to allow subdivision."<<std::endl;
@@ -3016 +3016 @@
         group->addChild(newGeode);
     }
-    
+
     divide(group.get(), maxNumTreesPerCell);
-    
+
     // keep reference around to prevent it being deleted.
     osg::ref_ptr<osg::Geode> keepRefGeode = geode;
-    
+
     for(osg::Node::ParentList::iterator itr = parents.begin();
         itr != parents.end();
@@ -3028 +3028 @@
         (*itr)->replaceChild(geode, group.get());
     }
-    
+
     return true;
 }
@@ -3060 +3060 @@
             osg::ref_ptr<osg::Object> new_object = node->clone(osg::CopyOp::DEEP_COPY_NODES |
                                                           osg::CopyOp::DEEP_COPY_DRAWABLES);
-            // cast it to node.                                              
+            // cast it to node.
             osg::Node* new_node = dynamic_cast<osg::Node*>(new_object.get());
 
-            // replace the node by new_new 
+            // replace the node by new_new
             if (new_node) node->getParent(i)->replaceChild(node,new_node);
         }
@@ -3078 +3078 @@
 void Optimizer::TextureVisitor::apply(osg::Node& node)
 {
-    
+
     osg::StateSet* ss = node.getStateSet();
-    if (ss && 
+    if (ss &&
         isOperationPermissibleForObject(&node) &&
         isOperationPermissibleForObject(ss))
@@ -3095 +3095 @@
 
     osg::StateSet* ss = geode.getStateSet();
-    
+
     if (ss && isOperationPermissibleForObject(ss))
     {
@@ -3140 +3140 @@
             if (is) ++numImageStreams;
         }
-        
+
         if (numImageStreams==0)
         {
@@ -3146 +3146 @@
         }
     }
-    
+
     if (_changeClientImageStorage)
     {
         texture.setClientStorageHint(_valueClientImageStorage);
     }
-    
+
     if (_changeAnisotropy)
     {
@@ -3196 +3196 @@
         children[i] = group.getChild(i);
     }
-    
+
     // remove all children
     group.removeChildren(0,group.getNumChildren());
@@ -3205 +3205 @@
         osg::Node* child = children[i].get();
 
-        if (typeid(*child)==typeid(osg::Geode)) 
+        if (typeid(*child)==typeid(osg::Geode))
         {
             osg::Geode* geode = static_cast<osg::Geode*>(child);
@@ -3219 +3219 @@
     // if no geodes then just return.
     if (geodeDuplicateMap.empty()) return false;
-    
+
     OSG_INFO<<"mergeGeodes in group '"<<group.getName()<<"' "<<geodeDuplicateMap.size()<<std::endl;
-    
+
     // merge
     for(GeodeDuplicateMap::iterator itr=geodeDuplicateMap.begin();
@@ -3233 +3233 @@
             // add geode back into group
             group.addChild(lhs);
-            
+
             for(DuplicateList::iterator dupItr=itr->second.begin()+1;
                 dupItr!=itr->second.end();
@@ -3285 +3285 @@
         ++itr)
     {
-        bool mergeAcceptable = true;    
+        bool mergeAcceptable = true;
 
         osg::ref_ptr<osg::Billboard> billboard = itr->first;
@@ -3292 +3292 @@
         osg::Group* mainGroup = 0;
         if (npl.size()>1)
-        {        
+        {
             for(NodePathList::iterator nitr = npl.begin();
                 nitr != npl.end();
@@ -3306 +3306 @@
 
                     if (group == mainGroup &&
-                        np[np.size()-1]==billboard.get() && 
+                        np[np.size()-1]==billboard.get() &&
                         mt && mt->getDataVariance()==osg::Object::STATIC &&
                         mt->getNumChildren()==1)
@@ -3338 +3338 @@
             new_billboard->setAxis(billboard->getAxis());
             new_billboard->setStateSet(billboard->getStateSet());
-            new_billboard->setName(billboard->getName());                
+            new_billboard->setName(billboard->getName());
 
             mainGroup->addChild(new_billboard);
@@ -3433 +3433 @@
 
             Source * source = sitr3->get();
-            if (source->_atlas || atlas->_image->getPixelFormat() != source->_image->getPixelFormat() || 
+            if (source->_atlas || atlas->_image->getPixelFormat() != source->_image->getPixelFormat() ||
                 atlas->_image->getDataType() != source->_image->getDataType())
             {
@@ -3471 +3471 @@
             {
                 Source * source = sitr2->get();
-                if (source->_atlas || atlas->_image->getPixelFormat() != source->_image->getPixelFormat() || 
+                if (source->_atlas || atlas->_image->getPixelFormat() != source->_image->getPixelFormat() ||
                     atlas->_image->getDataType() != source->_image->getDataType())
                 {
@@ -3520 +3520 @@
                 ++aitr)
             {
-                if(!(*aitr)->_image || 
+                if(!(*aitr)->_image ||
                     ((*aitr)->_image->getPixelFormat() == (*sitr)->_image->getPixelFormat() &&
                     (*aitr)->_image->getPacking() == (*sitr)->_image->getPacking()))
@@ -3554 +3554 @@
         }
     }
-    
+
     // build the atlas which are suitable for use, and discard the rest.
     AtlasList activeAtlasList;
@@ -3571 +3571 @@
             atlas->_sourceList.clear();
         }
-        
+
         if (!(atlas->_sourceList.empty()))
         {
@@ -3672 +3672 @@
 {
     if (!_image) return false;
-    
+
     // size too big?
     if (_image->s()+margin*2 > maximumAtlasWidth) return false;
     if (_image->t()+margin*2 > maximumAtlasHeight) return false;
-    
+
     switch(_image->getPixelFormat())
     {
@@ -3695 +3695 @@
     }
 
-    if ((_image->getPixelSizeInBits() % 8) != 0) 
+    if ((_image->getPixelSizeInBits() % 8) != 0)
     {
         // pixel size not byte aligned so report as not suitable to prevent other atlas code from having problems with byte boundaries.
@@ -3723 +3723 @@
         }
     }
-    
+
     return true;
 }
@@ -3743 +3743 @@
     const osg::Image* sourceImage = source->_image.get();
     if (!sourceImage) return DOES_NOT_FIT_IN_ANY_ROW;
-    
+
     // does pixel format match?
     if (_image.valid())
@@ -3750 +3750 @@
         if (_image->getDataType() != sourceImage->getDataType()) return DOES_NOT_FIT_IN_ANY_ROW;
     }
-    
+
     const osg::Texture2D* sourceTexture = source->_texture.get();
     if (sourceTexture)
@@ -3777 +3777 @@
         {
 
-            bool sourceUsesBorder = sourceTexture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::CLAMP_TO_BORDER || 
+            bool sourceUsesBorder = sourceTexture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::CLAMP_TO_BORDER ||
                                     sourceTexture->getWrap(osg::Texture2D::WRAP_T)==osg::Texture2D::CLAMP_TO_BORDER;
 
-            bool atlasUsesBorder = sourceTexture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::CLAMP_TO_BORDER || 
+            bool atlasUsesBorder = sourceTexture->getWrap(osg::Texture2D::WRAP_S)==osg::Texture2D::CLAMP_TO_BORDER ||
                                    sourceTexture->getWrap(osg::Texture2D::WRAP_T)==osg::Texture2D::CLAMP_TO_BORDER;
 
@@ -3794 +3794 @@
                 if (_texture->getBorderColor() != sourceTexture->getBorderColor()) return DOES_NOT_FIT_IN_ANY_ROW;
             }
-            
+
             if (_texture->getFilter(osg::Texture2D::MIN_FILTER) != sourceTexture->getFilter(osg::Texture2D::MIN_FILTER))
             {
@@ -3800 +3800 @@
                 return DOES_NOT_FIT_IN_ANY_ROW;
             }
- 
+
             if (_texture->getFilter(osg::Texture2D::MAG_FILTER) != sourceTexture->getFilter(osg::Texture2D::MAG_FILTER))
             {
@@ -3806 +3806 @@
                 return DOES_NOT_FIT_IN_ANY_ROW;
             }
-            
+
             if (_texture->getMaxAnisotropy() != sourceTexture->getMaxAnisotropy())
             {
@@ -3812 +3812 @@
                 return DOES_NOT_FIT_IN_ANY_ROW;
             }
-            
+
             if (_texture->getInternalFormat() != sourceTexture->getInternalFormat())
             {
@@ -3818 +3818 @@
                 return DOES_NOT_FIT_IN_ANY_ROW;
             }
-            
+
             if (_texture->getShadowCompareFunc() != sourceTexture->getShadowCompareFunc())
             {
@@ -3824 +3824 @@
                 return DOES_NOT_FIT_IN_ANY_ROW;
             }
-                
+
             if (_texture->getShadowTextureMode() != sourceTexture->getShadowTextureMode())
             {
@@ -3838 +3838 @@
         }
     }
-    
+
     if (sourceImage->s() + 2*_margin > _maximumAtlasWidth)
     {
@@ -3844 +3844 @@
         return DOES_NOT_FIT_IN_ANY_ROW;
     }
-    
+
     if (sourceImage->t() + 2*_margin > _maximumAtlasHeight)
     {
@@ -3872 +3872 @@
         return IN_NEXT_ROW;
     }
-    
+
     // no space for the texture
     return DOES_NOT_FIT_IN_ANY_ROW;
@@ -3903 +3903 @@
         _texture->setWrap(osg::Texture2D::WRAP_S, sourceTexture->getWrap(osg::Texture2D::WRAP_S));
         _texture->setWrap(osg::Texture2D::WRAP_T, sourceTexture->getWrap(osg::Texture2D::WRAP_T));
-        
+
         _texture->setBorderColor(sourceTexture->getBorderColor());
         _texture->setBorderWidth(0);
-            
+
         _texture->setFilter(osg::Texture2D::MIN_FILTER, sourceTexture->getFilter(osg::Texture2D::MIN_FILTER));
         _texture->setFilter(osg::Texture2D::MAG_FILTER, sourceTexture->getFilter(osg::Texture2D::MAG_FILTER));
@@ -3932 +3932 @@
         source->_y = _y + _margin;
         source->_atlas = this;
-        
+
         // move the atlas' cursor along to the right
         _x += sourceImage->s() + 2*_margin;
-        
+
         if (_x > _width) _width = _x;
-        
+
         int localTop = _y + sourceImage->t() + 2*_margin;
         if ( localTop > _height) _height = localTop;
@@ -3960 +3960 @@
         source->_y = _y + _margin;
         source->_atlas = this;
-        
+
         // move the atlas' cursor along to the right
         _x += sourceImage->s() + 2*_margin;
@@ -3986 +3986 @@
     int h = 1;
     while (h<_height) h *= 2;
-    
+
     OSG_INFO<<"Clamping "<<_width<<", "<<_height<<" to "<<w<<","<<h<<std::endl;
-    
+
     _width = w;
     _height = h;
@@ -4003 +4003 @@
                           pixelFormat, dataType,
                           packing);
-                          
+
     {
         // clear memory
@@ -4009 +4009 @@
         unsigned char* str = _image->data();
         for(unsigned int i=0; i<size; ++i) *(str++) = 0;
-    }        
+    }
 
     OSG_INFO<<"Atlas::copySources() "<<std::endl;
@@ -4052 +4052 @@
                 }
             }
-            
+
             // copy top row margin
             y = source->_y + sourceImage->t();
@@ -4064 +4064 @@
                     *(destPtr++) = *(sourcePtr++);
                 }
-                
-            }
-            
+
+            }
+
 
 
@@ -4079 +4079 @@
                     *(destPtr++) = *(sourcePtr++);
                 }
-                
+
             }
 
@@ -4096 +4096 @@
                     }
                 }
-            }            
+            }
 
             // copy right column margin
@@ -4112 +4112 @@
                     }
                 }
-            }            
+            }
 
             // copy top left corner margin
@@ -4178 +4178 @@
 {
     osg::StateSet::TextureAttributeList& tal = stateset->getTextureAttributeList();
-    
+
     // if no textures ignore
     if (tal.empty()) return false;
-    
+
     bool pushStateState = false;
 
     // if already in stateset list ignore
-    if (_statesetMap.count(stateset)>0) 
+    if (_statesetMap.count(stateset)>0)
     {
         pushStateState = true;
@@ -4208 +4208 @@
         }
     }
-    
+
     if (pushStateState)
     {
@@ -4214 +4214 @@
     }
 
-    
-    return pushStateState;  
+
+    return pushStateState;
 }
 
@@ -4226 +4226 @@
 {
     bool pushedStateState = false;
-    
+
     osg::StateSet* ss = node.getStateSet();
-    if (ss && ss->getDataVariance()==osg::Object::STATIC) 
+    if (ss && ss->getDataVariance()==osg::Object::STATIC)
     {
         if (isOperationPermissibleForObject(&node) &&
@@ -4238 +4238 @@
 
     traverse(node);
-    
+
     if (pushedStateState) popStateSet();
 }
@@ -4247 +4247 @@
 
     osg::StateSet* ss = geode.getStateSet();
-    
-    
+
+
     bool pushedGeodeStateState = false;
 
@@ -4275 +4275 @@
                 }
             }
-            
+
             if (!_statesetStack.empty())
             {
                 for(StateSetStack::iterator ssitr = _statesetStack.begin();
-                    ssitr != _statesetStack.end(); 
+                    ssitr != _statesetStack.end();
                     ++ssitr)
                 {
@@ -4288 +4288 @@
             if (pushedDrawableStateState) popStateSet();
         }
-        
-    }
-    
+
+    }
+
     if (pushedGeodeStateState) popStateSet();
 }
@@ -4297 +4297 @@
 {
     _builder.reset();
-    
+
     if (_textures.size()<2)
     {
@@ -4326 +4326 @@
                 bool t_repeat = texture->getWrap(osg::Texture2D::WRAP_T)==osg::Texture2D::REPEAT ||
                                 texture->getWrap(osg::Texture2D::WRAP_T)==osg::Texture2D::MIRROR;
-                               
+
                 if (s_repeat || t_repeat)
                 {
                     texturesThatRepeat.insert(texture);
-                
+
                     bool s_outOfRange = false;
                     bool t_outOfRange = false;
-  
+
                     float s_min = -0.001;
                     float s_max = 1.001;
@@ -4339 +4339 @@
                     float t_min = -0.001;
                     float t_max = 1.001;
-                    
+
                     for(Drawables::iterator ditr = drawables.begin();
                         ditr != drawables.end();
@@ -4365 +4365 @@
                             s_outOfRange = true;
                             t_outOfRange = true;
-                        }                        
+                        }
                     }
 
-                    if (s_outOfRange || t_outOfRange) 
-                    {                    
+                    if (s_outOfRange || t_outOfRange)
+                    {
                         texturesThatRepeatAndAreOutOfRange.insert(texture);
                     }
@@ -4378 +4378 @@
     }
 
-    // now change any texture that repeat but all texcoords to them 
+    // now change any texture that repeat but all texcoords to them
     // are in 0 to 1 range than converting the to CLAMP mode, to allow them
     // to be used in an atlas.
@@ -4434 +4434 @@
         }
     }
-    
+
     Drawables drawablesThatHaveMultipleTexturesOnOneUnit;
     for(DrawableStateSetMap::iterator ditr = dssm.begin();
@@ -4475 +4475 @@
         }
     }
-        
-    // remap the textures in the StateSet's 
+
+    // remap the textures in the StateSet's
     for(sitr = _statesetMap.begin();
         sitr != _statesetMap.end();
@@ -4503 +4503 @@
 
                     stateset->setTextureAttribute(unit, newTexture);
-                    
+
                     Drawables& drawables = sitr->second;
-                    
+
                     osg::Matrix matrix = _builder.getTextureMatrix(texture);
-                    
+
                     // first check to see if all drawables are ok for applying texturematrix to.
                     bool canTexMatBeFlattenedToAllDrawables = true;
@@ -4517 +4517 @@
                         osg::Vec2Array* texcoords = geom ? dynamic_cast<osg::Vec2Array*>(geom->getTexCoordArray(unit)) : 0;
 
-                        if (!texcoords) 
+                        if (!texcoords)
                         {
                             canTexMatBeFlattenedToAllDrawables = false;
                         }
-                        
+
                         if (drawablesThatHaveMultipleTexturesOnOneUnit.count(*ditr)!=0)
                         {
@@ -4551 +4551 @@
                             {
                                 OSG_NOTICE<<"Error, Optimizer::TextureAtlasVisitor::optimize() shouldn't ever get here..."<<std::endl;
-                            }                        
+                            }
                         }
                     }
@@ -4597 +4597 @@
 
 void Optimizer::StaticObjectDetectionVisitor::applyDrawable(osg::Drawable& drawable)
-{   
-    
+{
+
     if (drawable.getStateSet()) applyStateSet(*drawable.getStateSet());
-    
+
     drawable.computeDataVariance();
 }
@@ -4661 +4661 @@
         _matrixStack.push_back(matrix);
         pushed = true;
-    
+
         // convert this Transform to a Group
         osg::ref_ptr<osg::Group> group = new osg::Group(dynamic_cast<osg::Group&>(transform),
@@ -4736 +4736 @@
         {
             transformGeode(geode);
-        }    
+        }
         else
         {