Changeset 859

Timestamp:

01/25/08 20:19:39

Author:

robert

Message:

Added support for --output-task-directories (also can use --otd) when generating vpbmaster builds.

Files:

• trunk/include/vpb/BuildOptions (modified) (2 diffs)
• trunk/include/vpb/DataSet (modified) (3 diffs)
• trunk/include/vpb/Destination (modified) (1 diff)
• trunk/src/vpb/BuildOptions.cpp (modified) (2 diffs)
• trunk/src/vpb/BuildOptionsIO.cpp (modified) (1 diff)
• trunk/src/vpb/Commandline.cpp (modified) (1 diff)
• trunk/src/vpb/DataSet.cpp (modified) (10 diffs)
• trunk/src/vpb/Destination.cpp (modified) (2 diffs)

trunk/include/vpb/BuildOptions

@@ -52 +52 @@
-        void setDirectory(const std::string& directory);
-        const std::string& getDirectory() const { return _directory; }
+
+        void setOutputTaskDirectories(bool flag) { _outputTaskDirectories = flag; }
+        bool getOutputTaskDirectories() const { return _outputTaskDirectories; }
-
-        void setDestinationTileBaseName(const std::string& basename) { _tileBasename = basename; }
@@ -278 +281 @@
-        std::string                                 _destinationCoordinateSystemString;
-        std::string                                 _directory;
+        bool                                        _outputTaskDirectories;
-        std::string                                 _imageExtension;
-        std::string                                 _intermediateBuildName;

trunk/include/vpb/DataSet

@@ -191 +191 @@
-        void setShapeFilePlacer(ObjectPlacer* placer) { _shapeFilePlacer = placer; }
-        ObjectPlacer* getShapeFilePlacer() { return _shapeFilePlacer.get(); }
+        
+        
+        std::string getTaskName(unsigned int level, unsigned int X, unsigned int Y) const;
+        std::string getSubtileName(unsigned int level, unsigned int X, unsigned int Y) const;
-
-    protected:
@@ -205 +209 @@
-        void _writeRow(Row& row);
-        void _buildDestination(bool writeToDisk);
+        int _run();
-        
-        void init();
@@ -246 +251 @@
-        bool                                        _newDestinationGraph;
-        
+        std::string                                 _taskOutputDirectory;
+        
-};
-

trunk/include/vpb/Destination

@@ -276 +276 @@
-    bool areSubTilesComplete();
-    std::string getSubTileName();
+    std::string getExternalSubTileName();
-    osg::Node* createPagedLODScene();
-    osg::Node* createSubTileScene();

trunk/src/vpb/BuildOptions.cpp

@@ -37 +37 @@
-    _destinationCoordinateSystem->setEllipsoidModel(new osg::EllipsoidModel);
-    _directory = "";
+    _outputTaskDirectories = false;
-    _geometryType = POLYGONAL;
-    _imageExtension = ".dds";
@@ -106 +107 @@
-    _destinationCoordinateSystem = rhs._destinationCoordinateSystem;
-    _directory = rhs._directory;
+    _outputTaskDirectories = rhs._outputTaskDirectories;
-    _extents = rhs._extents;
-    _geometryType = rhs._geometryType;

trunk/src/vpb/BuildOptionsIO.cpp

@@ -151 +151 @@
-
-        ADD_STRING_PROPERTY(Directory);
+        ADD_BOOL_PROPERTY(OutputTaskDirectories);
-        ADD_STRING_PROPERTY(DestinationTileBaseName);
-        ADD_STRING_PROPERTY(DestinationTileExtension);

trunk/src/vpb/Commandline.cpp

@@ -656 +656 @@
-    while (arguments.read("-l",numLevels)) { buildOptions->setMaximumNumOfLevels(numLevels); }
-
+    while (arguments.read("--otd") || 
+           arguments.read("--output-task-directories") ||
+           arguments.read("--subtile-directories"))
+    {
+        buildOptions->setOutputTaskDirectories(true);
+    }
+
+
-    float verticalScale;
-    while (arguments.read("-v",verticalScale))

trunk/src/vpb/DataSet.cpp

@@ -147 +147 @@
-    double destination_yRange = _destinationExtents.yMax()-_destinationExtents.yMin();
-
-pow(2.0, double(level-1
-pow(2.0, double(level-1
-
-
-
+int(pow(2.0, double(level-1)
+int(pow(2.0, double(level-1)
+
+ = int
+ = int
-
-    // note i_max and j_max are one beyond the extents required so that the below for loop can use <
-    // and the clamping to the 0..Ck-1 and 0..Rk-1 extents will work fine.
-
-
+ = int
+ = int
-
-    // clamp j range to 0 to Ck range
@@ -203 +203 @@
-    double tileSize = source->getType()==Source::IMAGE ? _maximumTileImageSize-2 : _maximumTileTerrainSize-1;
-
-
-
+ = int
+ = int
-    level = std::max(k_cols, k_rows);
-    level = std::min(level, int(source->getMaxLevel()));
@@ -301 +301 @@
-        double destination_yRange = _destinationExtents.yMax()-_destinationExtents.yMin();
-
-pow(2.0, double(currentLevel-1
-pow(2.0, double(currentLevel-1
+int(pow(2.0, double(currentLevel-1)
+int(pow(2.0, double(currentLevel-1)
-        
-        extents.xMin() = _destinationExtents.xMin() + (double(currentX)/double(Ck)) * destination_xRange;
@@ -1665 +1665 @@
-                {
-                    osg::ref_ptr<osg::Node> node = parent->createSubTileScene();
-d
+taskOutputD
-                    if (node.valid())
-                    {
@@ -1692 +1692 @@
-            osg::ref_ptr<osg::Node> node = cd->createPagedLODScene();
-            
+            std::string filename;
-            if (cd->_level==0)
-            {
+                filename = getDirectory() + _tileBasename + _tileExtension;    
+
-                if (_decorateWithCoordinateSystemNode)
-                {
@@ -1709 +1712 @@
-                }
-            }
-
-
+
+
+
+
-
-            if (node.valid())
@@ -2418 +2423 @@
-}
-
+std::string DataSet::getTaskName(unsigned int level, unsigned int X, unsigned int Y) const
+{
+    if (level==0 && X==0 && Y==0)
+    {
+        std::ostringstream taskfile;
+        taskfile<<_tileBasename<<"_root_L0_X0_Y0";
+        return taskfile.str();
+    }
+    else
+    {
+        std::ostringstream taskfile;
+        taskfile<<_tileBasename<<"_subtile_L"<<level<<"_X"<<X<<"_Y"<<Y;
+        return taskfile.str();
+    }
+}
+
+std::string DataSet::getSubtileName(unsigned int level, unsigned int X, unsigned int Y) const
+{
+    std::ostringstream os;
+    os << _tileBasename << "_L"<<level<<"_X"<<X<<"_Y"<<Y<<"_subtile"<<getDestinationTileExtension();
+    return os.str();
+}
-
-bool DataSet::generateTasks_new(TaskManager* taskManager)
@@ -2427 +2454 @@
-    if (!prepareForDestinationGraphCreation()) return false;
-
-    log(osg::NOTICE,"OK, OK I now need something to do...");
-    
-    selectAppropriateSplitLevels();
-    
@@ -2683 +2708 @@
-        pushOperationLog(getBuildLog());
-    }
+
+    int result = _run();
+    
+    if (getBuildLog())
+    {
+        popOperationLog();
+    }
+
+    
+    return result;
+}
+
+int DataSet::_run()
+{
-    
-    bool requiresGraphicsContextInMainThread = true;
@@ -2751 +2790 @@
-            }
-        }
+        
+        if (getOutputTaskDirectories())
+        {
+            _taskOutputDirectory = getDirectory() + getTaskName(getSubtileLevel(), getSubtileX(), getSubtileY());
+            log(osg::NOTICE,"Need to create output task directory = %s", _taskOutputDirectory.c_str());
+            int result = 0;
+            osgDB::FileType type = osgDB::fileType(_taskOutputDirectory);
+            if (type==osgDB::DIRECTORY)
+            {
+                log(osg::NOTICE,"   Directory already created");
+            } 
+            else if (type==osgDB::REGULAR_FILE)
+            {
+                log(osg::NOTICE,"   Error cannot create directory as a conventional file already exists with that name");
+                result = 1;
+            }
+            else // FILE_NOT_FOUND
+            {
+                // need to create directory.
+                result = mkdir(_taskOutputDirectory.c_str(), S_IRWXU | S_IRWXG | S_IRWXO);
+            }
+            
+            if (result)
+            {
+                log(osg::NOTICE,"Error: could not create directory %i",errno);
+                return 1;
+            }
+            
+#ifdef WIN32    
+            _taskOutputDirectory.push_back('\\');
+#else
+            _taskOutputDirectory.push_back('/');
+#endif
+        
+            if (getGenerateSubtile()) log(osg::NOTICE,"We are a subtile");
+            if (getRecordSubtileFileNamesOnLeafTile()) log(osg::NOTICE,"We have to record ../task/name");
+        }
+        else
+        {
+            _taskOutputDirectory = getDirectory();
+        }
+        
+        log(osg::NOTICE,"Task output directory = %s", _taskOutputDirectory.c_str());
-
-        writeDestination();
-    }
-
-
-
-
-
-
-
-
+
+

trunk/src/vpb/Destination.cpp

@@ -2709 +2709 @@
-std::string CompositeDestination::getSubTileName()
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-osg::Node* CompositeDestination::createPagedLODScene()
@@ -2822 +2851 @@
-    pagedLOD->setRange(0,cutOffDistance,farDistance);
-    
-
+External
-    pagedLOD->setRange(1,0,cutOffDistance);
-