Changeset 931

Timestamp:

09/02/08 16:02:50

Author:

robert

Message:

Introduce DestinationTile?::requiresDivision() method to encapsulate the access to the _imagery member

Files:

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

trunk/include/vpb/Destination

@@ -128 +128 @@
-    bool computeTerrainResolution(unsigned int& numColumns, unsigned int& numRows, double& resX, double& resY);
-
+    void requiresDivision(float resolutionSensitivityScale, bool& needToDivideX, bool& needToDivideY);
+
-    void allocate();
-
@@ -207 +209 @@
-
-    std::vector<ImageData>                      _imagery;
-ry
+Layer
-
-    inline ImageData& getImageData(unsigned int layer)
@@ -217 +219 @@
-    inline ImageSet& getImageSet(unsigned int layer)
-    {
-rySet.size()) _imagery
-ry
+LayerSet.size()) _imageLayer
+Layer
-    }
-

trunk/src/vpb/DataSet.cpp

@@ -796 +796 @@
-        // note, resolutionSensitivityScale should probably be customizable.. will consider this option for later inclusion.
-        double resolutionSensitivityScale = 0.9;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        
-        float xCenter = (extents.xMin()+extents.xMax())*0.5f;

trunk/src/vpb/Destination.cpp

@@ -97 +97 @@
-}
-
+
+void DestinationTile::requiresDivision(float resolutionSensitivityScale, bool& needToDivideX, bool& needToDivideY)
+{
+    for(unsigned int layerNum=0;
+        layerNum<_imagery.size();
+        ++layerNum)
+    {
+        unsigned int texture_numColumns;
+        unsigned int texture_numRows;
+        double texture_dx;
+        double texture_dy;
+        if (computeImageResolution(layerNum,texture_numColumns,texture_numRows,texture_dx,texture_dy))
+        {
+            if (texture_dx*resolutionSensitivityScale > _imagery[layerNum]._image_maxSourceResolutionX) needToDivideX = true;
+            if (texture_dy*resolutionSensitivityScale > _imagery[layerNum]._image_maxSourceResolutionY) needToDivideY = true;
+        }
+    }
+
+    unsigned int dem_numColumns;
+    unsigned int dem_numRows;
+    double dem_dx;
+    double dem_dy;
+    if (computeTerrainResolution(dem_numColumns,dem_numRows,dem_dx,dem_dy))
+    {
+        if (dem_dx*resolutionSensitivityScale > _terrain_maxSourceResolutionX) needToDivideX = true;
+        if (dem_dy*resolutionSensitivityScale > _terrain_maxSourceResolutionY) needToDivideY = true;
+    }
+
+}
-
-void DestinationTile::computeMaximumSourceResolution(Source* source)
@@ -2366 +2395 @@
-{
-    _imagery.clear();
+    _imageLayerSet.clear();
-    _terrain = 0;
-    _models = 0;