Changeset 9881 for OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeFont3D.cpp

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.
"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeFont3D.cpp (modified) (18 diffs)

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;
+}