Changeset 13041 for OpenSceneGraph/trunk/include/osgText/TextBase

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osgText/TextBase (modified) (18 diffs)

OpenSceneGraph/trunk/include/osgText/TextBase

@@ -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.
 */
@@ -67 +67 @@
 
     /** Set the Font reference width and height resolution in texels.
-      * Note, the size may not be supported by current font, 
+      * Note, the size may not be supported by current font,
       * the closest supported font size will be selected.*/
     void setFontResolution(unsigned int width, unsigned int height);
@@ -73 +73 @@
     unsigned int getFontWidth() const { return _fontSize.first; }
     unsigned int getFontHeight() const { return _fontSize.second; }
-    
-    
+
+
     /** Set the text using a osgText::String.*/
     void setText(const String& text);
 
-    /** Set the text using a std::string, 
+    /** Set the text using a std::string,
       * which is converted to an internal TextString.*/
     void setText(const std::string& text);
@@ -86 +86 @@
     void setText(const std::string& text,String::Encoding encoding);
 
-    /** Set the text using a wchar_t string, 
+    /** Set the text using a wchar_t string,
       * which is converted to an internal TextString.*/
     void setText(const wchar_t* text);
-    
-    /** Get the text string. 
+
+    /** Get the text string.
       * Note, if you modify the string you must call Text::update() for
       * the internal glyph reprentation to be updated.*/
@@ -97 +97 @@
     /** Get the const text string.*/
     const String& getText() const { return _text; }
-    
-    /** update internal glyph respresentation used for rendering, 
+
+    /** update internal glyph respresentation used for rendering,
       * and bounding volume.*/
     void update() { computeGlyphRepresentation(); }
@@ -121 +121 @@
     /** Set how the CharacterSize value relates to the final rendered character.*/
     void setCharacterSizeMode(CharacterSizeMode mode) { _characterSizeMode = mode; }
-    
+
     /** Get the CharacterSizeMode.*/
     CharacterSizeMode getCharacterSizeMode() const { return _characterSizeMode; }
@@ -128 +128 @@
     /** Set the maximum width of the text box.
       * With horizontal layouts any characters which do not fit are wrapped around.
-      * 0 or negative values indicate that no maximum width is set, lines can be as long as 
+      * 0 or negative values indicate that no maximum width is set, lines can be as long as
       * they need be to fit thre required text*/
     void setMaximumWidth(float maximumWidth);
-    
+
     /** Get the maximim width of the text box.*/
     float getMaximumWidth() const { return _maximumWidth; }
@@ -137 +137 @@
     /** Set the maximum height of the text box.
       * With horizontal layouts any characters which do not fit are wrapped around.
-      * 0 or negative values indicate that no maximum height is set, lines can be as long as 
+      * 0 or negative values indicate that no maximum height is set, lines can be as long as
       * they need be to fit the required text*/
     void setMaximumHeight(float maximumHeight);
-    
+
     /** Get the maximum height of the text box.*/
     float getMaximumHeight() const { return _maximumHeight; }
 
     /** Set the line spacing of the text box, given as a percentage of
-      * the character height. The default value is 0 for backward 
-      * compatibility. For longer paragraphs of text, a value of at 
+      * the character height. The default value is 0 for backward
+      * compatibility. For longer paragraphs of text, a value of at
       * least 25% (i.e. set line spacing to 0.25) is recommended. */
     void setLineSpacing(float lineSpacing);
@@ -157 +157 @@
     /** Set the position of text.*/
     void setPosition(const osg::Vec3& pos);
-    
+
     /** Get the position of text.*/
     const osg::Vec3& getPosition() const { return _position; }
-    
+
 
     enum AlignmentType
@@ -175 +175 @@
         RIGHT_CENTER,
         RIGHT_BOTTOM,
-        
+
         LEFT_BASE_LINE,
         CENTER_BASE_LINE,
         RIGHT_BASE_LINE,
-    
+
         LEFT_BOTTOM_BASE_LINE,
         CENTER_BOTTOM_BASE_LINE,
         RIGHT_BOTTOM_BASE_LINE,
-    
+
         BASE_LINE = LEFT_BASE_LINE /// default.
-    
-    };
-    
+
+    };
+
     void setAlignment(AlignmentType alignment);
     AlignmentType getAlignment() const { return _alignment; }
@@ -206 +206 @@
     void setAxisAlignment(AxisAlignment axis);
     AxisAlignment getAxisAlignment() const { return _axisAlignment; }
-    
+
     void setRotation(const osg::Quat& quat);
     const osg::Quat& getRotation() const { return _rotation; }
@@ -219 +219 @@
         VERTICAL
     };
-    
+
     void setLayout(Layout layout);
-    
+
     Layout getLayout() const { return _layout; }
 
@@ -234 +234 @@
 
     void setDrawMode(unsigned int mode);
-    
+
     unsigned int getDrawMode() const { return _drawMode; }
 
     void setBoundingBoxMargin(float margin);
-    
+
     float getBoundingBoxMargin() const { return _textBBMargin; }
 
     void setBoundingBoxColor(const osg::Vec4& color){ _textBBColor = color; }
-    
+
     const osg::Vec4& getBoundingBoxColor() const { return _textBBColor; }
 
-    
+
     void setKerningType(KerningType kerningType) { _kerningType = kerningType; }
 
@@ -264 +264 @@
     virtual void releaseGLObjects(osg::State* state=0) const;
 
-    
+
     virtual osg::BoundingBox computeBound() const;
 
@@ -278 +278 @@
     virtual void computePositions(unsigned int contextID) const = 0;
     virtual void computeGlyphRepresentation() = 0;
-    
-    
+
+
     // members which have public access.
     osg::Vec4                               _color;
@@ -304 +304 @@
     unsigned int                            _lineCount;
 
-    
+
 
     // internal caches of the positioning of the text.
-    
+
     struct AutoTransformCache
-    {    
+    {
         AutoTransformCache():
             _traversalNumber(-1),
             _width(0),
             _height(0) {}
-    
+
         int         _traversalNumber;
         int         _width;
@@ -323 +323 @@
         osg::Matrix _matrix;
     };
-    
+
     mutable osg::buffered_object<AutoTransformCache>    _autoTransformCache;
     mutable osg::Vec3                                   _offset;
@@ -334 +334 @@
 
 #endif
- 
+