Changeset 252 for experimental

Timestamp:

Feb 21, 2011, 6:35:43 PM (14 years ago)

Author:

Torben Dannhauer

Message:

Pseudoloader works!

Next step: learn how to perform mdifications in the pseudoloader.

Location:

experimental/TerrainTest

Files:

• ModificationVisitor.cpp (modified) (3 diffs)
• ModificationVisitor.h (modified) (1 diff)
• ReaderWriterTerrainMod.cpp (modified) (1 diff)

experimental/TerrainTest/ModificationVisitor.cpp

@@ -1 +1 @@
 #include "ModificationVisitor.h"
 
-ModificationVisitor::ModificationVisitor()
+ModificationVisitor::ModificationVisitor(std::string extensionToSet) : _extensionToSet(extensionToSet)
 {
         setTraversalMode( osg::NodeVisitor::TRAVERSE_ALL_CHILDREN );
@@ -8 +8 @@
 void ModificationVisitor::apply( osg::Node& node )
 {
-        OSG_NOTIFY( osg::ALWAYS ) << "ModVisitor: Node found" << std::endl;
+        //OSG_NOTIFY( osg::ALWAYS ) << "ModVisitor: Node found: " << node.className() << std::endl;
         traverse( node );
 }
@@ -14 +14 @@
 void ModificationVisitor::apply( osg::PagedLOD& pNode )
 {
-        OSG_NOTIFY( osg::ALWAYS ) << "ModVisitor: pagedLOD found" << std::endl;
+        //OSG_NOTIFY( osg::ALWAYS ) << "ModVisitor: pagedLOD found: " << pNode.className() << std::endl;
+
+        for( unsigned int i=0;i<pNode.getNumFileNames();i++)
+        {
+                //OSG_NOTIFY( osg::ALWAYS ) << "ModVisitor: pagedLOD Child #" << i << std::endl;
+                if(pNode.getFileName(i)!="")
+                {
+                        //OSG_NOTIFY( osg::ALWAYS ) << "ModVisitor: pagedLOD Child Name pre: " << pNode.getFileName(i) << std::endl;
+                        pNode.setFileName(i, pNode.getFileName(i)+_extensionToSet );
+                        //OSG_NOTIFY( osg::ALWAYS ) << "ModVisitor: pagedLOD Child Name post: " << newFileName << std::endl;
+                }
+        }
+
         traverse( pNode );
 }

experimental/TerrainTest/ModificationVisitor.h

@@ -8 +8 @@
 {
 public:
-        ModificationVisitor();
+        ModificationVisitor(std::string extensionToSet);
         virtual void apply( osg::Node& node );
         virtual void apply( osg::PagedLOD& pNode );
+
+private:
+        std::string _extensionToSet;
 };

experimental/TerrainTest/ReaderWriterTerrainMod.cpp

@@ -4 +4 @@
 {
         supportsExtension( "terrainmod", "Terrain modification pseudo loader");
+
+        std::string extensionToAdd = ".terrainmod";
 }
-
-//ReaderWriterTerrainMod::~ReaderWriterTerrainMod()
-//{
-//}
 
 ReaderWriterTerrainMod::ReadResult ReaderWriterTerrainMod::readNode( const std::string& file, const osgDB::ReaderWriter::Options* options) const
 {
+        // Check if its a valid file for this pseudo loader
         std::string ext = osgDB::getLowerCaseFileExtension( file );
         if( !acceptsExtension(ext) )
                 return ReadResult::FILE_NOT_HANDLED;
 
-        std::string fileName = osgDB::findDataFile( file, options );
+        // Strip the pseudo-loader extension
+    std::string realName = osgDB::getNameLessExtension( file );
+
+        // check if stripped file exists
+        std::string fileName = osgDB::findDataFile( realName, options );
         if( fileName.empty() )
                 return ReadResult::FILE_NOT_FOUND;
 
-        // Strip the pseudo-loader extension
-    std::string realName = osgDB::getNameLessExtension( fileName );
-
         // Load real file
-        osg::Node *node = osgDB::readNodeFile( realName, options );
+        osg::Node *node = osgDB::readNodeFile( fileName, options );
     if( !node )
     {
         // propagate the read failure upwards
-        OSG_WARN << "Subfile \"" << realName << "\" could not be loaded" << std::endl;
+        OSG_WARN << "Subfile \"" << fileName << "\" could not be loaded" << std::endl;
         return ReadResult::FILE_NOT_HANDLED;
     }
 
-        // Modify Node
-        OSG_NOTIFY( osg::ALWAYS ) << "Doing modification in pseudoloader!" << std::endl;
-
         // Traverse through loaded graph, check for PagedLOD and modify all filenames of external references
-        ModificationVisitor modVisitor;
+        ModificationVisitor modVisitor(extensionToAdd);
         node->accept( modVisitor );
-
-        std::string extensionToAdd = ".terrainmod";
-
 
         return node;
 }
 
-
 // Add ourself to the Registry to instantiate the reader/writer.
 REGISTER_OSGPLUGIN(terrainmod, ReaderWriterTerrainMod)