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

OpenSceneGraph/trunk/src/osg/Drawable.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.
 */
@@ -37 +37 @@
 unsigned int Drawable::s_numberDeletedDrawablesInLastFrame = 0;
 
-// static cache of deleted display lists which can only 
+// static cache of deleted display lists which can only
 // by completely deleted once the appropriate OpenGL context
 // is set.  Used osg::Drawable::deleteDisplayList(..) and flushDeletedDisplayLists(..) below.
@@ -57 +57 @@
         return  glGenLists( 1 );
     }
-    else 
+    else
     {
         DisplayListMap::iterator itr = dll.lower_bound(sizeHint);
@@ -65 +65 @@
 
             ++s_numberDrawablesReusedLastInLastFrame;
-            
+
             GLuint globj = itr->second;
             dll.erase(itr);
-            
+
             return globj;
-        } 
+        }
         else
         {
@@ -124 +124 @@
     }
 
-    dll.clear();         
+    dll.clear();
 #else
     OSG_NOTICE<<"Warning: Drawable::deleteDisplayList(..) - not supported."<<std::endl;
@@ -135 +135 @@
 
     DisplayListMap& dll = s_deletedDisplayListCache[contextID];
-    dll.clear();         
+    dll.clear();
 }
 
@@ -179 +179 @@
              {
                 OSG_WARN<<"Error in delete"<<std::endl;
-             }    
+             }
         }
         else
@@ -204 +204 @@
              {
                 OSG_WARN<<"Error in delete"<<std::endl;
-             }    
+             }
         }
     }
     elapsedTime = timer.delta_s(start_tick,timer.tick());
-    
+
     if (noDeleted!=0) OSG_INFO<<"Number display lists deleted = "<<noDeleted<<" elapsed time"<<elapsedTime<<std::endl;
 
@@ -291 +291 @@
 
     bool dynamic = false;
-    
+
     if (getUpdateCallback() ||
         getEventCallback() ||
-        getCullCallback()) 
+        getCullCallback())
     {
         dynamic = true;
     }
-    
+
     setDataVariance(dynamic ? DYNAMIC : STATIC);
 }
@@ -322 +322 @@
     // do nothing if nothing changed.
     if (_stateset==stateset) return;
-    
+
     // track whether we need to account for the need to do a update or event traversal.
     int delta_update = 0;
     int delta_event = 0;
 
-    // remove this node from the current statesets parent list 
+    // remove this node from the current statesets parent list
     if (_stateset.valid())
     {
@@ -334 +334 @@
         if (_stateset->requiresEventTraversal()) --delta_event;
     }
-    
+
     // set the stateset.
     _stateset = stateset;
-    
+
     // add this node to the new stateset to the parent list.
     if (_stateset.valid())
@@ -345 +345 @@
         if (_stateset->requiresEventTraversal()) ++delta_event;
     }
-    
+
 
     // only inform parents if change occurs and drawable doesn't already have an update callback
@@ -382 +382 @@
     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;
@@ -394 +394 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 (*itr)->setNumChildrenRequiringUpdateTraversal( (*itr)->getNumChildrenRequiringUpdateTraversal()+delta );
             }
@@ -400 +400 @@
         }
     }
-    
+
     // finally update this objects value.
     _numChildrenRequiringUpdateTraversal=num;
-    
+
 }
 
@@ -417 +417 @@
     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;
@@ -429 +429 @@
                 itr != _parents.end();
                 ++itr)
-            {    
+            {
                 (*itr)->setNumChildrenRequiringEventTraversal( (*itr)->getNumChildrenRequiringEventTraversal()+delta );
             }
@@ -435 +435 @@
         }
     }
-    
+
     // finally Event this objects value.
     _numChildrenRequiringEventTraversal=num;
-    
+
 }
 
@@ -469 +469 @@
 
 #ifdef OSG_GL_DISPLAYLISTS_AVAILABLE
-    // get the contextID (user defined ID of 0 upwards) for the 
+    // get the contextID (user defined ID of 0 upwards) for the
     // current OpenGL context.
     unsigned int contextID = renderInfo.getContextID();
@@ -478 +478 @@
     // call the globj if already set otherwise compile and execute.
     if( globj != 0 )
-    {   
+    {
         glDeleteLists( globj, 1 );
     }
@@ -487 +487 @@
     if (_drawCallback.valid())
         _drawCallback->drawImplementation(renderInfo,this);
-    else 
+    else
         drawImplementation(renderInfo);
 
@@ -522 +522 @@
 
     if (!_useDisplayList) return;
-    
+
     if (state)
     {
-        // get the contextID (user defined ID of 0 upwards) for the 
+        // get the contextID (user defined ID of 0 upwards) for the
         // current OpenGL context.
         unsigned int contextID = state->getContextID();
@@ -537 +537 @@
             Drawable::deleteDisplayList(contextID,globj, getGLObjectSizeHint());
             globj = 0;
-        }    
+        }
     }
     else
@@ -562 +562 @@
         }
     }
-    
+
     // set with new value.
     _supportsDisplayList=flag;
@@ -581 +581 @@
         dirtyDisplayList();
     }
-    
+
     if (_supportsDisplayList)
     {
-    
+
         // set with new value.
         _useDisplayList = flag;
-        
+
     }
     else // does not support display lists.
@@ -595 +595 @@
             OSG_WARN<<"Warning: attempt to setUseDisplayList(true) on a drawable with does not support display lists."<<std::endl;
         }
-        else 
+        else
         {
             // set with new value.
@@ -644 +644 @@
 {
     if (_updateCallback==ac) return;
-    
+
     int delta = 0;
     if (_updateCallback.valid()) --delta;
@@ -650 +650 @@
 
     _updateCallback = ac;
-    
+
     if (delta!=0 && !(_stateset.valid() && _stateset->requiresUpdateTraversal()))
     {
@@ -665 +665 @@
 {
     if (_eventCallback==ac) return;
-    
+
     int delta = 0;
     if (_eventCallback.valid()) --delta;
@@ -671 +671 @@
 
     _eventCallback = ac;
-    
+
     if (delta!=0 && !(_stateset.valid() && _stateset->requiresEventTraversal()))
     {
@@ -688 +688 @@
         {
             _vertices2f = 0;
-            _vertices3f = 0;  
+            _vertices3f = 0;
             _vertices4f = 0;
-            _vertices2d = 0;  
-            _vertices3d = 0;  
+            _vertices2d = 0;
+            _vertices3d = 0;
             _vertices4d = 0;
         }
@@ -776 +776 @@
         virtual void vertex(double x,double y,double z,double w) { if (w!=0.0f) _bb.expandBy(x/w,y/w,z/w); }
         virtual void end() {}
-       
+
         const Vec2*     _vertices2f;
         const Vec3*     _vertices3f;
@@ -783 +783 @@
         const Vec3d*    _vertices3d;
         const Vec4d*    _vertices4d;
-        BoundingBox     _bb; 
+        BoundingBox     _bb;
 };
 
@@ -793 +793 @@
     non_const_this->accept(cb);
 
-#if 0    
+#if 0
     OSG_NOTICE<<"computeBound() "<<cb._bb.xMin()<<", "<<cb._bb.xMax()<<", "<<std::endl;
     OSG_NOTICE<<"               "<<cb._bb.yMin()<<", "<<cb._bb.yMax()<<", "<<std::endl;
     OSG_NOTICE<<"               "<<cb._bb.zMin()<<", "<<cb._bb.zMax()<<", "<<std::endl;
 #endif
-    
+
     return cb._bb;
 }
@@ -844 +844 @@
     _isTimerQuerySupported = rhs._isTimerQuerySupported;
     _isARBTimerQuerySupported = rhs._isARBTimerQuerySupported;
-    
+
     _glFogCoordfv = rhs._glFogCoordfv;
     _glSecondaryColor3ubv = rhs._glSecondaryColor3ubv;
@@ -1025 +1025 @@
     {
         OSG_WARN<<"Error: glFogCoordfv not supported by OpenGL driver"<<std::endl;
-    }    
+    }
 }
 
@@ -1056 +1056 @@
     if (_glMultiTexCoord1f)
     {
-        _glMultiTexCoord1f(target,coord); 
+        _glMultiTexCoord1f(target,coord);
     }
     else
@@ -1068 +1068 @@
     if (_glMultiTexCoord2fv)
     {
-        _glMultiTexCoord2fv(target,coord); 
+        _glMultiTexCoord2fv(target,coord);
     }
     else
@@ -1080 +1080 @@
     if (_glMultiTexCoord3fv)
     {
-        _glMultiTexCoord3fv(target,coord); 
+        _glMultiTexCoord3fv(target,coord);
     }
     else
@@ -1092 +1092 @@
     if (_glMultiTexCoord4fv)
     {
-        _glMultiTexCoord4fv(target,coord); 
+        _glMultiTexCoord4fv(target,coord);
     }
     else
@@ -1104 +1104 @@
     if (_glMultiTexCoord1d)
     {
-        _glMultiTexCoord1d(target,coord); 
+        _glMultiTexCoord1d(target,coord);
     }
     else
@@ -1116 +1116 @@
     if (_glMultiTexCoord2dv)
     {
-        _glMultiTexCoord2dv(target,coord); 
+        _glMultiTexCoord2dv(target,coord);
     }
     else
@@ -1128 +1128 @@
     if (_glMultiTexCoord3dv)
     {
-        _glMultiTexCoord3dv(target,coord); 
+        _glMultiTexCoord3dv(target,coord);
     }
     else
@@ -1140 +1140 @@
     if (_glMultiTexCoord4dv)
     {
-        _glMultiTexCoord4dv(target,coord); 
+        _glMultiTexCoord4dv(target,coord);
     }
     else
@@ -1152 +1152 @@
     if (_glVertexAttrib1s)
     {
-        _glVertexAttrib1s(index,s); 
+        _glVertexAttrib1s(index,s);
     }
     else
@@ -1164 +1164 @@
     if (_glVertexAttrib1f)
     {
-        _glVertexAttrib1f(index,f); 
+        _glVertexAttrib1f(index,f);
     }
     else
@@ -1176 +1176 @@
     if (_glVertexAttrib1d)
     {
-        _glVertexAttrib1d(index,f); 
+        _glVertexAttrib1d(index,f);
     }
     else
@@ -1188 +1188 @@
     if (_glVertexAttrib2fv)
     {
-        _glVertexAttrib2fv(index,v); 
+        _glVertexAttrib2fv(index,v);
     }
     else
@@ -1200 +1200 @@
     if (_glVertexAttrib3fv)
     {
-        _glVertexAttrib3fv(index,v); 
+        _glVertexAttrib3fv(index,v);
     }
     else
@@ -1212 +1212 @@
     if (_glVertexAttrib4fv)
     {
-        _glVertexAttrib4fv(index,v); 
+        _glVertexAttrib4fv(index,v);
     }
     else
@@ -1224 +1224 @@
     if (_glVertexAttrib2dv)
     {
-        _glVertexAttrib2dv(index,v); 
+        _glVertexAttrib2dv(index,v);
     }
     else
@@ -1236 +1236 @@
     if (_glVertexAttrib3dv)
     {
-        _glVertexAttrib3dv(index,v); 
+        _glVertexAttrib3dv(index,v);
     }
     else
@@ -1248 +1248 @@
     if (_glVertexAttrib4dv)
     {
-        _glVertexAttrib4dv(index,v); 
+        _glVertexAttrib4dv(index,v);
     }
     else
@@ -1260 +1260 @@
     if (_glVertexAttrib4ubv)
     {
-        _glVertexAttrib4ubv(index,v); 
+        _glVertexAttrib4ubv(index,v);
     }
     else
@@ -1272 +1272 @@
     if (_glVertexAttrib4Nubv)
     {
-        _glVertexAttrib4Nubv(index,v); 
+        _glVertexAttrib4Nubv(index,v);
     }
     else
@@ -1282 +1282 @@
 void Drawable::Extensions::glGenBuffers(GLsizei n, GLuint *buffers) const
 {
-    if (_glGenBuffers) _glGenBuffers(n, buffers); 
+    if (_glGenBuffers) _glGenBuffers(n, buffers);
     else OSG_WARN<<"Error: glGenBuffers not supported by OpenGL driver"<<std::endl;
 }
@@ -1288 +1288 @@
 void Drawable::Extensions::glBindBuffer(GLenum target, GLuint buffer) const
 {
-    if (_glBindBuffer) _glBindBuffer(target, buffer); 
+    if (_glBindBuffer) _glBindBuffer(target, buffer);
     else OSG_WARN<<"Error: glBindBuffer not supported by OpenGL driver"<<std::endl;
 }
@@ -1294 +1294 @@
 void Drawable::Extensions::glBufferData(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage) const
 {
-    if (_glBufferData) _glBufferData(target, size, data, usage); 
+    if (_glBufferData) _glBufferData(target, size, data, usage);
     else OSG_WARN<<"Error: glBufferData not supported by OpenGL driver"<<std::endl;
 }
@@ -1300 +1300 @@
 void Drawable::Extensions::glBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data) const
 {
-    if (_glBufferSubData) _glBufferSubData(target, offset, size, data); 
+    if (_glBufferSubData) _glBufferSubData(target, offset, size, data);
     else OSG_WARN<<"Error: glBufferData not supported by OpenGL driver"<<std::endl;
 }
@@ -1306 +1306 @@
 void Drawable::Extensions::glDeleteBuffers(GLsizei n, const GLuint *buffers) const
 {
-    if (_glDeleteBuffers) _glDeleteBuffers(n, buffers); 
+    if (_glDeleteBuffers) _glDeleteBuffers(n, buffers);
     else OSG_WARN<<"Error: glBufferData not supported by OpenGL driver"<<std::endl;
 }
@@ -1313 +1313 @@
 {
     if (_glIsBuffer) return _glIsBuffer(buffer);
-    else 
+    else
     {
         OSG_WARN<<"Error: glIsBuffer not supported by OpenGL driver"<<std::endl;
@@ -1329 +1329 @@
 {
     if (_glMapBuffer) return _glMapBuffer(target,access);
-    else 
+    else
     {
         OSG_WARN<<"Error: glMapBuffer not supported by OpenGL driver"<<std::endl;
@@ -1339 +1339 @@
 {
     if (_glUnmapBuffer) return _glUnmapBuffer(target);
-    else 
+    else
     {
         OSG_WARN<<"Error: glUnmapBuffer not supported by OpenGL driver"<<std::endl;
@@ -1368 +1368 @@
     {
         OSG_WARN<<"Error: glGenOcclusionQueries not supported by OpenGL driver"<<std::endl;
-    }    
+    }
 }
 
@@ -1380 +1380 @@
     {
         OSG_WARN<<"Error: glDeleteOcclusionQueries not supported by OpenGL driver"<<std::endl;
-    }    
+    }
 }
 
@@ -1392 +1392 @@
     {
         OSG_WARN<<"Error: glIsOcclusionQuery not supported by OpenGL driver"<<std::endl;
-    }    
+    }
 
     return GLboolean( 0 );
@@ -1406 +1406 @@
     {
         OSG_WARN<<"Error: glBeginOcclusionQuery not supported by OpenGL driver"<<std::endl;
-    }    
+    }
 }
 
@@ -1418 +1418 @@
     {
         OSG_WARN<<"Error: glEndOcclusionQuery not supported by OpenGL driver"<<std::endl;
-    }    
+    }
 }
 
@@ -1430 +1430 @@
     {
         OSG_WARN<<"Error: glGetOcclusionQueryiv not supported by OpenGL driver"<<std::endl;
-    }    
+    }
 }
 
@@ -1442 +1442 @@
     {
         OSG_WARN<<"Error: glGetOcclusionQueryuiv not supported by OpenGL driver"<<std::endl;
-    }    
+    }
 }
 
@@ -1495 +1495 @@
 void Drawable::Extensions::glDeleteQueries(GLsizei n, const GLuint *ids) const
 {
-    if (_gl_delete_queries_arb) 
+    if (_gl_delete_queries_arb)
         _gl_delete_queries_arb(n, ids);
     else