Changeset 930

Timestamp:

09/02/08 14:56:18

Author:

robert

Message:

Added setting of Source's new SetName? field from osgTerrain::Layer'sSetName

Files:

• trunk/include/vpb/Destination (modified) (4 diffs)
• trunk/include/vpb/Source (modified) (2 diffs)
• trunk/src/vpb/DataSet.cpp (modified) (5 diffs)
• trunk/src/vpb/Destination.cpp (modified) (17 diffs)

trunk/include/vpb/Destination

@@ -111 +111 @@
-    void setMaximumImagerySize(unsigned int maxNumColumns,unsigned int maxNumRows)
-    {
-ry
-ry
+
+
-    }
-
@@ -180 +180 @@
-    {
-        ImageData():
-ry
-ry
-
-
-ry
-ry
-
-ry
+
+
+
+
+
+
+
+Destination
-    };
-
+    struct ImageSet
+    {
+        ImageSet():
+            _optional(false),
+            _image_maxSourceResolutionX(0.0f),
+            _image_maxSourceResolutionY(0.0f) {}
+
+        typedef std::map<std::string, ImageData> LayerSetImageDataMap;
+        LayerSetImageDataMap                    _layerSetImageDataMap;
+        
+        bool                                    _optional;
+
+        float                                   _image_maxSourceResolutionX;
+        float                                   _image_maxSourceResolutionY;
+    };
+
-    std::vector<ImageData>                      _imagery;
+    std::vector<ImageSet>                       _imagerySet;
-
-    inline ImageData& getImageData(unsigned int layer)
@@ -198 +215 @@
-    }
-
+    inline ImageSet& getImageSet(unsigned int layer)
+    {
+        if (layer>=_imagerySet.size()) _imagerySet.resize(layer+1);
+        return _imagerySet[layer];
+    }
+
-    osg::ref_ptr<DestinationData>               _terrain;
-    osg::ref_ptr<DestinationData>               _models;
@@ -207 +230 @@
-    unsigned int                                _maxSourceLevel;
-
-ry
-ry
+
+
-
-    unsigned int                                _terrain_maxNumColumns;

trunk/include/vpb/Source

@@ -83 +83 @@
-    Type getType() const { return _type; }
-
+    void setSetName(const std::string& setname) { _setname = setname; }
+    const std::string& getSetName() const { return _setname; }
+
-    void setFileName(const std::string& filename) { _filename = filename; }
-    const std::string& getFileName() const { return _filename; }
@@ -210 +213 @@
-    double                                      _sortValue;
-
+    std::string                                 _setname;
-    std::string                                 _filename;
-    bool                                        _temporaryFile;

trunk/src/vpb/DataSet.cpp

@@ -806 +806 @@
-            if (tile->computeImageResolution(layerNum,texture_numColumns,texture_numRows,texture_dx,texture_dy))
-            {
-ry
-ry
+
+
-            }
-        }
@@ -1993 +1993 @@
-        // need to read locator.
-        vpb::Source* source = new vpb::Source(type, hfl->getFileName());
+        source->setSetName(hfl->getSetName());
-        source->setLayer(layerNum);
-        source->setMinLevel(layer->getMinLevel());
@@ -2019 +2020 @@
-        // need to read locator
-        vpb::Source* source = new vpb::Source(type, iml->getFileName());
+        source->setSetName(iml->getSetName());
-        source->setLayer(layerNum);
-        source->setMinLevel(layer->getMinLevel());
@@ -2047 +2049 @@
-
-        vpb::Source* source = new vpb::Source(type, pl->getFileName());
+        source->setSetName(pl->getSetName());
-        source->setLayer(layerNum);
-        source->setMinLevel(layer->getMinLevel());
@@ -2080 +2083 @@
-            {
-                vpb::Source* source = new vpb::Source(type, compositeLayer->getFileName(i));
+                source->setSetName(compositeLayer->getSetName(i));
-                source->setMinLevel(layer->getMinLevel());
-                source->setMaxLevel(layer->getMaxLevel());

trunk/src/vpb/Destination.cpp

@@ -82 +82 @@
-    _pixelFormat(GL_RGB),
-    _maxSourceLevel(0),
-ry
-ry
+
+
-    _terrain_maxNumColumns(1024),
-    _terrain_maxNumRows(1024),
@@ -142 +142 @@
-                {
-                    ImageData& imageData = getImageData(source->getLayer());
-ry_maxSourceResolutionX==0.0f) imageData._imagery
-ry_maxSourceResolutionX=osg::minimum(imageData._imagery
-ry_maxSourceResolutionY==0.0f) imageData._imagery
-ry_maxSourceResolutionY=osg::minimum(imageData._imagery
+_maxSourceResolutionX==0.0f) imageData._image
+_maxSourceResolutionX=osg::minimum(imageData._image
+_maxSourceResolutionY==0.0f) imageData._image
+_maxSourceResolutionY=osg::minimum(imageData._image
-                    break;
-                }
@@ -183 +183 @@
-{
-    ImageData& imageData = getImageData(layer);
-ry_maxSourceResolutionX!=0.0f && imageData._imagery
-ry_maxNumColumns!=0 && _imagery
+_maxSourceResolutionX!=0.0f && imageData._image
+_maxNumColumns!=0 && _image
-    {
-        // set up properly for vector and raster (previously always vector)
@@ -192 +192 @@
-        if (_dataType == SpatialProperties::VECTOR)
-        {
-ry
-ry
+
+
-        }
-        else    // if (_dataType == SpatialProperties::RASTER)
-        {
-ry
-ry
-
-
-ry
-ry
+
+
+
+
+
+
-
-        // use a minimum image size of 4x4 to avoid mipmap generation problems in OpenGL at sizes at 2x2. 
@@ -285 +285 @@
-            ImageData& imageData = getImageData(layerNum);
-
-ry
-ry
-ry
-ry
+Destination
+Destination
+Destination
+Destination
-                                        0.0,             -texture_dy,       0.0,0.0,
-                                        0.0,             0.0,               1.0,1.0,
@@ -294 +294 @@
-
-
-ry
+Destination
-
-            std::string imageName(_name+_dataSet->getDestinationImageExtension());
-ry
-
-ry
-ry
-ry
+Destination
+
+Destination
+Destination
+Destination
-            for(unsigned int i=0;i<totalSize;++i)
-            {
@@ -450 +450 @@
-            {
-                ImageData& imageData = tcp.first->_imagery[layerNum];
-ry.valid() && imageData._imagery
+Destination.valid() && imageData._imageDestination
-                {
-ry
+Destination
-                }
-            }
@@ -653 +653 @@
-    {
-        // do we have a image to equalize?
-ry
+Destination
-        
-        // does the neighbouring tile have an image to equalize?
-        if (layerNum>=tile2->_imagery.size()) continue;
-ry
-
-
-ry
-ry
+Destination
+
+
+Destination
+Destination
-
-        //log(osg::INFO,"Equalizing edge "<<edgeString(position)<<" of \t"<<_level<<"\t"<<_tileX<<"\t"<<_tileY
@@ -1043 +1043 @@
-        ++layerNum)
-    {
-ry
-ry
+Destination
+Destination
-        {
-            ++numValidImagerLayers;
@@ -1059 +1059 @@
-    {
-        ImageData& imageData = _imagery[layerNum];
-ry.valid() || !imageData._imagery
+Destination.valid() || !imageData._imageDestination
-        
-ry
+Destination
-
-        std::string imageExension(_dataSet->_imageExtension);
@@ -1471 +1471 @@
-    {
-        ImageData& imageData = _imagery[layerNum];
-ry.valid() && imageData._imagery
+Destination.valid() && imageData._imageDestination
-        {        
-ry
+Destination
-
-            osgTerrain::ImageLayer* imageLayer = new osgTerrain::ImageLayer;
@@ -1850 +1850 @@
-        {
-            ImageData& imageData = _imagery[layerNum];
-ry.valid() && imageData._imagery
+Destination.valid() && imageData._imageDestination
-            {
-                geometry->setTexCoordArray(layerNum,&t);
@@ -2228 +2228 @@
-void DestinationTile::readFrom(Source* source)
-{
+    bool optionalLayerSet = _dataSet->isOptionalLayerSet(source->getSetName());
+    log(osg::NOTICE,"DestinationTile::readFrom(SetName=%s, FileName=%s)",source->getSetName().c_str(), source->getFileName().c_str());
+    if (optionalLayerSet) log(osg::NOTICE,"  is an optional layer set");
+
-    if (source && 
-        source->intersects(*this) &&
@@ -2251 +2255 @@
-                            for(unsigned int i=0;i<_imagery.size();++i)
-                            {
-ry
+Destination
-                                {
-ry
+Destination
-                                }
-                            }
@@ -2260 +2264 @@
-                        {
-                            // copy specific layer.
-ry
+Destination
-                            {
-ry
+Destination
-                            }
-                        }
@@ -2272 +2276 @@
-                        for(unsigned int i=layerNum;i<_imagery.size();++i)
-                        {
-ry
+Destination
-                            {
-ry
+Destination
-                            }
-                        }
@@ -2281 +2285 @@
-                    case(BuildOptions::NO_INHERITANCE):
-                    {
-ry
+Destination
-                        {
-ry
+Destination
-                        }
-                        break;