Changeset 11735

Timestamp:

09/06/10 17:43:59 (21 months ago)

Author:

robert

Message:

Further work on new 3D text support

Location:

OpenSceneGraph/trunk

Files:

• examples/osgtext3D/GlyphGeometry.cpp (modified) (5 diffs)
• examples/osgtext3D/GlyphGeometry.h (modified) (1 diff)
• examples/osgtext3D/TextNode.cpp (modified) (4 diffs)
• examples/osgtext3D/osgtext3D.cpp (modified) (3 diffs)
• include/osgText/Text3D (modified) (4 diffs)
• src/osgPlugins/freetype/FreeTypeFont.cpp (modified) (16 diffs)
• src/osgPlugins/freetype/FreeTypeFont.h (modified) (1 diff)
• src/osgText/Font.cpp (modified) (2 diffs)
• src/osgText/Text3D.cpp (modified) (2 diffs)
• src/osgWrappers/serializers/osgText/Text3D.cpp (modified) (1 diff)

OpenSceneGraph/trunk/examples/osgtext3D/GlyphGeometry.cpp

@@ -410 +410 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 //
-// BevelProfile
-//
-BevelProfile::BevelProfile()
-{
-    flatBevel();
-}
-
-void BevelProfile::flatBevel(float width)
-{
-    _vertices.clear();
-
-    if (width>0.5f) width = 0.5f;
-
-    _vertices.push_back(osg::Vec2(0.0f,0.0f));
-
-    _vertices.push_back(osg::Vec2(width,1.0f));
-
-    if (width<0.5f) _vertices.push_back(osg::Vec2(1-width,1.0f));
-
-    _vertices.push_back(osg::Vec2(1.0f,0.0f));
-}
-
-void BevelProfile::roundedBevel(float width, unsigned int numSteps)
-{
-    _vertices.clear();
-
-    if (width>0.5f) width = 0.5f;
-
-    unsigned int i = 0;
-    for(; i<=numSteps; ++i)
-    {
-        float angle = float(osg::PI)*0.5f*(float(i)/float(numSteps));
-        _vertices.push_back( osg::Vec2((1.0f-cosf(angle))*width, sinf(angle)) );
-    }
-
-    // start the second half one into the curve if the width is half way across
-    i = width<0.5f ? 0 : 1;
-    for(; i<=numSteps; ++i)
-    {
-        float angle = float(osg::PI)*0.5f*(float(numSteps-i)/float(numSteps));
-        _vertices.push_back( osg::Vec2(1.0-(1.0f-cosf(angle))*width, sin(angle)) );
-    }
-}
-
-void BevelProfile::roundedBevel2(float width, unsigned int numSteps)
-{
-    _vertices.clear();
-
-    if (width>0.5f) width = 0.5f;
-
-    float h = 0.1f;
-    float r = 1.0f-h;
-    
-    _vertices.push_back(osg::Vec2(0.0,0.0));
-
-    unsigned int i = 0;
-    for(; i<=numSteps; ++i)
-    {
-        float angle = float(osg::PI)*0.5f*(float(i)/float(numSteps));
-        _vertices.push_back( osg::Vec2((1.0f-cosf(angle))*width, h + sinf(angle)*r) );
-    }
-
-    // start the second half one into the curve if the width is half way across
-    i = width<0.5f ? 0 : 1;
-    for(; i<=numSteps; ++i)
-    {
-        float angle = float(osg::PI)*0.5f*(float(numSteps-i)/float(numSteps));
-        _vertices.push_back( osg::Vec2(1.0-(1.0f-cosf(angle))*width, h + sin(angle)*r) );
-    }
-
-    _vertices.push_back(osg::Vec2(1.0,0.0));
-
-}
-
-void BevelProfile::print(std::ostream& fout)
-{
-    OSG_NOTICE<<"print bevel"<<std::endl;
-    for(Vertices::iterator itr = _vertices.begin();
-        itr != _vertices.end();
-        ++itr)
-    {
-        OSG_NOTICE<<"  "<<*itr<<std::endl;
-    }
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
-//
 // computeGlyphGeometry
 //
@@ -602 +515 @@
 // computeTextGeometry
 //
-osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry, BevelProfile& profile, float width)
+osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry, const osgText::Bevel& profile, float width)
 {
     osg::Vec3Array* orig_vertices = dynamic_cast<osg::Vec3Array*>(glyphGeometry->getVertexArray());
@@ -699 +612 @@
         unsigned int no_vertices_on_boundary = bevel->size()/2;
 
-        osgText::BevelProfile::Vertices& profileVertices = profile.getVertices();
+        const osgText::Bevel::Vertices& profileVertices = profile.getVertices();
         unsigned int no_vertices_on_bevel = profileVertices.size();
 
@@ -782 +695 @@
 // computeShellGeometry
 //
-osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry, BevelProfile& profile, float width)
+osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry, const osgText::Bevel& profile, float width)
 {
     osg::Vec3Array* orig_vertices = dynamic_cast<osg::Vec3Array*>(glyphGeometry->getVertexArray());
@@ -925 +838 @@
         unsigned int no_vertices_on_boundary = bevel->size()/2;
 
-        osgText::BevelProfile::Vertices& profileVertices = profile.getVertices();
+        const osgText::Bevel::Vertices& profileVertices = profile.getVertices();
         unsigned int no_vertices_on_bevel = profileVertices.size();
 

OpenSceneGraph/trunk/examples/osgtext3D/GlyphGeometry.h

@@ -16 +16 @@
 
 #include <osgText/Font3D>
+#include "TextNode.h"
 
 namespace osgText
 {
 
-class BevelProfile
-{
-    public:
-
-        typedef std::vector<osg::Vec2> Vertices;
-
-        BevelProfile();
-
-        void flatBevel(float width=0.25f);
-
-        void roundedBevel(float width=0.5f, unsigned int numSteps=10);
-
-        void roundedBevel2(float width=0.5f, unsigned int numSteps=10);
-
-        void print(std::ostream& fout);
-
-        Vertices& getVertices() { return _vertices; }
-
-    protected:
-
-        Vertices _vertices;
-};
-
 extern osg::Geometry* computeGlyphGeometry(osgText::Glyph3D* glyph, float bevelThickness, float shellThickness);
 
-extern osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry, BevelProfile& profile, float width);
+extern osg::Geometry* computeTextGeometry(osg::Geometry* glyphGeometry, const Bevel& profile, float width);
 
-extern osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry, BevelProfile& profile, float width);
+extern osg::Geometry* computeShellGeometry(osg::Geometry* glyphGeometry, const Bevel& profile, float width);
 
 }

OpenSceneGraph/trunk/examples/osgtext3D/TextNode.cpp

@@ -29 +29 @@
 Bevel::Bevel()
 {
-    _thickness = 0.1f;
+    _thickness = 0.02f;
     flatBevel();
 }
@@ -192 +192 @@
     if (style)
     {
-        size.y() = characterSize * style->getWidthRatio();
-        size.z() = characterSize * style->getThicknessRatio();
+        size.y() = characterSize;
+        size.z() = characterSize;
     }
 
@@ -243 +243 @@
             if (glyph)
             {
-                technique->addCharacter(pos, size, glyph, style);
-                pos += osg::Vec3(size.x()*(glyph->getHorizontalAdvance()*characterWidthScale), 0.0f ,0.0f);
+                osg::Vec3 local_scale( size );
+                local_scale *= (1.0f/font->getScale());
+
+                technique->addCharacter(pos, local_scale, glyph, style);
+                pos += osg::Vec3(size.x()*(glyph->getHorizontalWidth()/font->getScale()), 0.0f ,0.0f);
             }
         }
@@ -302 +305 @@
     OSG_NOTICE<<"TextTechnique::addCharacter 3D("<<position<<", "<<size<<", "<<glyph<<", "<<style<<")"<<std::endl;
 
-    double scale = size.x() / glyph->getVerticalHeight();
-
     osg::ref_ptr<osg::PositionAttitudeTransform> transform = new osg::PositionAttitudeTransform;
     transform->setPosition(position);
     transform->setAttitude(osg::Quat(osg::inDegrees(90.0),osg::Vec3d(1.0,0.0,0.0)));
-    transform->setScale(osg::Vec3d(scale, scale, scale));
+    transform->setScale(size);
 
     osg::ref_ptr<osg::Geode> geode = new osg::Geode;
 
-    bool outline = false;
-    float thickness = 5;
-    float width = 10;
-    BevelProfile profile;
+    const Bevel* bevel = style ? style->getBevel() : 0;
+    bool outline = style ? style->getOutlineRatio()>0.0f : false;
+    float width = style->getThicknessRatio();
     float creaseAngle = 30.0f;
     bool smooth = true;
 
-    osg::ref_ptr<osg::Geometry> glyphGeometry = osgText::computeGlyphGeometry(glyph, thickness, width);
-    osg::ref_ptr<osg::Geometry> textGeometry = osgText::computeTextGeometry(glyphGeometry.get(), profile, width);
-    osg::ref_ptr<osg::Geometry> shellGeometry = outline ? osgText::computeShellGeometry(glyphGeometry.get(), profile, width) : 0;
-    if (textGeometry.valid()) geode->addDrawable(textGeometry.get());
-    if (shellGeometry.valid()) geode->addDrawable(shellGeometry.get());
-
-    // create the normals
-    if (smooth && textGeometry.valid())
-    {
-        osgUtil::SmoothingVisitor::smooth(*textGeometry, osg::DegreesToRadians(creaseAngle));
+    if (bevel)
+    {
+        float thickness = bevel->getBevelThickness();
+
+        osg::ref_ptr<osg::Geometry> glyphGeometry = osgText::computeGlyphGeometry(glyph, thickness, width);
+        osg::ref_ptr<osg::Geometry> textGeometry = osgText::computeTextGeometry(glyphGeometry.get(), *bevel, width);
+        osg::ref_ptr<osg::Geometry> shellGeometry = outline ? osgText::computeShellGeometry(glyphGeometry.get(), *bevel, width) : 0;
+        if (textGeometry.valid()) geode->addDrawable(textGeometry.get());
+        if (shellGeometry.valid()) geode->addDrawable(shellGeometry.get());
+
+        // create the normals
+        if (smooth && textGeometry.valid())
+        {
+            osgUtil::SmoothingVisitor::smooth(*textGeometry, osg::DegreesToRadians(creaseAngle));
+        }
+    }
+    else
+    {
     }
 

OpenSceneGraph/trunk/examples/osgtext3D/osgtext3D.cpp

@@ -75 +75 @@
     OSG_NOTICE<<"creaseAngle="<<creaseAngle<<std::endl;
 
-    osgText::BevelProfile profile;
+    osgText::Bevel profile;
     float ratio = 0.5;
     while(arguments.read("--rounded",ratio)) { profile.roundedBevel(ratio); }
@@ -170 +170 @@
     osg::ref_ptr<osgText::Style> style = new osgText::Style;
 
-    float thickness = 0.0f;
+    float thickness = 0.1f;
     while(arguments.read("--thickness",thickness)) {}
     style->setThicknessRatio(thickness);
+
+    // set up any bevel if required
+    float r;
+    osg::ref_ptr<osgText::Bevel> bevel;
+    while(arguments.read("--rounded",r)) { bevel = new osgText::Bevel; bevel->roundedBevel2(r); }
+    while(arguments.read("--rounded")) { bevel = new osgText::Bevel; bevel->roundedBevel2(0.25); }
+    while(arguments.read("--flat",r)) { bevel = new osgText::Bevel; bevel->flatBevel(r); }
+    while(arguments.read("--flat")) { bevel = new osgText::Bevel; bevel->flatBevel(0.25); }
+    while(arguments.read("--bevel-thickness",r)) { if (bevel.valid()) bevel->setBevelThickness(r); }
+
+    style->setBevel(bevel);
 
     osgText::TextNode* text = new osgText::TextNode;
@@ -181 +192 @@
     text->update();
 
+    viewer.addEventHandler( new osgGA::StateSetManipulator(viewer.getCamera()->getOrCreateStateSet()) );
+    viewer.addEventHandler(new osgViewer::StatsHandler);
     viewer.setSceneData(text);
 

OpenSceneGraph/trunk/include/osgText/Text3D

@@ -17 +17 @@
 
 #include <osgText/TextBase>
-#include <osgText/Font3D>
-
+#include <osgText/Font>
 
 namespace osgText {
@@ -76 +75 @@
     /** 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)); };
-
-    /** Set the Font to use to render the text.*/
-    void setFont(osg::ref_ptr<Font3D> font);
-
+    void setFont(Font* font);
 
     /** Set the font, loaded from the specified front file, to use to render the text,
@@ -88 +83 @@
 
     /** Get the font. Return 0 if default is being used.*/
-    const Font3D* getFont() const { return _font.get(); }
+    const Font* getFont() const { return _font.get(); }
 
 
@@ -157 +152 @@
     TextRenderInfo _textRenderInfo;
 
-    osg::ref_ptr<Font3D> _font;
+    osg::ref_ptr<Font> _font;
 
     float _characterDepth;

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

@@ -36 +36 @@
         _maxX(-FLT_MAX),
         _minX(FLT_MAX),
-        _minY(FLT_MAX)
+        _minY(FLT_MAX),
+        _coord_scale(1.0/64.0)
     {
     }
@@ -56 +57 @@
     }
 
-    void addVertex(const osg::Vec3& pos)
-    {
+    void addVertex(osg::Vec3 pos)
+    {
+        _previous = pos;
+
+        pos *= _coord_scale;
+
         if (!_verts->empty() && _verts->back()==pos)
         {
@@ -85 +90 @@
     void conicTo(const osg::Vec2& control, const osg::Vec2& pos)
     {
-        osg::Vec3 p0 = _verts->back();
+        osg::Vec3 p0 = _previous;
         osg::Vec3 p1 = osg::Vec3(control.x(),control.y(),0);
         osg::Vec3 p2 = osg::Vec3(pos.x(),pos.y(),0);
@@ -104 +109 @@
     void cubicTo(const osg::Vec2& control1, const osg::Vec2& control2, const osg::Vec2& pos)
     {
-        osg::Vec3 p0 = _verts->back();
+        osg::Vec3 p0 = _previous;
         osg::Vec3 p1 = osg::Vec3(control1.x(),control1.y(),0);
         osg::Vec3 p2 = osg::Vec3(control2.x(),control2.y(),0);
@@ -137 +142 @@
     osg::ref_ptr<osg::Vec3Array>    _verts;
     osg::ref_ptr<osg::Geometry>     _geometry;
+    osg::Vec3                       _previous;
     int                             _idx;
     int                             _numSteps;
@@ -143 +149 @@
     double                          _minX;
     double                          _minY;
+    double                          _coord_scale;
+
 };
 
 
-#define FT_NUM(x) (x/64.0)
 int moveTo( const FT_Vector* to, void* user )
 {
     Char3DInfo* char3d = (Char3DInfo*)user;
-    char3d->moveTo( osg::Vec2(FT_NUM(to->x),FT_NUM(to->y)) );
+    char3d->moveTo( osg::Vec2(to->x,to->y) );
     return 0;
 }
@@ -156 +163 @@
 {
     Char3DInfo* char3d = (Char3DInfo*)user;
-    char3d->lineTo( osg::Vec2(FT_NUM(to->x),FT_NUM(to->y)) );
+    char3d->lineTo( osg::Vec2(to->x,to->y) );
     return 0;
 }
@@ -162 +169 @@
 {
     Char3DInfo* char3d = (Char3DInfo*)user;
-    char3d->conicTo( osg::Vec2(FT_NUM(control->x),FT_NUM(control->y)), osg::Vec2(FT_NUM(to->x),FT_NUM(to->y)) );
+    char3d->conicTo( osg::Vec2(control->x,control->y), osg::Vec2(to->x,to->y) );
     return 0;
 }
@@ -169 +176 @@
     Char3DInfo* char3d = (Char3DInfo*)user;
     char3d->cubicTo(
-        osg::Vec2(FT_NUM(control1->x),FT_NUM(control1->y)),
-        osg::Vec2(FT_NUM(control2->x),FT_NUM(control2->y)),
-        osg::Vec2(FT_NUM(to->x),FT_NUM(to->y)) );
+        osg::Vec2(control1->x,control1->y),
+        osg::Vec2(control2->x,control2->y),
+        osg::Vec2(to->x,to->y) );
     return 0;
 }
-#undef FT_NUM
 
 }
@@ -184 +190 @@
     _face(face),
     _flags(flags),
-    _scale(1.0f)
+    _scale(1.0f),
+    _freetype_scale(1.0f)
 {
     init();
@@ -195 +202 @@
     _face(face),
     _flags(flags),
-    _scale(1.0f)
+    _scale(1.0f),
+    _freetype_scale(1.0f)
 {
     init();
@@ -280 +288 @@
         // double width = (xmax - xmin)/64.0;
 
-        _scale = 1.0/height;
+#if 1
+        _freetype_scale = 1.0f/height;
+        _scale = 1.0f;
+#else
+        _freetype_scale = 1.0f;
+        _scale = 1.0f/height;
+#endif
     }
 }
@@ -408 +422 @@
 
 
-    FT_Glyph_Metrics* metrics = &(glyphslot->metrics);
-
-    glyph->setHorizontalBearing(osg::Vec2((float)metrics->horiBearingX/64.0f,(float)(metrics->horiBearingY-metrics->height)/64.0f)); // bottom left.
-    glyph->setHorizontalAdvance((float)metrics->horiAdvance/64.0f);
-    glyph->setVerticalBearing(osg::Vec2((float)metrics->vertBearingX/64.0f,(float)(metrics->vertBearingY-metrics->height)/64.0f)); // top middle.
-    glyph->setVerticalAdvance((float)metrics->vertAdvance/64.0f);
+    FT_Glyph_Metrics* metrics = &(_face->glyph->metrics);
+
+    float coord_scale = _freetype_scale/64.0f;
+
+    glyph->setHorizontalBearing(osg::Vec2((float)metrics->horiBearingX * coord_scale,(float)(metrics->horiBearingY-metrics->height) * coord_scale)); // bottom left.
+    glyph->setHorizontalAdvance((float)metrics->horiAdvance * coord_scale);
+    glyph->setVerticalBearing(osg::Vec2((float)metrics->vertBearingX * coord_scale,(float)(metrics->vertBearingY-metrics->height) * coord_scale)); // top middle.
+    glyph->setVerticalAdvance((float)metrics->vertAdvance * coord_scale);
 
 //    cout << "      in getGlyph() implementation="<<this<<"  "<<_filename<<"  facade="<<_facade<<endl;
@@ -452 +468 @@
     }
 
+    float coord_scale = _freetype_scale/64.0f;
+
     // ** init FreeType to describe the glyph
     FreeType::Char3DInfo char3d(_facade->getNumberCurveSamples());
+    char3d._coord_scale = coord_scale;
 
     FT_Outline outline = _face->glyph->outline;
@@ -597 +616 @@
     FT_Glyph_Metrics* metrics = &(_face->glyph->metrics);
 
-    glyph3D->setHorizontalBearing(osg::Vec2((float)metrics->horiBearingX/64.0f,(float)(metrics->horiBearingY-metrics->height)/64.0f)); // bottom left.
-    glyph3D->setHorizontalAdvance((float)metrics->horiAdvance/64.0f);
-    glyph3D->setVerticalBearing(osg::Vec2((float)metrics->vertBearingX/64.0f,(float)(metrics->vertBearingY-metrics->height)/64.0f)); // top middle.
-    glyph3D->setVerticalAdvance((float)metrics->vertAdvance/64.0f);
-
-    glyph3D->setWidth((float)metrics->width / 64.0f);
-    glyph3D->setHeight((float)metrics->height / 64.0f);
-
+    glyph3D->setHorizontalBearing(osg::Vec2((float)metrics->horiBearingX * coord_scale,(float)(metrics->horiBearingY-metrics->height) * coord_scale)); // bottom left.
+    glyph3D->setHorizontalAdvance((float)metrics->horiAdvance * coord_scale);
+    glyph3D->setVerticalBearing(osg::Vec2((float)metrics->vertBearingX * coord_scale,(float)(metrics->vertBearingY-metrics->height) * coord_scale)); // top middle.
+    glyph3D->setVerticalAdvance((float)metrics->vertAdvance * coord_scale);
+
+    glyph3D->setWidth((float)metrics->width * coord_scale);
+    glyph3D->setHeight((float)metrics->height * coord_scale);
 
     FT_BBox ftbb;
@@ -614 +632 @@
     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);
+    osg::BoundingBox bb(xmin * coord_scale, ymin * coord_scale, 0.0f, xmax * coord_scale, ymax * coord_scale, 0.0f);
 
     glyph3D->setBoundingBox(bb);

OpenSceneGraph/trunk/src/osgPlugins/freetype/FreeTypeFont.h

@@ -59 +59 @@
     unsigned int            _flags;
     float                   _scale;
+    float                   _freetype_scale;
 };
 

OpenSceneGraph/trunk/src/osgText/Font.cpp

@@ -343 +343 @@
 Glyph* Font::getGlyph(const FontResolution& fontRes, unsigned int charcode)
 {
+    OSG_NOTICE<<"Font::getGlyph("<<charcode<<")"<<std::endl;
+
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_glyphMapMutex);
@@ -365 +367 @@
 Glyph3D* Font::getGlyph3D(unsigned int charcode)
 {
+    OSG_NOTICE<<"Font::getGlyph3D("<<charcode<<")"<<std::endl;
+
     {
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_glyphMapMutex);

OpenSceneGraph/trunk/src/osgText/Text3D.cpp

@@ -103 +103 @@
 }
 
-void Text3D::setFont(osg::ref_ptr<Font3D> font)
+void Text3D::setFont(Font* font)
 {
     _font = font;
@@ -112 +112 @@
 void Text3D::setFont(const std::string & fontfile)
 {
-    setFont(readRefFont3DFile(fontfile));
+    setFont(readRefFontFile(fontfile));
 }
 

OpenSceneGraph/trunk/src/osgWrappers/serializers/osgText/Text3D.cpp

@@ -12 +12 @@
 {
     std::string fontName; is.readWrappedString( fontName );
-    text.setFont( osgText::readFont3DFile(fontName) );
+    text.setFont( osgText::readFontFile(fontName) );
     return true;
 }