Changeset 1039 for branches/Carsten_PtrWork2/Source/System/Statistics/Foregrounds/OSGStatisticsDefaultFont.cpp

Timestamp:

01/16/08 16:07:40 (1 year ago)

Author:

cneumann

Message:

changed: - factory functions return a TransitPtr? that can not be implicitly

converted to C Ptr. Should help with porting.

added: - GlobalRefPtr?, needed for cases where upon return from main

a RefPtr? goes out of scope (it would attempt to access the
FCFactory which is already shutdown at that point).

status: - vrml loader does not compile (needs porting to ref ptr)

• tutorials compile, run and exit cleanly
  
• multithreading and cluster are untested, yet
  

Files:

• branches/Carsten_PtrWork2/Source/System/Statistics/Foregrounds/OSGStatisticsDefaultFont.cpp (modified) (3 diffs)

branches/Carsten_PtrWork2/Source/System/Statistics/Foregrounds/OSGStatisticsDefaultFont.cpp

@@ -616 +616 @@
-    _texObjChunk->setMinFilter(GL_NEAREST);
-    _texObjChunk->setMagFilter(GL_NEAREST);
+    
+    addPreFactoryExitFunction(&releaseTextFace);
-}
-
@@ -624 +626 @@
-StatisticsDefaultFontBase::~StatisticsDefaultFontBase()
-{
-    if (_texObjChunk != NullFC)
-        subRef(_texObjChunk);
-    if (_face != 0)
-    {
@@ -633 +633 @@
-}
-
+bool
+StatisticsDefaultFontBase::releaseTextFace(void)
+{
+    FDEBUG(("StatisticsDefaultFontBase::releaseTextFace:\n"));
+    
+    StatisticsDefaultFont::the()->_texObjChunk.dump();
+
+    OSG::subRef(StatisticsDefaultFont::the()->_face);
+    StatisticsDefaultFont::the()->_face = 0;
+
+    return true;
+}
+
-
-OSG_END_NAMESPACE