Changeset 874

Timestamp:

01/29/08 21:31:19

Author:

robert

Message:

Changed the defaults to use the pathways for creating task sets and destination graph

Files:

• trunk/src/vpb/BuildOptions.cpp (modified) (1 diff)
• trunk/src/vpb/DataSet.cpp (modified) (13 diffs)

trunk/src/vpb/BuildOptions.cpp

@@ -31 +31 @@
-    _decorateWithMultiTextureControl = true;
-    _defaultColor.set(0.5f,0.5f,1.0f,1.0f);
-fals
-fals
+tru
+tru
-    _destinationCoordinateSystemString = "";
-    _destinationCoordinateSystem = new osg::CoordinateSystemNode; 
-    _destinationCoordinateSystem->setEllipsoidModel(new osg::EllipsoidModel);
-    _directory = "";
-fals
+tru
-    _geometryType = POLYGONAL;
-    _imageExtension = ".dds";

trunk/src/vpb/DataSet.cpp

@@ -422 +422 @@
-    
-    _newDestinationGraph = true;
-
-
-
-
-
+
+
+
+
-    for(CompositeSource::source_iterator itr(_sourceGraph.get());itr.valid();++itr)
-    {
@@ -462 +461 @@
-        if (source->getType()!=Source::IMAGE && source->getType()!=Source::HEIGHT_FIELD)
-        {
-            // place models and shapefiles into a separate temporary source list and then process these after
-            // the main handling of terrain/imagery sources.
-            modelSources.push_back(source);
-            
-            continue;
-            
-        }
-        
@@ -473 +467 @@
-        if (!computeOptimumLevel(source, maxNumLevels-1, k)) continue;
-        
+
+        if (k>highestLevelFound) highestLevelFound = k;
+
-        // log(osg::NOTICE,"     opt level = %i",k);
-
@@ -522 +519 @@
-                            cd = createDestinationTile(l,i,j);
-                        }
-#if 0                        
-                        if (!cd) continue;
-                        
-                        for(CompositeDestination::TileList::iterator titr = cd->_tiles.begin();
-                            titr != cd->_tiles.end();
-                            ++titr)
-                        {
-                            DestinationTile* tile = titr->get();
-                            tile->_sources.push_back(source);
-                        }
-#endif
-                    }
-                }
@@ -539 +525 @@
-    }
-    
-
+
-    for(QuadMap::iterator qitr = _quadMap.begin();
-        qitr != _quadMap.end();
@@ -623 +609 @@
-    }
-
+    // now insert the sources into the destination graph
-    for(CompositeSource::source_iterator itr(_sourceGraph.get());itr.valid();++itr)
-    {
@@ -659 +646 @@
-        
-        int level = 0;
-        
-        if (source->getType()!=Source::IMAGE && source->getType()!=Source::HEIGHT_FIELD)
-        {
-            // place models and shapefiles into a separate temporary source list and then process these after
-            // the main handling of terrain/imagery sources.
-            modelSources.push_back(source);
-            
-            continue;
-            
-        }
-        
-        int k = 0;
-
+
+
+
+
+
+
+
+
+
+
-        
-        // log(osg::NOTICE,"     opt level = %i",k);
@@ -741 +726 @@
-    }
-
-
-    for(SourceList::iterator ml_itr = modelSources.begin();
-        ml_itr != modelSources.end();
-        ++ml_itr)
-    {
-        Source* source = (*ml_itr).get();
-        SourceData* sd = (*ml_itr)->getSourceData();
-
-        const SpatialProperties& sp = sd->computeSpatialProperties(cs);
-        double source_xRange = sp._extents.xMax()-sp._extents.xMin();
-        double source_yRange = sp._extents.yMax()-sp._extents.yMin();
-
-
-        log(osg::NOTICE,"Need to handle shapefile/model source %s.",source->getFileName().c_str());
-    }
-    
-    osg::Timer_t before_computeMax = osg::Timer::instance()->tick();
-
@@ -1167 +1136 @@
-
-    // then create the destination graph accordingly.
-
-
-
-
-
-
-
-
-
+
-    {
-        _destinationGraph = createDestinationGraph(0,
@@ -1186 +1147 @@
-                                                   0,
-                                                   numLevels);
+    }
+    else
+    {
+        // new default scheme.
+        createNewDestinationGraph(_intermediateCoordinateSystem.get(),
+                                  _destinationExtents,
+                                  _maximumTileImageSize,
+                                  _maximumTileTerrainSize,
+                                  numLevels);
-    }
-                                                               
@@ -1700 +1670 @@
-                filename = getDirectory() + _tileBasename + _tileExtension;    
-
+                if (_decorateWithMultiTextureControl)
+                {
+                    node = decorateWithMultiTextureControl(node.get());
+                }
+
-                if (_decorateWithCoordinateSystemNode)
-                {
-                    node = decorateWithCoordinateSystemNode(node.get());
-                }
-
-                if (_decorateWithMultiTextureControl)
-                {
-                    node = decorateWithMultiTextureControl(node.get());
-                }
-
@@ -1841 +1811 @@
-            _rootNode = _destinationGraph->createScene();
-
+            if (_decorateWithMultiTextureControl)
+            {
+                _rootNode = decorateWithMultiTextureControl(_rootNode.get());
+            }
+
-            if (_decorateWithCoordinateSystemNode)
-            {
-                _rootNode = decorateWithCoordinateSystemNode(_rootNode.get());
-            }
-
-            if (_decorateWithMultiTextureControl)
-            {
-                _rootNode = decorateWithMultiTextureControl(_rootNode.get());
-            }
-
@@ -2333 +2303 @@
-
-    bool result = false;
-
+
+
+
+
+
-    {
-        result = generateTasks_new(taskManager);
-    }
-    else
-    {
-        result = generateTasks_old(taskManager);
-    }
-