Changeset 260

Timestamp:

Feb 23, 2011, 8:12:55 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/TerrainTest

Files:

• ModificationVisitor.cpp (modified) (2 diffs)
• ellipsoidTechnique.cpp (modified) (1 diff)
• screenshots/screen_shot_0_0.jpg (deleted)
• screenshots/screen_shot_0_3.jpg (deleted)

experimental/TerrainTest/ModificationVisitor.cpp

@@ -49 +49 @@
 
         // ROI to flatten
-        double dest_lat_min = 48.336808;
-        double dest_lat_max = 48.370467;
-        double dest_lon_min = 11.736750;
-        double dest_lon_max = 11.835322;
+        double roi_lat_min = 48.336808;
+        double roi_lat_max = 48.370467;
+        double roi_lon_min = 11.736750;
+        double roi_lon_max = 11.835322;
 
         // Determine extend of the tile.
@@ -61 +61 @@
 
         // Check if tile is fully or partially inside ROI:
-        if(lat_max>dest_lat_min && lat_min<dest_lat_max                 // lat inside ROI
-                && lon_max>dest_lon_min && lon_min<dest_lon_max )       // lon inside ROI
+        if(lat_max>roi_lat_min && lat_min<roi_lat_max                   // lat inside ROI
+                && lon_max>roi_lon_min && lon_min<roi_lon_max ) // lon inside ROI
         {
                 technique->modifyHeightfield(h, lat_min, lat_max, lon_min, lon_max);

experimental/TerrainTest/ellipsoidTechnique.cpp

@@ -23 +23 @@
         int startX=0,startY=0,endX=cols,endY=rows;
 
+        double roi_lat_min = 48.336808;
+        double roi_lat_max = 48.370467;
+        double roi_lon_min = 11.736750;
+        double roi_lon_max = 11.835322;
+
+        // dertermining loop variables
+        if(lat_min<roi_lat_min)
+                startY = (roi_lat_min - lat_min) / h->getYInterval();
+        if(lat_max>roi_lat_max)
+                endY = (roi_lat_max - lat_min) / h->getYInterval();
+
+        if(lon_min<roi_lon_min)
+                startX = (roi_lon_min - lon_min) / h->getXInterval();
+        if(lon_max>roi_lon_max)
+                endX = (roi_lon_max - lon_min) / h->getXInterval();
+
 
         // modify height value of affected vertices
-        h->setHeight( 0,0, 600);
+        for(int x=startX;x<endX;x++)
+        {
+                for(int y=startY;y<endY;y++)
+                {
+                        h->setHeight( x, y, 550);
+                }
+        }
+