Changeset 13041 for OpenSceneGraph/trunk/src/osgText/FadeText.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/osgText/FadeText.cpp (modified) (19 diffs)

OpenSceneGraph/trunk/src/osgText/FadeText.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.
 */
@@ -26 +26 @@
         _fadeText(fadeText),
         _visible(true) {}
-        
+
     bool operator < (const FadeTextData& rhs) const
     {
         return _fadeText < rhs._fadeText;
-    }    
-    
+    }
+
     double getNearestZ() const
     {
@@ -59 +59 @@
         _referenceVertexList.push_back(_vertices[3]);
     }
-    
+
     void addEdgePlane(const osg::Vec3& corner, const osg::Vec3& edge)
     {
         osg::Vec3 normal( edge.y(), -edge.x(), 0.0f);
         normal.normalize();
-        
+
         add(osg::Plane(normal, corner));
     }
-     
+
     void buildPolytope()
     {
@@ -83 +83 @@
         add(osg::Plane( osg::Vec3d(0.0f,0.0f,0.0f), _vertices[2], _vertices[3]));
         add(osg::Plane( osg::Vec3d(0.0f,0.0f,0.0f), _vertices[3], _vertices[0]));
-        
+
 #if 0
         OSG_NOTICE<<" normalFrontFace = "<<normalFrontFace<<std::endl;
@@ -96 +96 @@
         if (needToFlip) flip();
 
-#if 0        
+#if 0
         OSG_NOTICE<<"   plane 0 "<< _planeList[0]<<std::endl;
         OSG_NOTICE<<"   plane 1 "<< _planeList[1]<<std::endl;
@@ -103 +103 @@
         OSG_NOTICE<<"   plane 4 "<< _planeList[4]<<std::endl;
 #endif
-        
-    }
-    
+
+    }
+
     inline bool contains(const std::vector<osg::Vec3>& vertices)
     {
@@ -119 +119 @@
         return false;
     }
-    
+
 };
 
@@ -145 +145 @@
     }
 
-    
+
     FadeTextUserData* createNewFadeTextUserData(osg::View* view)
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
-        
+
         FadeTextUserData* userData = new FadeTextUserData;
 
@@ -159 +159 @@
 
         _viewMap[view].insert(userData);
-        
+
         return userData;
     }
-    
-    
+
+
     void update(unsigned int frameNumber)
     {
         _frameNumber = frameNumber;
-        
+
         for(GlobalFadeText::ViewUserDataMap::iterator vitr = _viewMap.begin();
             vitr != _viewMap.end();
             ++vitr)
         {
-        
+
             osg::View* view = vitr->first;
 
@@ -185 +185 @@
             {
                 FadeTextUserData* userData = uitr->get();
-                
+
                 int frameDelta = frameNumber - userData->_frameNumber;
                 if (frameDelta<=1)
@@ -195 +195 @@
                         FadeTextData& fadeTextData = *fitr;
                         if (fadeTextSet.count(fadeTextData._fadeText)==0)
-                        { 
+                        {
                             fadeTextSet.insert(fadeTextData._fadeText);
                             fadeTextPolytopeMap.insert(FadeTextPolytopeMap::value_type(
@@ -204 +204 @@
             }
 
-            // for each FadeTexPoltopeData            
+            // for each FadeTexPoltopeData
             //    create polytopes
             //    test against all FTPD's later in the list
             //       test all control points on FTPD against each plane of the current polytope
             //       if all control points removed or outside then discard FTPD and make FT visible = false;
-            
-            FadeTextPolytopeMap::iterator outer_itr = fadeTextPolytopeMap.begin();                
-            while (outer_itr != fadeTextPolytopeMap.end()) 
+
+            FadeTextPolytopeMap::iterator outer_itr = fadeTextPolytopeMap.begin();
+            while (outer_itr != fadeTextPolytopeMap.end())
             {
                 FadeTextPolytopeMap::iterator inner_itr = outer_itr;
@@ -226 +226 @@
                 {
                     FadeTextPolytopeData& inner_ftpm = *(inner_itr->second);
-                    
+
                     // OSG_NOTICE<<"Inner z "<<inner_ftpm.getNearestZ()<<std::endl;
 
@@ -234 +234 @@
                         // move to next ftpm
                         ++inner_itr;
-                        
+
                         fadeTextSet.erase(inner_ftpm._fadeText);
 
                         // need to remove inner_ftpm as its occluded.
                         fadeTextPolytopeMap.erase(erase_itr);
-                        
+
                     }
                     else
@@ -253 +253 @@
         }
     }
-    
+
     inline void updateIfRequired(unsigned int frameNumber)
     {
@@ -279 +279 @@
         osgText::FadeText* fadeText = dynamic_cast<osgText::FadeText*>(drawable);
         if (!fadeText) return;
-    
+
         unsigned int frameNumber = nv->getFrameStamp()->getFrameNumber();
 
         GlobalFadeText* gft = getGlobalFadeText();
         gft->updateIfRequired(frameNumber);
-        
+
         osgText::FadeText::ViewBlendColourMap& vbcm = fadeText->getViewBlendColourMap();
 
         _ftd._fadeText = fadeText;
-        
+
         float fadeSpeed = fadeText->getFadeSpeed();
 
@@ -362 +362 @@
         Text::drawImplementation(*renderInfo.getState(), osg::Vec4(1.0f,1.0f,1.0f,1.0f) );
     }
-    
-
-    // now pass on new details 
+
+
+    // now pass on new details
 
     FadeTextUserData* userData = dynamic_cast<FadeTextUserData*>(renderInfo.getUserData());
@@ -397 +397 @@
 
     osgText::Text::AutoTransformCache& atc = _autoTransformCache[renderInfo.getContextID()];
-    
+
     osg::Matrix lmv = atc._matrix;
     lmv.postMult(state.getModelViewMatrix());
-    
+
     if (renderInfo.getView() && renderInfo.getView()->getCamera())
     {
@@ -407 +407 @@
         lmv.postMult(renderInfo.getView()->getCamera()->getViewMatrix());
     }
-    
+
     FadeTextData ftd(const_cast<osgText::FadeText*>(this));
-    
+
     ftd._vertices[0].set(osg::Vec3d(_textBB.xMin(),_textBB.yMin(),_textBB.zMin())*lmv);
     ftd._vertices[1].set(osg::Vec3d(_textBB.xMax(),_textBB.yMin(),_textBB.zMin())*lmv);