Changeset 11037

Timestamp:

02/02/10 12:16:10 (3 years ago)

Author:

robert

Message:

From Ryan Kawicki, added removal of TXPArchive from ReaderWriterTXP when the TXPNode destructs to fix memory consumption issue relating to leaving unused archives in memory.

Location:

OpenSceneGraph/trunk/src/osgPlugins/txp

Files:

• ReaderWriterTXP.cpp (modified) (1 diff)
• ReaderWriterTXP.h (modified) (1 diff)
• TXPNode.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.cpp

@@ -625 +625 @@
 }
 
+bool ReaderWriterTXP::removeArchive( int id )
+{
+    osg::notify(osg::INFO)<<"ReaderWriterTXP::removeArchive(id="<<id<<")"<<std::endl;
+    return (_archives.erase(id) >= 1);
+}
+
 class SeamFinder: public osg::NodeVisitor
 {

OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.h

@@ -74 +74 @@
         return const_cast<ReaderWriterTXP*>(this)->local_readNode(file, options);
     }
+
+    bool removeArchive( int id );
     
 protected:

OpenSceneGraph/trunk/src/osgPlugins/txp/TXPNode.cpp

@@ -5 +5 @@
 #include <osg/MatrixTransform>
 #include <osgUtil/CullVisitor>
+#include <osgDB/Registry>
+#include <osgDB/ReaderWriter>
 
 #include <iostream>
@@ -14 +16 @@
 #include "TXPNode.h"
 #include "TXPPagedLOD.h"
-
+#include "ReaderWriterTXP.h"
 
 
@@ -79 +81 @@
 TXPNode::~TXPNode()
 {
+   if (_archive.get())
+   {
+      if (osgDB::ReaderWriter * rw =
+          osgDB::Registry::instance()->getReaderWriterForExtension("txp"))
+      {
+         if (ReaderWriterTXP * rwTXP =
+             dynamic_cast< ReaderWriterTXP * >(rw))
+         {
+            const int id = _archive->getId();
+            if (!rwTXP->removeArchive(id))
+            {
+               TXPNodeERROR("Failed to remove archive ") << id << std::endl;
+            }
+         }
+      }
+   }
 }