Changeset 13041 for OpenSceneGraph/trunk/src/osg/StateSet.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/osg/StateSet.cpp (modified) (61 diffs)

OpenSceneGraph/trunk/src/osg/StateSet.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 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.
 */
@@ -39 +39 @@
 using namespace osg;
 
-// local class to help porting from OSG0.8.x to 0.9.x 
+// local class to help porting from OSG0.8.x to 0.9.x
 class TextureGLModeSet
 {
@@ -61 +61 @@
             _textureModeSet.insert(GL_TEXTURE_GEN_T);
         }
-        
+
         bool isTextureMode(StateAttribute::GLMode mode) const
         {
@@ -70 +70 @@
 
         std::set<StateAttribute::GLMode> _textureModeSet;
-        
+
 };
 
@@ -89 +89 @@
 {
     _renderingHint = DEFAULT_BIN;
-    
+
     _numChildrenRequiringUpdateTraversal = 0;
     _numChildrenRequiringEventTraversal = 0;
@@ -114 +114 @@
         }
     }
-    
+
     // copy texture related modes.
     _textureModeList = rhs._textureModeList;
-    
+
     // set up the size of the texture attribute list.
     _textureAttributeList.resize(rhs._textureAttributeList.size());
-    
+
     // copy the contents across.
     for(unsigned int i=0;i<rhs._textureAttributeList.size();++i)
     {
-        
+
         AttributeList& lhs_attributeList = _textureAttributeList[i];
         const AttributeList& rhs_attributeList = rhs._textureAttributeList[i];
@@ -156 +156 @@
         }
     }
-    
+
     _renderingHint = rhs._renderingHint;
 
@@ -192 +192 @@
         ++itr)
     {
-        if (itr->second.first->getDataVariance()==UNSPECIFIED && 
+        if (itr->second.first->getDataVariance()==UNSPECIFIED &&
             (itr->second.first->getUpdateCallback() || itr->second.first->getEventCallback()))
         {
@@ -209 +209 @@
             ++itr)
         {
-            if (itr->second.first->getDataVariance()==UNSPECIFIED && 
+            if (itr->second.first->getDataVariance()==UNSPECIFIED &&
                 (itr->second.first->getUpdateCallback() || itr->second.first->getEventCallback()))
             {
@@ -225 +225 @@
         ++uitr)
     {
-        if (uitr->second.first->getDataVariance()==UNSPECIFIED && 
+        if (uitr->second.first->getDataVariance()==UNSPECIFIED &&
             (uitr->second.first->getUpdateCallback() || uitr->second.first->getEventCallback()))
         {
@@ -274 +274 @@
     if (_textureAttributeList.size()<rhs._textureAttributeList.size()) return -1;
     if (_textureAttributeList.size()>rhs._textureAttributeList.size()) return 1;
-    
+
     for(unsigned int ai=0;ai<_textureAttributeList.size();++ai)
     {
@@ -325 +325 @@
     }
 
-    
+
     // now check the rest of the non texture attributes
     if (compareAttributeContents)
@@ -371 +371 @@
         else if (rhs_attr_itr == rhs._attributeList.end()) return 1;
     }
-    
-    // we've got here so attributes must be equal...    
+
+    // we've got here so attributes must be equal...
 
 
@@ -440 +440 @@
         if (rhs_uniform_itr!=rhs._uniformList.end()) return -1;
     }
-    else if (rhs_uniform_itr == rhs._uniformList.end()) return 1;  
+    else if (rhs_uniform_itr == rhs._uniformList.end()) return 1;
 
     // check render bin details
-    
+
     if ( _binMode < rhs._binMode ) return -1;
     else if ( _binMode > rhs._binMode ) return 1;
-    
+
     if ( _binMode != INHERIT_RENDERBIN_DETAILS )
     {
@@ -527 +527 @@
 
 void StateSet::setGlobalDefaults()
-{    
+{
     _renderingHint = DEFAULT_BIN;
 
@@ -543 +543 @@
         material->setColorMode(Material::AMBIENT_AND_DIFFUSE);
         setAttributeAndModes(material,StateAttribute::ON);
-        
+
     #endif
 }
@@ -562 +562 @@
         itr->second.first->removeParent(this);
     }
-    
+
     _modeList.clear();
     _attributeList.clear();
-    
+
 
     // remove self from as texture attributes parent
@@ -596 +596 @@
 void StateSet::merge(const StateSet& rhs)
 {
-    // merge the modes of rhs into this, 
+    // merge the modes of rhs into this,
     // this overrides rhs if OVERRIDE defined in this.
     for(ModeList::const_iterator rhs_mitr = rhs._modeList.begin();
@@ -605 +605 @@
         if (lhs_mitr!=_modeList.end())
         {
-            // take the rhs mode unless the lhs is override and the rhs is not protected 
+            // take the rhs mode unless the lhs is override and the rhs is not protected
             if (!(lhs_mitr->second & StateAttribute::OVERRIDE ) ||
-                 (rhs_mitr->second & StateAttribute::PROTECTED)) 
+                 (rhs_mitr->second & StateAttribute::PROTECTED))
             {
                 // override isn't on in rhs, so override it with incoming
@@ -621 +621 @@
     }
 
-    // merge the attributes of rhs into this, 
+    // merge the attributes of rhs into this,
     // this overrides rhs if OVERRIDE defined in this.
     for(AttributeList::const_iterator rhs_aitr = rhs._attributeList.begin();
@@ -630 +630 @@
         if (lhs_aitr!=_attributeList.end())
         {
-            // take the rhs attribute unless the lhs is override and the rhs is not protected 
+            // take the rhs attribute unless the lhs is override and the rhs is not protected
             if (!(lhs_aitr->second.second & StateAttribute::OVERRIDE) ||
                  (rhs_aitr->second.second & StateAttribute::PROTECTED))
@@ -668 +668 @@
         ModeList& lhs_modeList = _textureModeList[mi];
         const ModeList& rhs_modeList = rhs._textureModeList[mi];
-        // merge the modes of rhs into this, 
+        // merge the modes of rhs into this,
         // this overrides rhs if OVERRIDE defined in this.
         for(ModeList::const_iterator rhs_mitr = rhs_modeList.begin();
@@ -677 +677 @@
             if (lhs_mitr!=lhs_modeList.end())
             {
-                // take the rhs mode unless the lhs is override and the rhs is not protected 
+                // take the rhs mode unless the lhs is override and the rhs is not protected
                 if (!(lhs_mitr->second & StateAttribute::OVERRIDE) ||
-                     (rhs_mitr->second & StateAttribute::PROTECTED)) 
+                     (rhs_mitr->second & StateAttribute::PROTECTED))
                 {
                     // override isn't on in rhs, so override it with incoming
@@ -693 +693 @@
         }
     }
-    
+
     if (_textureAttributeList.size()<rhs._textureAttributeList.size()) _textureAttributeList.resize(rhs._textureAttributeList.size());
     for(unsigned int ai=0;ai<rhs._textureAttributeList.size();++ai)
@@ -699 +699 @@
         AttributeList& lhs_attributeList = _textureAttributeList[ai];
         const AttributeList& rhs_attributeList = rhs._textureAttributeList[ai];
-        
-        // merge the attributes of rhs into this, 
+
+        // merge the attributes of rhs into this,
         // this overrides rhs if OVERRIDE defined in this.
         for(AttributeList::const_iterator rhs_aitr = rhs_attributeList.begin();
@@ -709 +709 @@
             if (lhs_aitr!=lhs_attributeList.end())
             {
-                // take the rhs attribute unless the lhs is override and the rhs is not protected 
+                // take the rhs attribute unless the lhs is override and the rhs is not protected
                 if (!(lhs_aitr->second.second & StateAttribute::OVERRIDE) ||
-                     (rhs_aitr->second.second & StateAttribute::PROTECTED)) 
+                     (rhs_aitr->second.second & StateAttribute::PROTECTED))
                 {
                     // override isn't on in rhs, so override it with incoming
                     // value.
-                    
+
                     if (lhs_aitr->second.first!=rhs_aitr->second.first)
                     {
@@ -736 +736 @@
     }
 
-    // merge the uniforms of rhs into this, 
+    // merge the uniforms of rhs into this,
     // this overrides rhs if OVERRIDE defined in this.
     for(UniformList::const_iterator rhs_uitr = rhs._uniformList.begin();
@@ -745 +745 @@
         if (lhs_uitr!=_uniformList.end())
         {
-            // take the rhs uniform unless the lhs is override and the rhs is not protected 
+            // take the rhs uniform unless the lhs is override and the rhs is not protected
             if (!(lhs_uitr->second.second & StateAttribute::OVERRIDE) ||
-                 (rhs_uitr->second.second & StateAttribute::PROTECTED)) 
+                 (rhs_uitr->second.second & StateAttribute::PROTECTED))
             {
                 // override isn't on in rhs, so override it with incoming
@@ -861 +861 @@
             setTextureAttribute(0,attribute,value);
         }
-    }        
+    }
 }
 
@@ -873 +873 @@
             {
                 removeAttribute(attribute->getType());
-            }    
+            }
             else
             {
@@ -896 +896 @@
     if (itr!=_attributeList.end())
     {
-        if (itr->second.first->getUpdateCallback()) 
+        if (itr->second.first->getUpdateCallback())
         {
             setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()-1);
         }
 
-        if (itr->second.first->getEventCallback()) 
+        if (itr->second.first->getEventCallback())
         {
             setNumChildrenRequiringEventTraversal(getNumChildrenRequiringEventTraversal()-1);
@@ -915 +915 @@
 {
     if (!attribute) return;
-    
+
     AttributeList::iterator itr = _attributeList.find(attribute->getTypeMemberPair());
     if (itr!=_attributeList.end())
     {
         if (itr->second.first != attribute) return;
-        
-        if (itr->second.first->getUpdateCallback()) 
+
+        if (itr->second.first->getUpdateCallback())
         {
             setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()-1);
         }
 
-        if (itr->second.first->getEventCallback()) 
+        if (itr->second.first->getEventCallback())
         {
             setNumChildrenRequiringEventTraversal(getNumChildrenRequiringEventTraversal()-1);
@@ -959 +959 @@
         int delta_update = 0;
         int delta_event = 0;
-        
+
         UniformList::iterator itr=_uniformList.find(uniform->getName());
         if (itr==_uniformList.end())
@@ -967 +967 @@
             up.first = uniform;
             up.second = value&(StateAttribute::OVERRIDE|StateAttribute::PROTECTED);
-            
+
             uniform->addParent(this);
-            
-            if (uniform->getUpdateCallback()) 
+
+            if (uniform->getUpdateCallback())
             {
                 delta_update = 1;
             }
 
-            if (uniform->getEventCallback()) 
+            if (uniform->getEventCallback())
             {
                 delta_event = 1;
@@ -992 +992 @@
                 if (itr->second.first->getUpdateCallback()) --delta_update;
                 if (itr->second.first->getEventCallback()) --delta_event;
-                
+
                 uniform->addParent(this);
                 itr->second.first = uniform;
@@ -1002 +1002 @@
         }
 
-        if (delta_update!=0) 
+        if (delta_update!=0)
         {
             setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+delta_update);
         }
 
-        if (delta_event!=0) 
+        if (delta_event!=0)
         {
             setNumChildrenRequiringEventTraversal(getNumChildrenRequiringEventTraversal()+delta_event);
@@ -1020 +1020 @@
     if (itr!=_uniformList.end())
     {
-        if (itr->second.first->getUpdateCallback()) 
+        if (itr->second.first->getUpdateCallback())
         {
             setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()-1);
         }
 
-        if (itr->second.first->getEventCallback()) 
+        if (itr->second.first->getEventCallback())
         {
             setNumChildrenRequiringEventTraversal(getNumChildrenRequiringEventTraversal()-1);
@@ -1039 +1039 @@
 {
     if (!uniform) return;
-    
+
     UniformList::iterator itr = _uniformList.find(uniform->getName());
     if (itr!=_uniformList.end())
@@ -1045 +1045 @@
         if (itr->second.first != uniform) return;
 
-        if (itr->second.first->getUpdateCallback()) 
+        if (itr->second.first->getUpdateCallback())
         {
             setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()-1);
         }
 
-        if (itr->second.first->getEventCallback()) 
+        if (itr->second.first->getEventCallback())
         {
             setNumChildrenRequiringEventTraversal(getNumChildrenRequiringEventTraversal()-1);
@@ -1071 +1071 @@
     // for look for an appropriate uniform.
     UniformList::iterator itr = _uniformList.find(name);
-    if (itr!=_uniformList.end() && 
+    if (itr!=_uniformList.end() &&
         itr->second.first->getType()==type)
     {
@@ -1078 +1078 @@
 
     // no uniform found matching name so create it..
-    
+
     Uniform* uniform = new Uniform(type,name,numElements);
     addUniform(uniform);
-    
+
     return uniform;
 }
@@ -1174 +1174 @@
     if (attribute)
     {
-    
+
         if (attribute->isTextureAttribute())
         {
@@ -1210 +1210 @@
         }
 
-        if (itr->second.first->getUpdateCallback()) 
+        if (itr->second.first->getUpdateCallback())
         {
             setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()-1);
         }
 
-        if (itr->second.first->getEventCallback()) 
+        if (itr->second.first->getEventCallback())
         {
             setNumChildrenRequiringEventTraversal(getNumChildrenRequiringEventTraversal()-1);
@@ -1239 +1239 @@
         setAssociatedTextureModes(unit,itr->second.first.get(),StateAttribute::INHERIT);
 
-        if (itr->second.first->getUpdateCallback()) 
+        if (itr->second.first->getUpdateCallback())
         {
             setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()-1);
         }
 
-        if (itr->second.first->getEventCallback()) 
+        if (itr->second.first->getEventCallback())
         {
             setNumChildrenRequiringEventTraversal(getNumChildrenRequiringEventTraversal()-1);
@@ -1475 +1475 @@
             _value(value),
             _unit(unit) {}
-            
+
         virtual ~SetAssociateModesHelper() {}
-        
+
         virtual void usesMode(StateAttribute::GLMode mode)
         {
             _stateset->setMode(mode,_value);
         }
-        
+
         virtual void usesTextureMode(StateAttribute::GLMode mode)
         {
             _stateset->setTextureMode(_unit,mode,_value);
         }
-        
-       
-        
+
+
+
         StateSet*                   _stateset;
         StateAttribute::GLModeValue _value;
@@ -1501 +1501 @@
             _stateset(stateset),
             _unit(unit) {}
-            
+
         virtual ~RemoveAssociateModesHelper() {}
-        
+
         virtual void usesMode(StateAttribute::GLMode mode)
         {
             _stateset->removeMode(mode);
         }
-        
+
         virtual void usesTextureMode(StateAttribute::GLMode mode)
         {
            _stateset->removeTextureMode(_unit, mode);
         }
-        
-       
-        
+
+
+
         StateSet*                   _stateset;
         unsigned int                _unit;
@@ -1550 +1550 @@
         int delta_update = 0;
         int delta_event = 0;
-        
+
         AttributeList::iterator itr=attributeList.find(attribute->getTypeMemberPair());
         if (itr==attributeList.end())
@@ -1557 +1557 @@
             attributeList[attribute->getTypeMemberPair()] = RefAttributePair(attribute,value&(StateAttribute::OVERRIDE|StateAttribute::PROTECTED));
             attribute->addParent(this);
-            
-            if (attribute->getUpdateCallback()) 
+
+            if (attribute->getUpdateCallback())
             {
                 delta_update = 1;
             }
 
-            if (attribute->getEventCallback()) 
+            if (attribute->getEventCallback())
             {
                 delta_event = 1;
@@ -1590 +1590 @@
         }
 
-        if (delta_update!=0) 
+        if (delta_update!=0)
         {
             setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+delta_update);
         }
 
-        if (delta_event!=0) 
+        if (delta_event!=0)
         {
             setNumChildrenRequiringEventTraversal(getNumChildrenRequiringEventTraversal()+delta_event);
@@ -1644 +1644 @@
 
     if (_updateCallback==ac) return;
-    
+
     int delta = 0;
     if (_updateCallback.valid()) --delta;
@@ -1650 +1650 @@
 
     _updateCallback = ac;
-    
+
     if (delta!=0 && _numChildrenRequiringUpdateTraversal==0)
     {
@@ -1662 +1662 @@
 
             osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(*itr);
-            if (drawable) 
+            if (drawable)
             {
                 //drawable->setNumChildrenRequiringUpdateTraversal(drawable->getNumChildrenRequiringUpdateTraversal()+delta);
             }
-            else 
+            else
             {
                 osg::Node* node = dynamic_cast<osg::Node*>(*itr);
-                if (node) 
+                if (node)
                 {
                     node->setNumChildrenRequiringUpdateTraversal(node->getNumChildrenRequiringUpdateTraversal()+delta);
@@ -1724 +1724 @@
 {
     if (_eventCallback==ac) return;
-    
+
     int delta = 0;
     if (_eventCallback.valid()) --delta;
@@ -1730 +1730 @@
 
     _eventCallback = ac;
-    
+
     if (delta!=0 && _numChildrenRequiringEventTraversal==0)
     {
@@ -1738 +1738 @@
         {
             osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(*itr);
-            if (drawable) 
+            if (drawable)
             {
                 //drawable->setNumChildrenRequiringUpdateTraversal(drawable->getNumChildrenRequiringUpdateTraversal()+delta);
             }
-            else 
+            else
             {
                 osg::Node* node = dynamic_cast<osg::Node*>(*itr);
-                if (node) 
+                if (node)
                 {
                     node->setNumChildrenRequiringEventTraversal(node->getNumChildrenRequiringEventTraversal()+delta);
@@ -1805 +1805 @@
     if (!_updateCallback && !_parents.empty())
     {
-    
-        // need to pass on changes to parents.        
+
+        // need to pass on changes to parents.
         int delta = 0;
         if (_numChildrenRequiringUpdateTraversal>0) --delta;
@@ -1818 +1818 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(*itr);
-                if (drawable) 
+                if (drawable)
                 {
                     drawable->setNumChildrenRequiringUpdateTraversal(drawable->getNumChildrenRequiringUpdateTraversal()+delta);
                 }
-                else 
+                else
                 {
                     osg::Node* node = dynamic_cast<osg::Node*>(*itr);
-                    if (node) 
+                    if (node)
                     {
                         node->setNumChildrenRequiringUpdateTraversal(node->getNumChildrenRequiringUpdateTraversal()+delta);
@@ -1835 +1835 @@
         }
     }
-    
+
     // finally update this objects value.
     _numChildrenRequiringUpdateTraversal=num;
@@ -1850 +1850 @@
     if (!_eventCallback && !_parents.empty())
     {
-    
-        // need to pass on changes to parents.        
+
+        // need to pass on changes to parents.
         int delta = 0;
         if (_numChildrenRequiringEventTraversal>0) --delta;
@@ -1863 +1863 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 osg::Drawable* drawable = dynamic_cast<osg::Drawable*>(*itr);
-                if (drawable) 
+                if (drawable)
                 {
                     drawable->setNumChildrenRequiringEventTraversal(drawable->getNumChildrenRequiringEventTraversal()+delta);
                 }
-                else 
+                else
                 {
                     osg::Node* node = dynamic_cast<osg::Node*>(*itr);
-                    if (node) 
+                    if (node)
                     {
                         node->setNumChildrenRequiringEventTraversal(node->getNumChildrenRequiringEventTraversal()+delta);
@@ -1880 +1880 @@
         }
     }
-    
+
     // finally Event this objects value.
     _numChildrenRequiringEventTraversal=num;