Changeset 9881 for OpenSceneGraph/trunk/src/osgText/Text3D.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/osgText/Text3D.cpp (modified) (47 diffs)

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