Changeset 934

Timestamp:

09/05/08 18:11:19

Author:

robert

Message:

Added support for outputing image files when generated --terrain databases

Files:

• trunk/include/vpb/DataSet (modified) (1 diff)
• trunk/src/vpb/DataSet.cpp (modified) (7 diffs)

trunk/include/vpb/DataSet

@@ -178 +178 @@
-        void _writeNodeFile(const osg::Node& node,const std::string& filename);
-        void _writeImageFile(const osg::Image& image,const std::string& filename);
-
+
+
-        void setState(osg::State* state) { _state = state; }
-        osg::State* getState() { return _state.get(); }

trunk/src/vpb/DataSet.cpp

@@ -1499 +1499 @@
-}
-
-
-class WriteImageFilesVisitor : public osg::NodeVisitor
-{
@@ -1530 +1529 @@
-    }
-
+
+    void writeLayer(osgTerrain::Layer* layer)
+    {
+        if (!layer) return;
+        
+        osgTerrain::ImageLayer* imageLayer = dynamic_cast<osgTerrain::ImageLayer*>(layer);
+        if (imageLayer)
+        {
+            osg::Image* image = imageLayer->getImage();
+            if (image)
+            {
+                osg::notify(osg::NOTICE)<<"Writing out image layer "<<image->getFileName()<<std::endl;
+                _dataSet->_writeImageFile(*image,(_dataSet->getDirectory()+image->getFileName()).c_str());
+            }
+            return;   
+        }
+        
+        osgTerrain::SwitchLayer* switchLayer = dynamic_cast<osgTerrain::SwitchLayer*>(layer);
+        if (switchLayer)
+        {
+            for(unsigned int i=0; i<switchLayer->getNumLayers(); ++i)
+            {
+                osg::notify(osg::NOTICE)<<"Writing out switch layer child: "<<switchLayer->getSetName(i)<<", "<<switchLayer->getFileName(i)<<std::endl;
+                writeLayer(switchLayer->getLayer(i));
+            }
+            return;
+        }
+
+        osgTerrain::CompositeLayer* compositeLayer = dynamic_cast<osgTerrain::CompositeLayer*>(layer);
+        if (compositeLayer)
+        {
+            for(unsigned int i=0; i<compositeLayer->getNumLayers(); ++i)
+            {
+                osg::notify(osg::NOTICE)<<"Writing out composite layer child: "<<compositeLayer->getFileName(i)<<std::endl;
+                writeLayer(compositeLayer->getLayer(i));
+            }
+            return;
+        }
+    }
+
-    void applyTerrain(osgTerrain::TerrainTile& terrainTile)
-    {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -1565 +1612 @@
-};
-
+void DataSet::_writeNodeFileAndImages(const osg::Node& node,const std::string& filename)
+{
+    if (getDisableWrites()) return;
+
+    if (getDestinationTileExtension()==".osg")
+    {
+        WriteImageFilesVisitor wifv(this);
+        const_cast<osg::Node&>(node).accept(wifv);
+    }
+
+    _writeNodeFile(node,filename);
+}
+
+
+
-class WriteOperation : public BuildOperation
-{
@@ -1584 +1646 @@
-                if (_buildLog.valid()) _buildLog->log(osg::NOTICE, "   writeSubTile filename= %s",_filename.c_str());
-                
-
-
-
-
-
-
-
+
-
-                _cd->setSubTilesGenerated(true);
@@ -1634 +1690 @@
-                    {
-                        log(osg::NOTICE, "   writeSubTile filename= %s",filename.c_str());
-
-
-
-
-
-
-
+
+
-
-                        parent->setSubTilesGenerated(true);
@@ -1685 +1736 @@
-            {
-                log(osg::NOTICE, "   writeNodeFile = %u X=%u Y=%u filename=%s",cd->_level,cd->_tileX,cd->_tileY,filename.c_str());
-
-
-
-
-
-
-
+
-            }
-            else
@@ -1821 +1866 @@
-            if (writeToDisk)
-            {
-
-
-
-
-
-
+
-            }
-        }