Changeset 13041 for OpenSceneGraph/trunk/src/osgDB/SharedStateManager.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/osgDB/SharedStateManager.cpp (modified) (10 diffs)

OpenSceneGraph/trunk/src/osgDB/SharedStateManager.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.
 */
@@ -18 +18 @@
 
 SharedStateManager::SharedStateManager(unsigned int mode):
-    osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) 
+    osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN)
 {
     setShareMode(mode);
@@ -61 +61 @@
     }
 
-} 
+}
 
 
@@ -71 +71 @@
 //    const osg::Timer& timer = *osg::Timer::instance();
 //    osg::Timer_t start_tick = timer.tick();
-    
+
     _mutex = mt;
     node->accept(*this);
@@ -108 +108 @@
     }
 }
- 
+
 bool SharedStateManager::isShared(osg::StateSet* ss)
 {
@@ -156 +156 @@
         return result->get();
 }
-   
+
 
 //----------------------------------------------------------------
@@ -195 +195 @@
             if(titr==tmpSharedTextureList.end())
             {
-                // Texture is not in tmp list: 
+                // Texture is not in tmp list:
                 // First time it appears in this file, search Texture in sharedAttributeList
                 osg::StateAttribute *textureFromSharedList = find(texture);
                 if(textureFromSharedList)
                 {
-                    // Texture is in sharedAttributeList: 
+                    // Texture is in sharedAttributeList:
                     // Share now. Required to be shared all next times
                     if(_mutex) _mutex->lock();
@@ -209 +209 @@
                 else
                 {
-                    // Texture is not in _sharedAttributeList: 
+                    // Texture is not in _sharedAttributeList:
                     // Add to _sharedAttributeList. Not needed to be
                     // shared all next times.
                     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_listMutex);
-                    _sharedTextureList.insert(texture); 
-                    tmpSharedTextureList[texture] = TextureSharePair(texture, false);            
+                    _sharedTextureList.insert(texture);
+                    tmpSharedTextureList[texture] = TextureSharePair(texture, false);
                 }
             }
@@ -241 +241 @@
         if (sitr==tmpSharedStateSetList.end())
         {
-            // StateSet is not in tmp list: 
+            // StateSet is not in tmp list:
             // First time it appears in this file, search StateSet in sharedObjectList
             osg::StateSet *ssFromSharedList = find(ss);
             if (ssFromSharedList)
             {
-                // StateSet is in sharedStateSetList: 
+                // StateSet is in sharedStateSetList:
                 // Share now. Required to be shared all next times
                 if (_mutex) _mutex->lock();
@@ -255 +255 @@
             else
             {
-                // StateSet is not in sharedStateSetList: 
+                // StateSet is not in sharedStateSetList:
                 // Add to sharedStateSetList. Not needed to be shared all next times.
                 {
                     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_listMutex);
-                    _sharedStateSetList.insert(ss); 
+                    _sharedStateSetList.insert(ss);
                     tmpSharedStateSetList[ss]
-                        = StateSetSharePair(ss, false);            
+                        = StateSetSharePair(ss, false);
                 }
                 // Only in this case sharing textures is also required