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

OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp

@@ -41 +41 @@
 // Use a static reference pointer to hold the window system interface.
 // Wrap this within a function, in order to control the order in which
-// the static pointer's constructor is executed. 
+// the static pointer's constructor is executed.
 
 static ref_ptr<GraphicsContext::WindowingSystemInterface> &windowingSystemInterfaceRef()
@@ -73 +73 @@
         // catch any undefined values.
         if (traits) traits->setUndefinedScreenDetailsToDefaultScreen();
-        
+
         return wsref->createGraphicsContext(traits);
     }
     else
-        return 0;    
+        return 0;
 }
 
@@ -113 +113 @@
     std::string::size_type colon = displayName.find_last_of(':');
     std::string::size_type point = displayName.find_last_of('.');
-    
-    if (point!=std::string::npos && 
-        colon==std::string::npos && 
+
+    if (point!=std::string::npos &&
+        colon==std::string::npos &&
         point < colon) point = std::string::npos;
 
@@ -126 +126 @@
         hostName = displayName.substr(0,colon);
     }
-    
+
     std::string::size_type startOfDisplayNum = (colon==std::string::npos) ? 0 : colon+1;
     std::string::size_type endOfDisplayNum = (point==std::string::npos) ?  displayName.size() : point;
@@ -148 +148 @@
     }
 
-#if 0    
+#if 0
     OSG_NOTICE<<"   hostName ["<<hostName<<"]"<<std::endl;
     OSG_NOTICE<<"   displayNum "<<displayNum<<std::endl;
@@ -209 +209 @@
             }
         }
-        
+
         glContextVersion = ds->getGLContextVersion();
         glContextFlags = ds->getGLContextFlags();
@@ -238 +238 @@
 
     unsigned int _numContexts;
-    
+
     void incrementUsageCount() {  ++_numContexts; }
 
@@ -250 +250 @@
         {
             OSG_INFO<<"resetting compileContext "<<_compileContext.get()<<" refCount "<<_compileContext->referenceCount()<<std::endl;
-            
+
             _compileContext = 0;
         }
     }
-    
+
     osg::ref_ptr<osg::GraphicsContext> _compileContext;
 
@@ -268 +268 @@
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
-    
+
     // first check to see if we can reuse contextID;
     for(ContextIDMap::iterator itr = s_contextIDMap.begin();
@@ -288 +288 @@
     unsigned int contextID = s_contextIDMap.size();
     s_contextIDMap[contextID]._numContexts = 1;
-    
+
     OSG_INFO<<"GraphicsContext::createNewContextID() creating contextID="<<contextID<<std::endl;
     OSG_INFO<<"Updating the MaxNumberOfGraphicsContexts to "<<contextID+1<<std::endl;
 
-    // update the the maximum number of graphics contexts, 
+    // update the the maximum number of graphics contexts,
     // to ensure that texture objects and display buffers are configured to the correct size.
     osg::DisplaySettings::instance()->setMaxNumberOfGraphicsContexts( contextID + 1 );
 
-    return contextID;    
+    return contextID;
 }
 
@@ -316 +316 @@
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
-    
+
     s_contextIDMap[contextID].incrementUsageCount();
 
@@ -334 +334 @@
     {
         OSG_NOTICE<<"Warning: decrementContextIDUsageCount("<<contextID<<") called on expired contextID."<<std::endl;
-    } 
+    }
 
     OSG_INFO<<"GraphicsContext::decrementContextIDUsageCount("<<contextID<<") to "<<s_contextIDMap[contextID]._numContexts<<std::endl;
@@ -388 +388 @@
 
     OSG_INFO<<"GraphicsContext::getRegisteredGraphicsContexts "<<contextID<<" contexts.size()="<<contexts.size()<<std::endl;
-    
+
     return contexts;
 }
@@ -396 +396 @@
     OSG_NOTICE<<"GraphicsContext::createCompileContext."<<std::endl;
 
-    {    
+    {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
         if (s_contextIDMap[contextID]._compileContext.valid()) return s_contextIDMap[contextID]._compileContext.get();
     }
-    
+
     GraphicsContext::GraphicsContexts contexts = GraphicsContext::getRegisteredGraphicsContexts(contextID);
     if (contexts.empty()) return 0;
-    
+
     GraphicsContext* src_gc = contexts.front();
     const osg::GraphicsContext::Traits* src_traits = src_gc->getTraits();
@@ -423 +423 @@
     osg::ref_ptr<osg::GraphicsContext> gc = osg::GraphicsContext::createGraphicsContext(traits);
     if (gc.valid() && gc->realize())
-    {    
+    {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
         s_contextIDMap[contextID]._compileContext = gc;
@@ -433 +433 @@
         return 0;
     }
-    
+
 }
 
@@ -510 +510 @@
     }
     else
-    {   
+    {
         return false;
     }
@@ -521 +521 @@
     // switch off the graphics thread...
     setGraphicsThread(0);
-    
-    
+
+
     bool sharedContextExists = false;
-    
+
     if (_state.valid())
     {
@@ -531 +531 @@
     }
 
-    // release all the OpenGL objects in the scene graphs associated with this 
+    // release all the OpenGL objects in the scene graphs associated with this
     for(Cameras::iterator itr = _cameras.begin();
         itr != _cameras.end();
@@ -576 +576 @@
         }
     }
-    
+
     if (callCloseImplementation) closeImplementation();
 
 
-    // now discard any deleted deleted OpenGL objects that the are still hanging around - such as due to 
+    // now discard any deleted deleted OpenGL objects that the are still hanging around - such as due to
     // the the flushDelete*() methods not being invoked, such as when using GraphicContextEmbedded where makeCurrent
     // does not work.
@@ -593 +593 @@
     {
         decrementContextIDUsageCount(_state->getContextID());
-        
+
         _state = 0;
     }
@@ -604 +604 @@
 
     bool result = makeCurrentImplementation();
-    
+
     if (result)
     {
         // initialize extension process, not only initializes on first
-        // call, will be a non-op on subsequent calls.        
+        // call, will be a non-op on subsequent calls.
         getState()->initializeExtensionProcs();
     }
-    
+
     return result;
 }
@@ -624 +624 @@
 
         // initialize extension process, not only initializes on first
-        // call, will be a non-op on subsequent calls.        
+        // call, will be a non-op on subsequent calls.
         getState()->initializeExtensionProcs();
     }
-    
+
     return result;
 }
@@ -634 +634 @@
 {
     bool result = releaseContextImplementation();
-    
+
     _threadOfLastMakeCurrent = (OpenThreads::Thread*)(-1);
-    
+
     return result;
 }
@@ -647 +647 @@
         clear();
     }
-    else if (_graphicsThread.valid() && 
+    else if (_graphicsThread.valid() &&
              _threadOfLastMakeCurrent == _graphicsThread.get())
     {
@@ -670 +670 @@
 void GraphicsContext::setGraphicsThread(GraphicsThread* gt)
 {
-    if (_graphicsThread==gt) return; 
-
-    if (_graphicsThread.valid()) 
+    if (_graphicsThread==gt) return;
+
+    if (_graphicsThread.valid())
     {
         // need to kill the thread in some way...
@@ -680 +680 @@
 
     _graphicsThread = gt;
-    
-    if (_graphicsThread.valid()) 
+
+    if (_graphicsThread.valid())
     {
         _graphicsThread->setParent(this);
@@ -723 +723 @@
 {
     OSG_INFO<<"Doing remove named operation"<<std::endl;
-    
+
     // acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
@@ -769 +769 @@
     std::copy(_cameras.begin(), _cameras.end(), std::back_inserter(camerasCopy));
     std::sort(camerasCopy.begin(), camerasCopy.end(), CameraRenderOrderSortOp());
-    
+
     for(CameraVector::iterator itr = camerasCopy.begin();
         itr != camerasCopy.end();
@@ -800 +800 @@
             }
         }
-                
+
         if (_currentOperation.valid())
         {
@@ -808 +808 @@
             (*_currentOperation)(this);
 
-            {            
+            {
                 OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
                 _currentOperation = 0;
@@ -832 +832 @@
         for(unsigned int i=0; i<camera->getNumChildren(); ++i)
         {
-            nodes.insert(camera->getChild(i));            
-        }
-        
+            nodes.insert(camera->getChild(i));
+        }
+
         for(Cameras::iterator citr = _cameras.begin();
             citr != _cameras.end();
@@ -847 +847 @@
                     if (nitr != nodes.end()) nodes.erase(nitr);
                 }
-            }            
-        }
-        
+            }
+        }
+
         // now release the GLobjects associated with these non shared nodes
         for(NodeSet::iterator nitr = nodes.begin();
@@ -874 +874 @@
 
     if (!_traits) return;
-    
+
     double widthChangeRatio = double(width) / double(_traits->width);
     double heigtChangeRatio = double(height) / double(_traits->height);
-    double aspectRatioChange = widthChangeRatio / heigtChangeRatio; 
-    
+    double aspectRatioChange = widthChangeRatio / heigtChangeRatio;
+
 
     for(Cameras::iterator itr = _cameras.begin();
@@ -885 +885 @@
     {
         Camera* camera = (*itr);
-        
+
         // resize doesn't affect Cameras set up with FBO's.
         if (camera->getRenderTargetImplementation()==osg::Camera::FRAME_BUFFER_OBJECT) continue;
-        
+
         Viewport* viewport = camera->getViewport();
         if (viewport)