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

OpenSceneGraph/trunk/src/osgText/Text.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.
 */
@@ -107 +107 @@
     {
         unsigned int charcode = *lastChar;
-        
+
         if (charcode=='\n')
         {
@@ -166 +166 @@
                 break;
             }
-            
+
             // => word boundary detection & wrapping
             if (outOfSpace) break;
@@ -227 +227 @@
     Font* activefont = getActiveFont();
     if (!activefont) return;
-    
+
     _textureGlyphQuadMap.clear();
     _lineCount = 0;
-    
-    if (_text.empty()) 
+
+    if (_text.empty())
     {
         _textBB.set(0,0,0,0,0,0);//no size text
@@ -237 +237 @@
         return;
     }
-    
+
     //OpenThreads::ScopedLock<Font::FontMutex> lock(*(activefont->getSerializeFontCallsMutex()));
 
@@ -246 +246 @@
     osg::Vec2 cursor(startOfLine_coords);
     osg::Vec2 local(0.0f,0.0f);
-    
+
     unsigned int previous_charcode = 0;
     unsigned int linelength = 0;
     bool horizontal = _layout!=VERTICAL;
     bool kerning = true;
-    
+
     unsigned int lineNumber = 0;
 
@@ -486 +486 @@
             ++itr;
         }
-                                
-                
+
+
         // move to new line.
         switch(_layout)
@@ -517 +517 @@
           break;
         }
-        
+
         ++lineNumber;
 
     }
-   
+
     TextBase::computePositions();
     computeBackdropBoundingBox();
@@ -530 +530 @@
 // Returns false if there are no glyphs and the width/height values are invalid.
 // Also sets avg_width and avg_height to 0.0f if the value is invalid.
-// This method is used several times in a loop for the same object which will produce the same values. 
+// This method is used several times in a loop for the same object which will produce the same values.
 // Further optimization may try saving these values instead of recomputing them.
 bool Text::computeAverageGlyphWidthAndHeight(float& avg_width, float& avg_height) const
@@ -544 +544 @@
     bool is_valid_size = true;
     // This section is going to try to compute the average width and height
-    // for a character among the text. The reason I shift by an 
-    // average amount per-character instead of shifting each character 
-    // by its per-instance amount is because it may look strange to see 
-    // the individual backdrop text letters not space themselves the same 
+    // for a character among the text. The reason I shift by an
+    // average amount per-character instead of shifting each character
+    // by its per-instance amount is because it may look strange to see
+    // the individual backdrop text letters not space themselves the same
     // way the foreground text does. Using one value gives uniformity.
     // Note: This loop is repeated for each context. I think it may produce
@@ -600 +600 @@
     case CENTER_BASE_LINE:  _offset.set((_textBB.xMax()+_textBB.xMin())*0.5f,0.0f,0.0f); break;
     case RIGHT_BASE_LINE:  _offset.set(_textBB.xMax(),0.0f,0.0f); break;
-    
+
     case LEFT_BOTTOM_BASE_LINE:  _offset.set(0.0f,-_characterHeight*(1.0 + _lineSpacing)*(_lineCount-1),0.0f); break;
     case CENTER_BOTTOM_BASE_LINE:  _offset.set((_textBB.xMax()+_textBB.xMin())*0.5f,-_characterHeight*(1.0 + _lineSpacing)*(_lineCount-1),0.0f); break;
     case RIGHT_BOTTOM_BASE_LINE:  _offset.set(_textBB.xMax(),-_characterHeight*(1.0 + _lineSpacing)*(_lineCount-1),0.0f); break;
     }
-    
+
     AutoTransformCache& atc = _autoTransformCache[contextID];
     osg::Matrix& matrix = atc._matrix;
@@ -614 +614 @@
         matrix.makeTranslate(-_offset);
 
-        osg::Matrix rotate_matrix; 
-        if (_autoRotateToScreen) 
+        osg::Matrix rotate_matrix;
+        if (_autoRotateToScreen)
         {
             osg::Vec3d trans(atc._modelview.getTrans());
@@ -634 +634 @@
             M.postMult(atc._modelview);
             osg::Matrix& P = atc._projection;
-            
+
             // compute the pixel size vector.
-                        
+
             // pre adjust P00,P20,P23,P33 by multiplying them by the viewport window matrix.
             // here we do it in short hand with the knowledge of how the window matrix is formed
@@ -687 +687 @@
         }
 
-        if (_autoRotateToScreen) 
+        if (_autoRotateToScreen)
         {
             matrix.postMult(rotate_matrix);
@@ -713 +713 @@
         GlyphQuads::Coords2& coords2 = glyphquad._coords;
         GlyphQuads::Coords3& transformedCoords = glyphquad._transformedCoords[contextID];
-        
+
         unsigned int numCoords = coords2.size();
         if (numCoords!=transformedCoords.size())
@@ -719 +719 @@
             transformedCoords.resize(numCoords);
         }
-        
+
         for(unsigned int i=0;i<numCoords;++i)
         {
@@ -731 +731 @@
     _normal.normalize();
 
-    const_cast<Text*>(this)->dirtyBound();    
+    const_cast<Text*>(this)->dirtyBound();
 }
 
@@ -746 +746 @@
     unsigned int i;
     bool is_valid_size;
-    
+
     AutoTransformCache& atc = _autoTransformCache[contextID];
     osg::Matrix& matrix = atc._matrix;
@@ -756 +756 @@
 
     if (!is_valid_size) return;
-    
+
     // now apply matrix to the glyphs.
     for(TextureGlyphQuadMap::iterator titr=_textureGlyphQuadMap.begin();
@@ -832 +832 @@
                             vertical_shift_direction = 1.0f;
                             break;
-                        }                                
+                        }
                     case DROP_SHADOW_BOTTOM_LEFT:
                         {
@@ -863 +863 @@
 }
 
-// This method adjusts the bounding box to account for the expanded area caused by the backdrop. 
+// This method adjusts the bounding box to account for the expanded area caused by the backdrop.
 // This assumes that the bounding box has already been computed for the text without the backdrop.
 void Text::computeBackdropBoundingBox() const
@@ -875 +875 @@
     float avg_height = 0.0f;
     bool is_valid_size;
-    
+
     // FIXME: OPTIMIZE: It is possible that this value has already been computed before
     // from previous calls to this function. This might be worth optimizing.
@@ -887 +887 @@
         return;
     }
-    
+
     // Finally, we have one more issue to deal with.
     // Now that the text takes more space, we need
@@ -952 +952 @@
                 );
                 break;
-            }                                
+            }
         case DROP_SHADOW_BOTTOM_LEFT:
             {
@@ -1007 +1007 @@
 }
 
-// This method expands the bounding box to a settable margin when a bounding box drawing mode is active. 
+// This method expands the bounding box to a settable margin when a bounding box drawing mode is active.
 void Text::computeBoundingBoxMargin() const
 {
@@ -1058 +1058 @@
 
         for(i=0;i<coords2.size();++i)
-        {  
+        {
             // Min and Max are needed for color gradients
             if(coords2[i].x() > max_x)
@@ -1075 +1075 @@
             {
                 min_y = coords2[i].y();
-            }        
+            }
 
         }
@@ -1134 +1134 @@
                 _colorGradientTopRight[2]
             );
-            // Alpha does not convert to HSV            
+            // Alpha does not convert to HSV
             float alpha = bilinearInterpolate(
                 min_x,
@@ -1146 +1146 @@
                 _colorGradientBottomRight[3],
                 _colorGradientTopRight[3]
-            );                                    
+            );
 
             colorCoords[i] = osg::Vec4(red,green,blue,alpha);
@@ -1251 +1251 @@
             }
         }
-        
+
         atc._traversalNumber = frameNumber;
         atc._width = width;
         atc._height = height;
-        
+
         if (doUpdate)
-        {    
+        {
             atc._transformedPosition = newTransformedPosition;
             atc._projection = projection;
@@ -1264 +1264 @@
             computePositions(contextID);
         }
-        
-    }
-    
-    
+
+    }
+
+
     // Ensure that the glyph coordinates have been transformed for
     // this context id.
@@ -1345 +1345 @@
         #endif
         }
-    }    
+    }
 
 #if defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
@@ -1402 +1402 @@
             osg::Vec3 c01(osg::Vec3(_textBB.xMin(),_textBB.yMax(),_textBB.zMin())*matrix);
 
-        
+
             gl.Color4f(colorMultiplier.r()*_textBBColor.r(),colorMultiplier.g()*_textBBColor.g(),colorMultiplier.b()*_textBBColor.b(),colorMultiplier.a()*_textBBColor.a());
             gl.Begin(GL_LINE_LOOP);
@@ -1427 +1427 @@
 
         state.applyTextureMode(0,GL_TEXTURE_2D,osg::StateAttribute::OFF);
-        
+
         gl.Begin(GL_LINES);
             gl.Vertex3fv(hl.ptr());
@@ -1434 +1434 @@
             gl.Vertex3fv(vb.ptr());
         gl.End();
-        
-    }    
+
+    }
 }
 
@@ -1460 +1460 @@
         pf.setVertexArray(glyphquad._transformedCoords[0].size(),&(glyphquad._transformedCoords[0].front()));
         pf.drawArrays(GL_QUADS,0,glyphquad._transformedCoords[0].size());
-            
-    }
-    
+
+    }
+
 }
 
@@ -1476 +1476 @@
 {
     TextBase::resizeGLObjectBuffers(maxSize);
-    
+
     getActiveFont()->resizeGLObjectBuffers(maxSize);
 }
@@ -1557 +1557 @@
 
     const GlyphQuads::Coords3& transformedCoords = glyphquad._transformedCoords[contextID];
-    if (!transformedCoords.empty()) 
+    if (!transformedCoords.empty())
     {
         state.setVertexPointer( 3, GL_FLOAT, 0, &(transformedCoords.front()));
@@ -1655 +1655 @@
             {
                 const GlyphQuads::Coords3& transformedBackdropCoords = glyphquad._transformedBackdropCoords[backdrop_index][contextID];
-                if (!transformedBackdropCoords.empty()) 
+                if (!transformedBackdropCoords.empty())
                 {
                     state.setVertexPointer( 3, GL_FLOAT, 0, &(transformedBackdropCoords.front()));
@@ -1711 +1711 @@
         {
             const GlyphQuads::Coords3& transformedBackdropCoords = glyphquad._transformedBackdropCoords[backdrop_index][contextID];
-            if (!transformedBackdropCoords.empty()) 
+            if (!transformedBackdropCoords.empty())
             {
                 state.setVertexPointer( 3, GL_FLOAT, 0, &(transformedBackdropCoords.front()));
@@ -1731 +1731 @@
 #endif
 }
-    
+
 
 void Text::renderWithNoDepthBuffer(osg::State& state, const osg::Vec4& colorMultiplier) const
@@ -1770 +1770 @@
         {
             const GlyphQuads::Coords3& transformedBackdropCoords = glyphquad._transformedBackdropCoords[backdrop_index][contextID];
-            if (!transformedBackdropCoords.empty()) 
+            if (!transformedBackdropCoords.empty())
             {
                 state.setVertexPointer( 3, GL_FLOAT, 0, &(transformedBackdropCoords.front()));
@@ -1826 +1826 @@
         {
             const GlyphQuads::Coords3& transformedBackdropCoords = glyphquad._transformedBackdropCoords[backdrop_index][contextID];
-            if (!transformedBackdropCoords.empty()) 
+            if (!transformedBackdropCoords.empty())
             {
                 state.setVertexPointer( 3, GL_FLOAT, 0, &(transformedBackdropCoords.front()));
@@ -1865 +1865 @@
     unsigned int contextID = state.getContextID();
     TextureGlyphQuadMap::iterator titr; // Moved up here for VC6
-    
+
     glPushAttrib(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT | GL_STENCIL_TEST);
 
@@ -1880 +1880 @@
     glStencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
 
-    // Disable writing to the color buffer so we only write to the stencil 
+    // Disable writing to the color buffer so we only write to the stencil
     // buffer and the depth buffer
     glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
@@ -1891 +1891 @@
     // Arrrgh! Why does the code only seem to work correctly if I call this?
     glDepthMask(GL_FALSE);
-    
+
 
     // Draw all the text to the stencil buffer to mark out the region
     // that we can write too.
-    
+
     for(titr=_textureGlyphQuadMap.begin();
         titr!=_textureGlyphQuadMap.end();
@@ -1924 +1924 @@
         {
             const GlyphQuads::Coords3& transformedBackdropCoords = glyphquad._transformedBackdropCoords[backdrop_index][contextID];
-            if (!transformedBackdropCoords.empty()) 
+            if (!transformedBackdropCoords.empty())
             {
                 state.setVertexPointer( 3, GL_FLOAT, 0, &(transformedBackdropCoords.front()));
@@ -1933 +1933 @@
         // Draw the foreground text
         const GlyphQuads::Coords3& transformedCoords = glyphquad._transformedCoords[contextID];
-        if (!transformedCoords.empty()) 
+        if (!transformedCoords.empty())
         {
             state.setVertexPointer( 3, GL_FLOAT, 0, &(transformedCoords.front()));
@@ -1992 +1992 @@
         {
             const GlyphQuads::Coords3& transformedBackdropCoords = glyphquad._transformedBackdropCoords[backdrop_index][contextID];
-            if (!transformedBackdropCoords.empty()) 
+            if (!transformedBackdropCoords.empty())
             {
                 state.setVertexPointer( 3, GL_FLOAT, 0, &(transformedBackdropCoords.front()));