Changeset 269 for experimental/TerrainTest/ModificationVisitor.cpp

Timestamp:

Mar 7, 2011, 9:52:06 PM (13 years ago)

Author:

Torben Dannhauer

Message:

 

File:

• experimental/TerrainTest/ModificationVisitor.cpp (modified) (1 diff)

experimental/TerrainTest/ModificationVisitor.cpp

@@ -52 +52 @@
 
         // ROI to flatten
-        //osg::Vec4d modificationROI = osg::Vec4d( 48.336808, 48.370467, 11.736750, 11.835322 );                // roi_lat_min, roi_lat_max, roi_lon_min, roi_lon_max
-        osg::Vec4d modificationROI = osg::Vec4d( 48.331808, 48.375467, 11.731750, 11.840322 );          // roi_lat_min, roi_lat_max, roi_lon_min, roi_lon_max
+        //region modificationROI = region( 48.336808, 48.370467, 11.736750, 11.835322 );                // roi_lat_min, roi_lat_max, roi_lon_min, roi_lon_max
+        region modificationROI = region( 48.331808, 48.375467, 11.731750, 11.840322 );          // roi_lat_min, roi_lat_max, roi_lon_min, roi_lon_max
 
         // Determine extend of the tile.
-        double lat_min = h->getOrigin()[1];
-        double lat_max = lat_min + h->getNumRows() * h->getYInterval();
-        double lon_min = h->getOrigin()[0];
-        double lon_max = lon_min + h->getNumColumns() * h->getXInterval();
+        region tileExtends;
+        tileExtends._lat_min = h->getOrigin()[1];
+        tileExtends._lat_max = tileExtends._lat_min + h->getNumRows() * h->getYInterval();
+        tileExtends._lon_min = h->getOrigin()[0];
+        tileExtends._lon_max = tileExtends._lon_min + h->getNumColumns() * h->getXInterval();
 
         // Check if tile is fully or partially inside ROI:
-        if(lat_max>modificationROI[0] && lat_min<modificationROI[1]                     // lat inside ROI?
-                && lon_max>modificationROI[2] && lon_min<modificationROI[3] )   // lon inside ROI?
-        {
-                _technique->modifyHeightfield( modificationROI, h, osg::Vec4d(lat_min, lat_max, lon_min, lon_max) );
-        }
+        if( tileExtends.isFullOrPartiallyInside(modificationROI) )
+                _technique->modifyHeightfield( modificationROI, h, tileExtends );
 }