Changeset 9881

Timestamp:

03/10/09 11:56:00 (4 years ago)

Author:

robert

Message:

From David Callu, "Problem:

osgText::Text and osgText::Text3D use the same font file.
The first really load the file and obtain an osgText::Font object,
the second use the cache created during the first load of the
font file, and so obtain an osgText::Font object instead of
osgText::Font3D object. To obtain an osgText::Font3D object,
osgText::Text3D call osgDB::readObjectFile(...) with an option
to specify the plugin we want an osgText::Font3D instead of
osgText::Font.

Generalised Problem:

In osgDB::Registry, loaded file cache is referenced by the name
of this file, so if I load a file with some options, and the cache
already contain object for this filename, I obtain an object
potentially not loaded with my options.

Behaviours:

Cache management is delegate to osgDB::Registry, but cache
coherence (load a file with option then reuse it, deactivate the
cache when load a specific file or don't cached the loaded file)
is user's responsibility.

Text3D solution:

Postfix the font file name by .text3d or something similar and then have the freetype plugin return
osgText::Font3D when it detects this.
This operation is done by osgText::readFont3DFile() which unsure the filename have .text3d as extension.
This is totaly transparent for user, and backward compatible.

BTW, I fix the bug about the Normal of 3D text. Currently, the front and wall face have
the same normal (0,0,1) in the Text3D object coordinate. Now the wall face have its own
normal array computed by the plugin.

BTW 2, I implement
- void Text3D::accept(osg::Drawable::ConstAttributeFunctor?& af) const
- void Text3D::accept(osg::PrimitiveFunctor?& pf) const
so now statistics are well reported.
"

Location:

OpenSceneGraph/trunk

Files:

• include/osgText/Font3D (modified) (16 diffs)
• include/osgText/Text3D (modified) (14 diffs)
• src/osgDB/Registry.cpp (modified) (1 diff)
• src/osgPlugins/freetype/FreeTypeFont3D.cpp (modified) (18 diffs)
• src/osgPlugins/freetype/ReaderWriterFreeType.cpp (modified) (5 diffs)
• src/osgText/Font3D.cpp (modified) (12 diffs)
• src/osgText/Text3D.cpp (modified) (47 diffs)

OpenSceneGraph/trunk/include/osgText/Font3D

@@ -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.
 */
@@ -32 +32 @@
 
 /** Read a font from specified file. The filename may contain a path.
-  * It will search for the font file in the following places in this order: 
+  * It will search for the font file in the following places in this order:
   * - In the current directory
   * - All paths defined in OSG_FILE_PATH or OSGFILEPATH environment variable
@@ -46 +46 @@
   * - Other OS: In /usr/share/fonts/ttf/western
   * - Other OS: In /usr/share/fonts/ttf/decoratives
-  * 
+  *
   * If the given file could not be found, the path part will be stripped and
   * the file will be searched again in the OS specific directories.
@@ -68 +68 @@
 // declare the interface to a font.
 public:
-    
+
     // forward declare nested classes.
     class Glyph3D;
@@ -93 +93 @@
     /** Get a Glyph for specified charcode, and the font size nearest to the current font size hint.*/
     virtual Glyph3D* getGlyph(unsigned int charcode);
-    
+
     /** Return true if this font provides vertical alignments and spacing or glyphs.*/
     virtual bool hasVertical() const;
@@ -99 +99 @@
     /** Return the scale to apply on the glyph to have a charactere size equal to 1 */
     virtual float getScale() const { return _implementation->getScale(); };
-    
+
     // make Text a friend to allow it add and remove its entry in the Font's _textList.
     friend class Font3DImplementation;
@@ -110 +110 @@
     /** Set whether to use a mutex to ensure ref() and unref() */
     virtual void setThreadSafeRefUnref(bool threadSafe);
-    
+
     typedef OpenThreads::Mutex Font3DMutex;
 
@@ -116 +116 @@
 
     virtual ~Font3D();
-    
+
 //    void addGlyph(unsigned int width, unsigned int height, unsigned int charcode, Glyph* glyph);
     void addGlyph(unsigned int charcode, Glyph3D* glyph);
-    
+
     // current active size of font
     unsigned int                        _depth;
@@ -128 +128 @@
 
     typedef std::map<char, osg::ref_ptr<Glyph3D> > Glyph3DMap;
-    Glyph3DMap _glyph3DMap; 
-    
+    Glyph3DMap _glyph3DMap;
+
     osg::ref_ptr<Font3DImplementation> _implementation;
 
-    
+
 // declare the nested classes.
 public:
@@ -139 +139 @@
     {
     public:
-    
+
         Font3DImplementation():
             osg::Referenced(true),
             _facade(0) {}
-    
+
         virtual std::string getFileName() const = 0;
 
@@ -154 +154 @@
         /** Return true if this font provides vertical alignments and spacing or glyphs.*/
         virtual bool hasVertical() const = 0;
-        
+
         virtual float getScale() const = 0;
-  
+
         void setFontWidth(unsigned int width) { _facade->_width = width; }
 
         void setFontHeight(unsigned int height) { _facade->_height = height; }
-        
+
         void setFontDepth(unsigned int depth) { _facade->_depth = depth; }
-        
+
 //        void addGlyph(unsigned int width, unsigned int height, unsigned int charcode, Glyph3D* glyph)
 //        {
 //            _facade->addGlyph(width, height, charcode, glyph);
 //        }
-//        
+//
 //        void addGlyph(unsigned int charcode, Glyph3D* glyph)
 //        {
@@ -182 +182 @@
         Glyph3D(unsigned int glyphCode):
             osg::Referenced(true),
-            _glyphCode(glyphCode), 
+            _glyphCode(glyphCode),
             _horizontalBearing(0,0),
             _horizontalAdvance(0),
@@ -188 +188 @@
             _verticalAdvance(0)
             {}
-        
+
 
         /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
 //        virtual int compare(const osg::StateAttribute& rhs) const;
-//        
+//
 //        virtual void apply(osg::State& state) const;
 
-        
-        
+
+
         unsigned int getGlyphCode() const { return _glyphCode; }
-        
+
         void setHorizontalBearing(const osg::Vec2& bearing) { _horizontalBearing=bearing; }
         const osg::Vec2 & getHorizontalBearing() const { return _horizontalBearing; }
-        
+
         void setHorizontalAdvance(float advance) { _horizontalAdvance=advance; }
         float getHorizontalAdvance() const { return _horizontalAdvance; }
@@ -210 +210 @@
         void setVerticalAdvance(float advance) { _verticalAdvance=advance; }
         float getVerticalAdvance() const { return _verticalAdvance; }
-                
+
         void setBoundingBox(osg::BoundingBox & bb) { _bb=bb; }
         const osg::BoundingBox & getBoundingBox() const { return _bb; }
-        
-        
+
+
         /** Set whether to use a mutex to ensure ref() and unref() are thread safe.*/
         virtual void setThreadSafeRefUnref(bool threadSafe);
 
-        
+
         /** Get the PrimitiveSetList for the front face. */
         osg::Geometry::PrimitiveSetList & getFrontPrimitiveSetList() { return _frontPrimitiveSetList; }
@@ -225 +225 @@
         /** Get et the PrimitiveSetList for the back face. */
         osg::Geometry::PrimitiveSetList & getBackPrimitiveSetList() { return _backPrimitiveSetList; }
-        
+
         /** Set the VertexArray of the glyph. */
         void setVertexArray(osg::Vec3Array * va) { _vertexArray = va; }
         /** Get the VertexArray of the glyph. */
         osg::Vec3Array * getVertexArray() { return _vertexArray.get(); }
+        /** Set the VertexArray of the glyph. */
+        void setNormalArray(osg::Vec3Array * na) { _normalArray = na; }
         /** Get the NormalArray for the wall face. */
         osg::Vec3Array * getNormalArray() { return _normalArray.get(); }
-        
+
         float getHorizontalWidth() { return (-_horizontalBearing.x() + _horizontalAdvance); }
         float getHorizontalHeight() { return (-_horizontalBearing.y() + _bb.yMax()); }
         float getVerticalWidth() { return (-_verticalBearing.x() + _bb.xMax()); }
         float getVerticalHeight() { return (-_verticalBearing.y() + _verticalAdvance); }
-        
+
         void setWidth(float width) { _width = width; }
         float getWidth() { return _width; }
-        
+
         void setHeight(float height) { _height = height; }
         float getHeight() { return _height; }
-        
+
     protected:
-    
+
         virtual ~Glyph3D() {}
 
@@ -256 +258 @@
         float                       _verticalAdvance;
 
-        osg::BoundingBox            _bb;        
+        osg::BoundingBox            _bb;
 //        osg::Vec2                   _advance;
-        
+
         float _width;
         float _height;
-        
-        
+
+
         osg::ref_ptr<osg::Vec3Array> _vertexArray;
         osg::ref_ptr<osg::Vec3Array> _normalArray;
-        
+
         osg::Geometry::PrimitiveSetList _frontPrimitiveSetList;
         osg::Geometry::PrimitiveSetList _wallPrimitiveSetList;
         osg::Geometry::PrimitiveSetList _backPrimitiveSetList;
-        
-        
+
+
     };
 

OpenSceneGraph/trunk/include/osgText/Text3D

@@ -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.
 */
@@ -31 +31 @@
      *                   all wall face with the wall StateSet
      *                   all back face with the back StateSet (back face of the character, no the OpenGL back face)
-     * 
+     *
      * PER_GLYPH : render all Charactere with the default StateSet
      */
@@ -39 +39 @@
         PER_GLYPH
     };
-    
+
     Text3D();
     Text3D(const Text3D& text,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
@@ -49 +49 @@
     /** Set the Charactere Depth of text. */
     void setCharacterDepth(float characterDepth) { _characterDepth = characterDepth; computeGlyphRepresentation(); }
-    
+
     /** Get the render mode used to render the text. */
     RenderMode getRenderMode() const { return _renderMode; }
@@ -58 +58 @@
 //    osg::StateSet * getWallStateSet() { return _wallStateSet.get(); }
 //    /** Get or create the wall StateSet */
-//    osg::StateSet * getOrCreateWallStateSet() 
-//    { 
-//        if (_wallStateSet.valid() == false) _wallStateSet = new osg::StateSet; 
-//        return _wallStateSet.get(); 
+//    osg::StateSet * getOrCreateWallStateSet()
+//    {
+//        if (_wallStateSet.valid() == false) _wallStateSet = new osg::StateSet;
+//        return _wallStateSet.get();
 //    }
 //    /** Set the wall StateSet */
@@ -72 +72 @@
 //    /** Set the back StateSet */
 //    void setBackStateSet(osg::StateSet * backStateSet)  { _backStateSet = backStateSet; }
-//            
-    
-    /** Set the Font to use to render the text.  
+//
+
+    /** Set the Font to use to render the text.
       * setFont(0) sets the use of the default font.*/
     inline void setFont(Font3D* font=0) { setFont(osg::ref_ptr<Font3D>(font)); };
@@ -87 +87 @@
     void setFont(const std::string& fontfile);
 
-    /** Get the font. Return 0 if default is being used.*/    
+    /** Get the font. Return 0 if default is being used.*/
     const Font3D* getFont() const { return _font.get(); }
 
-    
-    
-    
+
+
+
     /** Draw the text.*/
     virtual void drawImplementation(osg::RenderInfo& renderInfo) const;
@@ -103 +103 @@
 
     /** accept an ConstAttributeFunctor and call its methods to tell it about the interal attributes that this Drawable has.*/
-//    virtual void accept(osg::Drawable::ConstAttributeFunctor& af) const;
+    virtual void accept(osg::Drawable::ConstAttributeFunctor& af) const;
 
     /** return true, osgText::Text does support accept(PrimitiveFunctor&) .*/
@@ -109 +109 @@
 
     /** accept a PrimtiveFunctor and call its methods to tell it about the interal primtives that this Drawable has.*/
-//    virtual void accept(osg::PrimitiveFunctor& pf) const;
+    virtual void accept(osg::PrimitiveFunctor& pf) const;
 
 
@@ -123 +123 @@
     virtual void releaseGLObjects(osg::State* state=0) const;
 
-//    // make Font a friend to allow it set the _font to 0 if the font is 
+//    // make Font a friend to allow it set the _font to 0 if the font is
 //    // forcefully unloaded.
     friend class Font3D;
@@ -132 +132 @@
 protected:
 
-    virtual ~Text3D() {} 
-    
+    virtual ~Text3D() {}
+
     void renderPerGlyph(osg::State & state) const;
     void renderPerFace(osg::State & state) const;
@@ -141 +141 @@
     void computeGlyphRepresentation();
     void computePositions(unsigned int contextID) const;
-    
+
     // ** glyph and other information to render the glyph
     struct GlyphRenderInfo
@@ -147 +147 @@
         GlyphRenderInfo(Font3D::Glyph3D * glyph, osg::Vec3 & pos) :
             _glyph(glyph), _position(pos) {}
-                    
+
         osg::ref_ptr<Font3D::Glyph3D> _glyph;
         osg::Vec3 _position;
     };
-    
+
     typedef std::vector<GlyphRenderInfo> LineRenderInfo;
-    typedef std::vector<LineRenderInfo> TextRenderInfo;    
-    
+    typedef std::vector<LineRenderInfo> TextRenderInfo;
+
     TextRenderInfo _textRenderInfo;
 
@@ -160 +160 @@
 
     float _characterDepth;
-    
+
     RenderMode _renderMode;
-    
+
     osg::ref_ptr<osg::StateSet> _wallStateSet;
     osg::ref_ptr<osg::StateSet> _backStateSet;

OpenSceneGraph/trunk/src/osgDB/Registry.cpp

@@ -319 +319 @@
     addFileExtensionAlias("cef",   "freetype");  // OpenType
     addFileExtensionAlias("fon",   "freetype");  // Windows bitmap fonts
-    addFileExtensionAlias("fnt",   "freetype");    // Windows bitmap fonts
-    
+    addFileExtensionAlias("fnt",   "freetype");  // Windows bitmap fonts
+    addFileExtensionAlias("text3d", "freetype"); // use 3D Font instead of 2D Font
+
     // wont't add type1 and type2 until resolve extension collision with Performer binary and ascii files.
     // addFileExtensionAlias("pfb",   "freetype");  // type1 binary

OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeFont3D.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.
 */
@@ -21 +21 @@
 
 #include <osg/Geometry>
-#include <osg/Notify>  
+#include <osg/Notify>
 #include <osgDB/WriteFile>
 #include <osgUtil/SmoothingVisitor>
@@ -27 +27 @@
 
 
-#include <ft2build.h>  
+#include <ft2build.h>
 #include FT_FREETYPE_H
 
@@ -174 +174 @@
 {
     Char3DInfo* char3d = (Char3DInfo*)user;
-    char3d->cubicTo( 
+    char3d->cubicTo(
         osg::Vec2(FT_NUM(control1->x),FT_NUM(control1->y)),
         osg::Vec2(FT_NUM(control2->x),FT_NUM(control2->y)),
@@ -221 +221 @@
     }
 
-    FT_Set_Char_Size( _face, 64*64, 64*64, 600, 600); 
+    FT_Set_Char_Size( _face, 64*64, 64*64, 600, 600);
 
     int glyphIndex = FT_Get_Char_Index( _face, 'M' );
@@ -291 +291 @@
             // not dangling pointers remain
             freeTypeLibrary->removeFont3DImplmentation(this);
-        
+
             // free the freetype font face itself
             FT_Done_Face(_face);
@@ -309 +309 @@
 osgText::Font3D::Glyph3D * FreeTypeFont3D::getGlyph(unsigned int charcode)
 {
-    
-    
+
+
     //
-    // GT: fix for symbol fonts (i.e. the Webdings font) as the wrong character are being  
-    // returned, for symbol fonts in windows (FT_ENCONDING_MS_SYMBOL in freetype) the correct 
-    // values are from 0xF000 to 0xF0FF not from 0x000 to 0x00FF (0 to 255) as you would expect.  
+    // GT: fix for symbol fonts (i.e. the Webdings font) as the wrong character are being
+    // returned, for symbol fonts in windows (FT_ENCONDING_MS_SYMBOL in freetype) the correct
+    // values are from 0xF000 to 0xF0FF not from 0x000 to 0x00FF (0 to 255) as you would expect.
     // Microsoft uses a private field for its symbol fonts
     //
@@ -337 +337 @@
         return 0;
     }
-    
+
     // ** init FreeType to describe the glyph
     Char3DInfo char3d;
@@ -349 +349 @@
     funcs.shift = 0;
     funcs.delta = 0;
-    
+
     // ** record description
     FT_Error _error = FT_Outline_Decompose(&outline, &funcs, &char3d);
@@ -357 +357 @@
         return 0;
     }
-    
+
     // ** create geometry for each part of the glyph
     osg::ref_ptr<osg::Geometry> frontGeo(new osg::Geometry);
     frontGeo->setVertexArray(char3d.get()->getVertexArray());
     frontGeo->setPrimitiveSetList(char3d.get()->getPrimitiveSetList());
-    
+
     osg::ref_ptr<osg::Geometry> wallGeo(new osg::Geometry);
     wallGeo->setVertexArray(frontGeo->getVertexArray());
-    
+
     osg::ref_ptr<osg::Geometry> backGeo(new osg::Geometry);
     backGeo->setVertexArray(frontGeo->getVertexArray());
-        
-    
-    
-    // ** for conveniance.
+
+
+
+    // ** for convenience.
     osg::Vec3Array * vertices = char3d._verts.get();
-    
-    
-    
-    // ** duplicate the vertex for the back face 
+
+
+
+    // ** duplicate the vertex for the back face
     // ** with a depth equal to the font depth
     std::size_t len = vertices->size();
     std::size_t dlen = len * 2;
-      
+
     vertices->reserve(dlen);
-       
+
     osg::Vec3Array::iterator begin = vertices->begin();
     osg::Vec3Array::iterator it = vertices->begin();
-    
+
     for (std::size_t i = 0; i != len; ++i, ++it)
         vertices->push_back(*it);
 //    std::copy(begin, begin + len, begin + len + 1); TOCHECK
-    
- 
+
+
     // ** and decal new vertices
     unsigned int depth = _facade->getFontDepth();
@@ -397 +397 @@
         (*vertices)[i].z() -= depth;
     }
-    
+
     osg::Vec3Array::iterator end;
-    
+
     // ** create wall and back face from the front polygon
-    // **  then accumulate them in the apropriate geometry wallGeo and backGeo 
+    // **  then accumulate them in the appropriate geometry wallGeo and backGeo
     for (std::size_t i=0; i < frontGeo->getNumPrimitiveSets(); ++i)
     {
@@ -408 +408 @@
         unsigned int idx = daFront->getFirst();
         unsigned int cnt = daFront->getCount();
-        
+
         // ** reverse vertices to draw the front face in the CCW
         std::reverse(begin + idx, begin + idx + cnt);
-        
+
         // ** create the back polygon
         osg::ref_ptr<osg::DrawArrays> daBack(new osg::DrawArrays(osg::PrimitiveSet::POLYGON, idx + len, cnt));
         backGeo->addPrimitiveSet(daBack.get());
-        
-        
+
+
         // ** create the wall triangle strip
-        osg::ref_ptr<osg::DrawElementsUInt> deWall(new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLE_STRIP)); 
+        osg::ref_ptr<osg::DrawElementsUInt> deWall(new osg::DrawElementsUInt(osg::PrimitiveSet::TRIANGLE_STRIP));
         wallGeo->addPrimitiveSet(deWall.get());
-        
+
         // **  link triangle strip
         deWall->push_back(idx + len);
         for (unsigned int j = 1; j < cnt; ++j)
-        {   
+        {
             deWall->push_back(idx + cnt - j);
             deWall->push_back(idx + len + j);
@@ -440 +440 @@
         ts.retessellatePolygons(*frontGeo);
     }
-    
+
     {
         osgUtil::Tessellator ts;
@@ -455 +455 @@
         geode->accept(sm);
     }
-    
-    // ** save vertices and PrimitiveSetList of each face in the Glyph3D PrimitiveSet face list 
+
+    // ** save vertices and PrimitiveSetList of each face in the Glyph3D PrimitiveSet face list
     osgText::Font3D::Glyph3D * glyph3D = new osgText::Font3D::Glyph3D(charcode);
 
     glyph3D->setVertexArray(dynamic_cast<osg::Vec3Array*>(frontGeo->getVertexArray()));
-    
+    glyph3D->setNormalArray(dynamic_cast<osg::Vec3Array*>(wallGeo->getNormalArray()));
+
     glyph3D->getFrontPrimitiveSetList() = frontGeo->getPrimitiveSetList();
     glyph3D->getWallPrimitiveSetList() = wallGeo->getPrimitiveSetList();
     glyph3D->getBackPrimitiveSetList() = backGeo->getPrimitiveSetList();
 
-    
+
     FT_Glyph_Metrics* metrics = &(_face->glyph->metrics);
 
@@ -476 +477 @@
     glyph3D->setHeight((float)metrics->height / 64.0f);
 
-    
+
     FT_BBox ftbb;
     FT_Outline_Get_BBox(&outline, &ftbb);
@@ -484 +485 @@
     long ymin = ft_floor( ftbb.yMin );
     long ymax = ft_ceiling( ftbb.yMax );
-        
+
     osg::BoundingBox bb(xmin / 64.0f, ymin / 64.0f, 0.0f, xmax / 64.0f, ymax / 64.0f, 0.0f);
-    
+
     glyph3D->setBoundingBox(bb);
-    
+
     return glyph3D;
 }
@@ -501 +502 @@
     FT_UInt left = FT_Get_Char_Index( _face, leftcharcode );
     FT_UInt right = FT_Get_Char_Index( _face, rightcharcode );
-    
-    // get the kerning distances.   
+
+    // get the kerning distances.
     FT_Vector  kerning;
 
@@ -525 +526 @@
 }
 
-float FreeTypeFont3D::getScale() const 
-{ 
-    return _scale; 
-}
+float FreeTypeFont3D::getScale() const
+{
+    return _scale;
+}

OpenSceneGraph/trunk/src/osgPlugins/freetype/ReaderWriterFreeType.cpp

@@ -18 +18 @@
             supportsExtension("cff","OpenType format");
             supportsExtension("cef","OpenType format");
-            supportsExtension("fon","Windows bitmap fonts format");
+            supportsExtension("fon","Windows bitmap fonts format");
             supportsExtension("fnt","Windows bitmap fonts format");
+            supportsExtension("text3d","use 3D Font instead of 2D Font");
 
             supportsOption("monochrome","Select monochrome font.");
         }
-        
+
         virtual const char* className() const { return "FreeType Font Reader/Writer"; }
-        
+
         static unsigned int getFlags(const osgDB::ReaderWriter::Options* options)
         {
@@ -33 +34 @@
                 flags |= FT_LOAD_MONOCHROME;
             }
-            
+
             return flags;
         }
@@ -39 +40 @@
         virtual ReadResult readObject(const std::string& file, const osgDB::ReaderWriter::Options* options) const
         {
-            std::string ext = osgDB::getLowerCaseFileExtension(file);
+            std::string tmpFile = file;
+            bool needFont3D = false;
+
+            std::string ext = osgDB::getLowerCaseFileExtension(tmpFile);
+            if (ext == "text3d")
+            {
+                needFont3D = true;
+                tmpFile.erase(tmpFile.size()-7, 7);
+                ext = osgDB::getLowerCaseFileExtension(tmpFile);
+            }
+            else if ((options != NULL) && (options->getPluginData("3D")))
+            {
+                needFont3D = true;
+            }
+
             if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
 
-            std::string fileName = osgDB::findDataFile( file, options );
+            std::string fileName = osgDB::findDataFile( tmpFile, options );
             if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
-            
+
             FreeTypeLibrary* freeTypeLibrary = FreeTypeLibrary::instance();
-            if (!freeTypeLibrary) 
+            if (!freeTypeLibrary)
             {
                 osg::notify(osg::WARN)<<"Warning:: cannot create freetype font after freetype library has been deleted."<<std::endl;
@@ -52 +67 @@
             }
 
-            if ( (options != NULL) && (options->getPluginData("3D")) )
+            if (needFont3D)
                 return freeTypeLibrary->getFont3D(fileName,0,getFlags(options));
             else
@@ -61 +76 @@
         {
             FreeTypeLibrary* freeTypeLibrary = FreeTypeLibrary::instance();
-            if (!freeTypeLibrary) 
+            if (!freeTypeLibrary)
             {
                 osg::notify(osg::WARN)<<"Warning:: cannot create freetype font after freetype library has been deleted."<<std::endl;

OpenSceneGraph/trunk/src/osgText/Font3D.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.
 */
@@ -87 +87 @@
 
     // Not found, return empty string
-    osg::notify(osg::WARN)<<"Warning: font file \""<<str<<"\" not found."<<std::endl;    
+    osg::notify(osg::WARN)<<"Warning: font file \""<<str<<"\" not found."<<std::endl;
     return std::string();
 }
@@ -95 +95 @@
     if (filename=="") return 0;
 
-    std::string foundFile = findFont3DFile(filename);
+    // unsure filename have not .text3d at the end
+    std::string tmpFilename;
+    std::string text3dExt = ".text3d";
+    std::string ext = osgDB::getFileExtensionIncludingDot(filename);
+    if (ext == text3dExt)
+        tmpFilename = filename.substr(filename.size() - ext.size(), ext.size());
+    else
+        tmpFilename = filename;
+
+    //search font file
+    std::string foundFile = findFont3DFile(tmpFilename);
     if (foundFile.empty()) return 0;
-    
+
+    //unsure filename have .text3d at the end
+    foundFile += text3dExt;
+
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_Font3DFileMutex);
 
@@ -105 +118 @@
         localOptions = new osgDB::ReaderWriter::Options;
         localOptions->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_OBJECTS);
-        // ** HACK to load Font3D instead of Font
-        localOptions->setPluginData("3D", (void*) 1);
-    }
-    else
-    {
-        userOptions->setPluginData("3D", (void*) 1);
     }
 
     osg::Object* object = osgDB::readObjectFile(foundFile, userOptions ? userOptions : localOptions.get());
-    
+
     // if the object is a font then return it.
     osgText::Font3D* font3D = dynamic_cast<osgText::Font3D*>(object);
@@ -143 +150 @@
     osgDB::ReaderWriter *reader = osgDB::Registry::instance()->getReaderWriterForExtension("ttf");
     if (reader == 0) return 0;
-    
+
     osgDB::ReaderWriter::ReadResult rr = reader->readObject(stream, userOptions ? userOptions : localOptions.get());
     if (rr.error())
@@ -151 +158 @@
     }
     if (!rr.validObject()) return 0;
-    
+
     osg::Object *object = rr.takeObject();
 
@@ -167 +174 @@
     if (filename=="") return 0;
 
-    std::string foundFile = findFont3DFile(filename);
+    std::string tmpFilename;
+    std::string text3dExt = ".text3d";
+    std::string ext = osgDB::getFileExtensionIncludingDot(filename);
+    if (ext == text3dExt)
+        tmpFilename = filename.substr(0, filename.size() - ext.size());
+    else
+        tmpFilename = filename;
+
+    std::string foundFile = findFont3DFile(tmpFilename);
     if (foundFile.empty()) return 0;
-    
+
+    foundFile += text3dExt;
+
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_Font3DFileMutex);
 
@@ -177 +194 @@
         localOptions = new osgDB::ReaderWriter::Options;
         localOptions->setObjectCacheHint(osgDB::ReaderWriter::Options::CACHE_OBJECTS);
-        // ** HACK to load Font3D instead of Font
-        localOptions->setPluginData("3D", (void*) 1);
-    }
-    else
-    {
-        userOptions->setPluginData("3D", (void*) 1);
     }
 
     osg::ref_ptr<osg::Object> object = osgDB::readRefObjectFile(foundFile, userOptions ? userOptions : localOptions.get());
-    
+
     // if the object is a font then return it.
     osgText::Font3D* font3D = dynamic_cast<osgText::Font3D*>(object.get());
@@ -213 +224 @@
     osgDB::ReaderWriter *reader = osgDB::Registry::instance()->getReaderWriterForExtension("ttf");
     if (reader == 0) return 0;
-    
+
     osgDB::ReaderWriter::ReadResult rr = reader->readObject(stream, userOptions ? userOptions : localOptions.get());
     if (rr.error())
@@ -268 +279 @@
 Font3D::Glyph3D* Font3D::getGlyph(unsigned int charcode)
 {
-    Glyph3D * glyph3D = NULL; 
-    
+    Glyph3D * glyph3D = NULL;
+
     Glyph3DMap::iterator itr = _glyph3DMap.find(charcode);
     if (itr!=_glyph3DMap.end()) glyph3D = itr->second.get();
-    
+
     else if (_implementation.valid())
     {
@@ -278 +289 @@
         if (glyph3D) _glyph3DMap[charcode] = glyph3D;
     }
-    
+
     return glyph3D;
 }
@@ -285 +296 @@
 {
     Glyph3DMap::iterator it,end = _glyph3DMap.end();
-    
+
     for (it=_glyph3DMap.begin(); it!=end; ++it)
         it->second->setThreadSafeRefUnref(threadSafe);

OpenSceneGraph/trunk/src/osgText/Text3D.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.
 */
@@ -14 +14 @@
 #include <osgText/Text3D>
 #include <osg/io_utils>
-namespace osgText 
+namespace osgText
 {
 
@@ -33 +33 @@
 }
 
-//void Text3D::accept(osg::Drawable::ConstAttributeFunctor& af) const
-//{
-//    TODO
-//}
-
-//void Text3D::accept(osg::PrimitiveFunctor& /*pf*/) const
-//{
-//    TODO 
-//}
+void Text3D::accept(osg::Drawable::ConstAttributeFunctor& af) const
+{
+    // ** for each line, do ...
+    TextRenderInfo::const_iterator itLine, endLine = _textRenderInfo.end();
+    for (itLine = _textRenderInfo.begin(); itLine!=endLine; ++itLine)
+    {
+        // ** for each glyph in the line, do ...
+        LineRenderInfo::const_iterator it, end = itLine->end();
+        for (it = itLine->begin(); it!=end; ++it)
+        {
+            // ** apply the vertex array
+            af.apply(osg::Drawable::VERTICES, it->_glyph->getVertexArray()->size(), &(it->_glyph->getVertexArray()->front()));
+        }
+    }
+}
+void Text3D::accept(osg::PrimitiveFunctor& pf) const
+{
+    // ** for each line, do ...
+    TextRenderInfo::const_iterator itLine, endLine = _textRenderInfo.end();
+    for (itLine = _textRenderInfo.begin(); itLine!=endLine; ++itLine)
+    {
+        // ** for each glyph in the line, do ...
+        LineRenderInfo::const_iterator it, end = itLine->end();
+        for (it = itLine->begin(); it!=end; ++it)
+        {
+            pf.setVertexArray(it->_glyph->getVertexArray()->size(),&(it->_glyph->getVertexArray()->front()));
+
+            // ** render the front face of the glyph
+            osg::Geometry::PrimitiveSetList & pslFront = it->_glyph->getFrontPrimitiveSetList();
+            for(osg::Geometry::PrimitiveSetList::const_iterator itr=pslFront.begin(), end = pslFront.end(); itr!=end; ++itr)
+            {
+                (*itr)->accept(pf);
+            }
+
+            // ** render the wall face of the glyph
+            osg::Geometry::PrimitiveSetList & pslWall = it->_glyph->getWallPrimitiveSetList();
+            for(osg::Geometry::PrimitiveSetList::const_iterator itr=pslWall.begin(), end=pslWall.end(); itr!=end; ++itr)
+            {
+                (*itr)->accept(pf);
+            }
+
+            // ** render the back face of the glyph
+            osg::Geometry::PrimitiveSetList & pslBack = it->_glyph->getBackPrimitiveSetList();
+            for(osg::Geometry::PrimitiveSetList::const_iterator itr=pslBack.begin(), end=pslBack.end(); itr!=end; ++itr)
+            {
+                (*itr)->accept(pf);
+            }
+        }
+    }
+}
 
 void Text3D::setFont(osg::ref_ptr<Font3D> font)
-{ 
+{
     _font = font;
-    
+
     computeGlyphRepresentation();
 }
 
 void Text3D::setFont(const std::string & fontfile)
-{ 
+{
     setFont(readRefFont3DFile(fontfile));
 }
@@ -76 +117 @@
     float maximumHeight = _maximumHeight / _font->getScale();
     float maximumWidth = _maximumWidth / _font->getScale();
-    
+
     for(bool outOfSpace=false;lastChar!=last;++lastChar)
     {
         unsigned int charcode = *lastChar;
-        
+
         if (charcode=='\n')
         {
@@ -90 +131 @@
         {
             const osg::BoundingBox & bb = glyph->getBoundingBox();
-            
+
             // adjust cursor position w.r.t any kerning.
             if (previous_charcode)
             {
-                
+
                 if (_layout == RIGHT_TO_LEFT)
                 {
                     cursor.x() -= glyph->getHorizontalAdvance();
                 }
-                
+
                 if (kerning)
                 {
@@ -120 +161 @@
             }
             else
-            { 
+            {
                 switch (_layout)
                 {
@@ -136 +177 @@
                         break;
                 }
-                
-            }
-            
-            
+
+            }
+
+
 
             switch(_layout)
@@ -159 +200 @@
                 break;
             }
-            
+
             // => word boundary detection & wrapping
             if (outOfSpace) break;
@@ -176 +217 @@
 
     }
-    
+
     // word boundary detection & wrapping
     if (lastChar!=last)
     {
-        if (deliminatorSet.count(*lastChar)==0) 
+        if (deliminatorSet.count(*lastChar)==0)
         {
             String::iterator lastValidChar = lastChar;
@@ -186 +227 @@
             {
                 --lastValidChar;
-                
+
                 //Substract off glyphs from the cursor position (to correctly center text)
                 Font3D::Glyph3D* glyph = _font->getGlyph(*lastValidChar);
@@ -199 +240 @@
                 }
             }
-            
+
             if (first!=lastValidChar)
             {
@@ -214 +255 @@
 {
     if (_font.valid() == false) return;
-    
+
     _textRenderInfo.clear();
     _lineCount = 0;
-    
-    if (_text.empty()) 
+
+    if (_text.empty())
     {
         _textBB.set(0,0,0, 0,0,0);//no size text
@@ -224 +265 @@
         return;
     }
-    
+
     // initialize bounding box, it will be expanded during glyph position calculation
     _textBB.init();
@@ -232 +273 @@
     osg::Vec2 local(0.0f,0.0f);
     osg::Vec2 startOffset(0.0f,0.0f);
-    
+
     unsigned int previous_charcode = 0;
     unsigned int linelength = 0;
     bool kerning = true;
-    
+
     unsigned int lineNumber = 0;
 
-  
+
 
     for(String::iterator itr=_text.begin(); itr!=_text.end(); )
@@ -245 +286 @@
         _textRenderInfo.resize(lineNumber + 1);
         LineRenderInfo & currentLineRenderInfo = _textRenderInfo.back();
-        
+
         // record the start of the current line
         String::iterator startOfLine_itr = itr;
@@ -252 +293 @@
         osg::Vec2 endOfLine_coords(cursor);
         String::iterator endOfLine_itr = computeLastCharacterOnLine(endOfLine_coords, itr,_text.end());
-        
-        // ** position the cursor function to the Layout and the alignement 
+
+        // ** position the cursor function to the Layout and the alignement
         TextBase::positionCursor(endOfLine_coords, cursor, (unsigned int) (endOfLine_itr - startOfLine_itr));
 
-        
+
         if (itr!=endOfLine_itr)
         {
@@ -267 +308 @@
                 {
                     const osg::BoundingBox & bb = glyph->getBoundingBox();
-                    
+
                     // adjust cursor position w.r.t any kerning.
                     if (previous_charcode)
@@ -275 +316 @@
                             cursor.x() -= glyph->getHorizontalAdvance();
                         }
-                        
+
                         if (kerning)
                         {
@@ -296 +337 @@
                     }
                     else
-                    { 
+                    {
                         switch (_layout)
                         {
@@ -315 +356 @@
                             }
                         }
-                        
+
                     }
 
                     local = cursor;
-                    
+
                     if (_layout==VERTICAL)
                     {
@@ -325 +366 @@
                         local.y() += -glyph->getVerticalBearing().y();
                     }
-                     
-                    
-                    
+
+
+
                     // move the cursor onto the next character.
                     // also expand bounding box
@@ -345 +386 @@
                             _textBB.expandBy(osg::Vec3(cursor.x()+bb.xMax(), cursor.y() + bb.yMax(), 0.0f)); //upper right corner
                             _textBB.expandBy(osg::Vec3(cursor.x()+bb.xMin(), cursor.y()+bb.yMin(), 0.0f)); //lower left corner
-                            
+
                             break;
                     }
-                    
+
                     osg::Vec3 pos = osg::Vec3(local.x(), local.y(), 0.0f);
                     currentLineRenderInfo.push_back(Text3D::GlyphRenderInfo(glyph, pos));
 
-                    
+
                     previous_charcode = charcode;
                 }
@@ -361 +402 @@
             ++itr;
         }
-                                
+
         if (itr!=_text.end())
         {
@@ -367 +408 @@
             if (*itr=='\n') ++itr;
         }
-                
+
         // move to new line.
         switch(_layout)
@@ -395 +436 @@
     }
     _textBB.expandBy(0.0f,0.0f,-1);
-    
+
     TextBase::computePositions();
 }
-
-
 
 osg::BoundingBox Text3D::computeBound() const
@@ -411 +450 @@
             osg::Matrix& matrix = _autoTransformCache[i]._matrix;
             bbox.expandBy(osg::Vec3(_textBB.xMin(),_textBB.yMin(),_textBB.zMin())*matrix);
-//          bbox.expandBy(osg::Vec3(_textBB.xMax(),_textBB.yMin(),_textBB.zMin())*matrix);
             bbox.expandBy(osg::Vec3(_textBB.xMax(),_textBB.yMax(),_textBB.zMax())*matrix);
-//          bbox.expandBy(osg::Vec3(_textBB.xMin(),_textBB.yMax(),_textBB.zMin())*matrix);
-        }
-    }
-    
+        }
+    }
+
     return bbox;
 }
 
-
-
-
-
-
-
 void Text3D::computePositions(unsigned int contextID) const
 {
     if (_font.valid() == false) return;
-    
+
     switch(_alignment)
     {
@@ -447 +478 @@
     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*(_lineCount-1),0.0f); break;
     case CENTER_BOTTOM_BASE_LINE:  _offset.set((_textBB.xMax()+_textBB.xMin())*0.5f,-_characterHeight*(_lineCount-1),0.0f); break;
     case RIGHT_BOTTOM_BASE_LINE:  _offset.set(_textBB.xMax(),-_characterHeight*(_lineCount-1),0.0f); break;
     }
-    
+
     AutoTransformCache& atc = _autoTransformCache[contextID];
     osg::Matrix& matrix = atc._matrix;
 
-    
+
     float scale = _font->getScale();
     osg::Vec3 scaleVec(scale * _characterHeight, scale * _characterHeight / _characterAspectRatio, _characterDepth);
@@ -464 +495 @@
     matrix.postMultTranslate(_position);
 
-    
+
     _normal = osg::Matrix::transform3x3(osg::Vec3(0.0f,0.0f,1.0f),matrix);
     _normal.normalize();
 
-    const_cast<Text3D*>(this)->dirtyBound();    
+    const_cast<Text3D*>(this)->dirtyBound();
 }
 
@@ -475 +506 @@
     osg::State & state = *renderInfo.getState();
     unsigned int contextID = state.getContextID();
-    
-    
+
+
     // ** save the previous modelview matrix
     osg::ref_ptr<osg::RefMatrix> previous(new osg::RefMatrix(state.getModelViewMatrix()));
@@ -485 +516 @@
     // ** mult previous by the modelview for this context
     modelview->postMult(*previous.get());
-   
+
     // ** apply this new modelview matrix
     state.applyModelViewMatrix(modelview.get());
-    
-    
+
+
     if (_drawMode & TEXT)
     {
         renderInfo.getState()->disableAllVertexArrays();
-        
+
         glPushAttrib(GL_TRANSFORM_BIT);
         glEnable(GL_RESCALE_NORMAL);
-        
+
         switch(_renderMode)
         {
@@ -503 +534 @@
             default:        renderPerGlyph(*renderInfo.getState());  break;
         }
-        
+
         glPopAttrib();
     }
@@ -515 +546 @@
             osg::Vec3 c110(osg::Vec3(_textBB.xMax(),_textBB.yMax(),_textBB.zMax()));
             osg::Vec3 c010(osg::Vec3(_textBB.xMin(),_textBB.yMax(),_textBB.zMax()));
-        
+
             osg::Vec3 c001(osg::Vec3(_textBB.xMin(),_textBB.yMin(),_textBB.zMin()));
             osg::Vec3 c101(osg::Vec3(_textBB.xMax(),_textBB.yMin(),_textBB.zMin()));
             osg::Vec3 c111(osg::Vec3(_textBB.xMax(),_textBB.yMax(),_textBB.zMin()));
             osg::Vec3 c011(osg::Vec3(_textBB.xMin(),_textBB.yMax(),_textBB.zMin()));
-        
+
             glBegin(GL_LINE_LOOP);
                 glVertex3fv(c000.ptr());
@@ -527 +558 @@
                 glVertex3fv(c010.ptr());
             glEnd();
-            
+
             glBegin(GL_LINE_LOOP);
                 glVertex3fv(c001.ptr());
@@ -534 +565 @@
                 glVertex3fv(c101.ptr());
             glEnd();
-            
+
             glBegin(GL_LINES);
                 glVertex3fv(c000.ptr());
                 glVertex3fv(c001.ptr());
-                
+
                 glVertex3fv(c100.ptr());
                 glVertex3fv(c101.ptr());
-                
+
                 glVertex3fv(c110.ptr());
                 glVertex3fv(c111.ptr());
-                
+
                 glVertex3fv(c010.ptr());
                 glVertex3fv(c011.ptr());
             glEnd();
         }
-    }    
+    }
 
     if (_drawMode & ALIGNMENT)
@@ -566 +597 @@
             glVertex3fv(vb.ptr());
         glEnd();
-        
+
     }
 
@@ -573 +604 @@
 }
 
-
-
 void Text3D::renderPerGlyph(osg::State & state) const
-{   
+{
     // ** for each line, do ...
     TextRenderInfo::const_iterator itLine, endLine = _textRenderInfo.end();
@@ -585 +614 @@
         for (it = itLine->begin(); it!=end; ++it)
         {
-            
+
             glPushMatrix();
 
             glTranslatef(it->_position.x(), it->_position.y(), it->_position.z());
-           
+
             // ** apply the vertex array
             state.setVertexPointer(it->_glyph->getVertexArray());
-            
+
             // ** render the front face of the glyph
             glNormal3f(0.0f,0.0f,1.0f);
-            
+
             osg::Geometry::PrimitiveSetList & pslFront = it->_glyph->getFrontPrimitiveSetList();
             for(osg::Geometry::PrimitiveSetList::const_iterator itr=pslFront.begin(), end = pslFront.end(); itr!=end; ++itr)
             {
-                
                 (*itr)->draw(state, false);
             }
-            
+
             // ** render the wall face of the glyph
             state.setNormalPointer(it->_glyph->getNormalArray());
@@ -610 +638 @@
                 (*itr)->draw(state, false);
             }
-            
+            state.disableNormalPointer();
+
             // ** render the back face of the glyph
             glNormal3f(0.0f,0.0f,-1.0f);
-                        
+
             osg::Geometry::PrimitiveSetList & pslBack = it->_glyph->getBackPrimitiveSetList();
             for(osg::Geometry::PrimitiveSetList::const_iterator itr=pslBack.begin(), end=pslBack.end(); itr!=end; ++itr)
@@ -619 +648 @@
                 (*itr)->draw(state, false);
             }
-            
+
             glPopMatrix();
         }
@@ -629 +658 @@
     // ** render all front faces
     glNormal3f(0.0f,0.0f,1.0f);
-    
+
     TextRenderInfo::const_iterator itLine, endLine = _textRenderInfo.end();
     for (itLine = _textRenderInfo.begin(); itLine!=endLine; ++itLine)
@@ -635 +664 @@
         // ** for each glyph in the line, do ...
         LineRenderInfo::const_iterator it, end = itLine->end();
-        for (it = itLine->begin(); it!=end; ++it)   
+        for (it = itLine->begin(); it!=end; ++it)
         {
             glPushMatrix();
             glTranslatef(it->_position.x(), it->_position.y(), it->_position.z());
             state.setVertexPointer(it->_glyph->getVertexArray());
-            
+
             // ** render the front face of the glyph
             osg::Geometry::PrimitiveSetList & psl = it->_glyph->getFrontPrimitiveSetList();
@@ -650 +679 @@
         }
     }
-    
+
 
     // ** render all wall face of the text
@@ -663 +692 @@
             state.setVertexPointer(it->_glyph->getVertexArray());
             state.setNormalPointer(it->_glyph->getNormalArray());
-            
+
             osg::Geometry::PrimitiveSetList & psl = it->_glyph->getWallPrimitiveSetList();
             for(osg::Geometry::PrimitiveSetList::const_iterator itr=psl.begin(), end=psl.end(); itr!=end; ++itr)
@@ -673 +702 @@
     }
 
-    
+
     // ** render all back face of the text
     glNormal3f(0.0f,0.0f,-1.0f);
-                
+
     for (itLine = _textRenderInfo.begin(); itLine!=endLine; ++itLine)
     {
@@ -686 +715 @@
             glTranslatef(it->_position.x(), it->_position.y(), it->_position.z());
             state.setVertexPointer(it->_glyph->getVertexArray());
-            
+
             // ** render the back face of the glyph
             osg::Geometry::PrimitiveSetList & psl = it->_glyph->getBackPrimitiveSetList();
@@ -710 +739 @@
 {
     TextBase::resizeGLObjectBuffers(maxSize);
-    
+
     if (_font.valid()) _font->resizeGLObjectBuffers(maxSize);
 }
@@ -717 +746 @@
 {
     TextBase::releaseGLObjects(state);
-    
+
     if (_font.valid()) _font->releaseGLObjects(state);
 }