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

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