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

OpenSceneGraph/trunk/src/osg/State.cpp

@@ -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.
 */
@@ -58 +58 @@
         _useModelViewAndProjectionUniforms = true;
         _useVertexAttributeAliasing = true;
-    #else    
+    #else
         _useModelViewAndProjectionUniforms = false;
         _useVertexAttributeAliasing = false;
     #endif
-    
+
     _modelViewMatrixUniform = new Uniform(Uniform::FLOAT_MAT4,"osg_ModelViewMatrix");
     _projectionMatrixUniform = new Uniform(Uniform::FLOAT_MAT4,"osg_ProjectionMatrix");
@@ -110 +110 @@
     }
 
-    _abortRenderingPtr = NULL;    
+    _abortRenderingPtr = NULL;
 
     _checkGLErrors = ONCE_PER_FRAME;
@@ -135 +135 @@
     _isVertexBufferObjectSupportResolved = false;
     _isVertexBufferObjectSupported = false;
-    
+
     _lastAppliedProgramObject = 0;
 
@@ -187 +187 @@
     const Program::PerContextProgram* ppcp = reinterpret_cast<const Program::PerContextProgram*>(object);
     AppliedProgramObjectSet::iterator itr = _appliedProgramObjectSet.find(ppcp);
-    if (itr != _appliedProgramObjectSet.end()) 
+    if (itr != _appliedProgramObjectSet.end())
     {
         // OSG_NOTICE<<"Removing _appliedProgramObjectSet entry "<<ppcp<<std::endl;
@@ -206 +206 @@
         ms.last_applied_value = !ms.global_default_value;
         ms.changed = true;
-    }        
+    }
 #else
     _modeMap.clear();
@@ -213 +213 @@
     _modeMap[GL_DEPTH_TEST].global_default_value = true;
     _modeMap[GL_DEPTH_TEST].changed = true;
-    
+
     // go through all active StateAttribute's, setting to change to force update,
     // the idea is to leave only the global defaults left.
@@ -226 +226 @@
         as.changed = true;
     }
-    
+
     // we can do a straight clear, we arn't interested in GL_DEPTH_TEST defaults in texture modes.
     for(TextureModeMapList::iterator tmmItr=_textureModeMapList.begin();
@@ -255 +255 @@
 
     _stateStateStack.clear();
-    
+
     _modelView = _identity;
     _projection = _identity;
-    
+
     dirtyAllVertexArrays();
-    
+
 #if 0
     // reset active texture unit values and call OpenGL
     // note, this OpenGL op precludes the use of State::reset() without a
-    // valid graphics context, therefore the new implementation below 
+    // valid graphics context, therefore the new implementation below
     // is preferred.
     setActiveTextureUnit(0);
@@ -285 +285 @@
         (*apitr)->removeObserver(this);
     }
-    
+
     _appliedProgramObjectSet.clear();
-    
-    
+
+
     // what about uniforms??? need to clear them too...
     // go through all active Unfirom's, setting to change to force update,
@@ -333 +333 @@
         pushModeList(_modeMap,dstate->getModeList());
 
-        // iterator through texture modes.        
+        // iterator through texture modes.
         unsigned int unit;
         const StateSet::TextureModeList& ds_textureModeList = dstate->getTextureModeList();
@@ -361 +361 @@
 
     while (!_stateStateStack.empty()) popStateSet();
-    
+
     applyProjectionMatrix(0);
     applyModelViewMatrix(0);
-    
+
     _lastAppliedProgramObject = 0;
 }
@@ -373 +373 @@
 
     if (_stateStateStack.empty()) return;
-    
-    
+
+
     const StateSet* dstate = _stateStateStack.back();
 
@@ -382 +382 @@
         popModeList(_modeMap,dstate->getModeList());
 
-        // iterator through texture modes.        
+        // iterator through texture modes.
         unsigned int unit;
         const StateSet::TextureModeList& ds_textureModeList = dstate->getTextureModeList();
@@ -402 +402 @@
 
     }
-    
+
     // remove the top draw state from the stack.
     _stateStateStack.pop_back();
@@ -410 +410 @@
 {
     StateSetStack tempStack;
-    
+
     // first pop the StateSet above the position we need to insert at
     while (_stateStateStack.size()>pos)
@@ -420 +420 @@
     // push our new stateset
     pushStateSet(dstate);
-    
+
     // push back the original ones
     for(StateSetStack::reverse_iterator itr = tempStack.rbegin();
@@ -438 +438 @@
         return;
     }
-    
+
     // record the StateSet above the one we intend to remove
     StateSetStack tempStack;
@@ -447 +447 @@
     }
 
-    // remove the intended StateSet as well    
+    // remove the intended StateSet as well
     popStateSet();
 
@@ -463 +463 @@
     // empty the stateset first.
     stateset.clear();
-    
+
     for(ModeMap::const_iterator mitr=_modeMap.begin();
         mitr!=_modeMap.end();
@@ -474 +474 @@
             stateset.setMode(mitr->first,ms.valueVec.back());
         }
-    }        
+    }
 
     for(AttributeMap::const_iterator aitr=_attributeMap.begin();
@@ -485 +485 @@
             stateset.setAttribute(const_cast<StateAttribute*>(as.attributeVec.back().first));
         }
-    }        
+    }
 
 }
@@ -571 +571 @@
     // go through all active StateAttribute's, applying where appropriate.
     applyAttributeMap(_attributeMap);
-       
+
     unsigned int unit;
     unsigned int unitMax = maximum(_textureModeMapList.size(),_textureAttributeMapList.size());
@@ -702 +702 @@
 
     // will need to disable this mode on next apply so set it to changed.
-    ms.changed = true;    
+    ms.changed = true;
 }
 
@@ -715 +715 @@
 
     // will need to disable this mode on next apply so set it to changed.
-    ms.changed = true;    
+    ms.changed = true;
 }
 
@@ -734 +734 @@
 void State::haveAppliedAttribute(AttributeMap& attributeMap,StateAttribute::Type type, unsigned int member)
 {
-    
+
     AttributeMap::iterator itr = attributeMap.find(StateAttribute::TypeMemberPair(type,member));
     if (itr!=attributeMap.end())
@@ -782 +782 @@
         ModeStack& ms = mitr->second;
         ms.last_applied_value = !ms.last_applied_value;
-        ms.changed = true;    
-
-    }        
+        ms.changed = true;
+
+    }
 
     for(TextureModeMapList::iterator tmmItr=_textureModeMapList.begin();
@@ -796 +796 @@
             ModeStack& ms = mitr->second;
             ms.last_applied_value = !ms.last_applied_value;
-            ms.changed = true;    
-
-        }        
+            ms.changed = true;
+
+        }
     }
 }
@@ -812 +812 @@
         as.changed = true;
     }
-    
+
 
     for(TextureAttributeMapList::iterator tamItr=_textureAttributeMapList.begin();
@@ -1032 +1032 @@
 * note, only updates values that change.*/
 void State::setVertexAttribPointer( unsigned int index,
-                                      GLint size, GLenum type, GLboolean normalized, 
+                                      GLint size, GLenum type, GLboolean normalized,
                                     GLsizei stride, const GLvoid *ptr )
 {
@@ -1058 +1058 @@
         eap._dirty = false;
     }
-}      
+}
 
 /** wrapper around DisableVertexAttribArrayARB(index);
@@ -1077 +1077 @@
         }
     }
-}        
+}
 
 void State::disableVertexAttribPointersAboveAndIncluding( unsigned int index )
@@ -1288 +1288 @@
 
     OSG_INFO<<"++Before Converted source "<<std::endl<<source<<std::endl<<"++++++++"<<std::endl;
-    
+
     // replace ftransform as it only works with built-ins
     State_Utils::replace(source, "ftransform()", "gl_ModelViewProjectionMatrix * gl_Vertex");
@@ -1426 +1426 @@
 {
     // OSG_NOTICE<<"State::drawQuads("<<first<<", "<<count<<")"<<std::endl;
-    
+
     unsigned int array = first % 4;
     unsigned int offsetFirst = ((first-array) / 4) * 6;
@@ -1432 +1432 @@
     unsigned int numIndices = numQuads * 6;
     unsigned int endOfIndices = offsetFirst+numIndices;
-    
+
     if (endOfIndices<65536)
     {