Changeset 11172

Timestamp:

03/05/10 16:46:17 (3 years ago)

Author:

robert

Message:

From Mathias Froehlich, "If you want to have that qfont plugin loader, this is the updated
implementation which uses osgQt and includes the changes to make fonts load
without a file on disk."

Location:

OpenSceneGraph/trunk/src

Files:

• osgPlugins/CMakeLists.txt (modified) (1 diff)
• osgPlugins/qfont (added)
• osgPlugins/qfont/CMakeLists.txt (added)
• osgPlugins/qfont/ReaderQFont.cpp (added)
• osgText/Font.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgPlugins/CMakeLists.txt

@@ -222 +222 @@
 ENDIF()
 
+IF (QT4_FOUND)
+    ADD_SUBDIRECTORY(qfont)
+ENDIF()
+
 IF(ZLIB_FOUND)
     ADD_SUBDIRECTORY(zip)

OpenSceneGraph/trunk/src/osgText/Font.cpp

@@ -84 +84 @@
 
     // Not found, return empty string
-    osg::notify(osg::WARN)<<"Warning: font file \""<<str<<"\" not found."<<std::endl;    
+    osg::notify(osg::INFO)<<"Warning: font file \""<<str<<"\" not found."<<std::endl;    
     return std::string();
 }
@@ -90 +90 @@
 osgText::Font* osgText::readFontFile(const std::string& filename, const osgDB::ReaderWriter::Options* userOptions)
 {
-    if (filename=="") return 0;
+    if (filename.empty()) return 0;
 
     std::string foundFile = findFontFile(filename);
-    if (foundFile.empty()) return 0;
+    if (foundFile.empty())
+        foundFile = filename;
     
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_FontFileMutex);
@@ -150 +151 @@
 osg::ref_ptr<Font> osgText::readRefFontFile(const std::string& filename, const osgDB::ReaderWriter::Options* userOptions)
 {
-    if (filename=="") return 0;
+    if (filename.empty()) return 0;
 
     std::string foundFile = findFontFile(filename);
-    if (foundFile.empty()) return 0;
+    if (foundFile.empty())
+        foundFile = filename;
     
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_FontFileMutex);
@@ -253 +255 @@
 {
     if (_implementation.valid()) return _implementation->getFileName();
-    return "";
+    return std::string();
 }