Changeset 271 for experimental/TerrainTest

Timestamp:

Mar 9, 2011, 8:14:32 AM (14 years ago)

Author:

Torben Dannhauer

Message:

now both available terrainModificationTechniques are refactored to use the region class.

Location:

experimental/TerrainTest

Files:

• ellipsoidTechnique.cpp (modified) (2 diffs)
• ellipsoidTechnique.h (modified) (1 diff)

experimental/TerrainTest/ellipsoidTechnique.cpp

@@ -11 +11 @@
 }
 
-void ellipsoidTechnique::modifyHeightfield(osg::Vec4d& modificationROI, osg::HeightField* h, osg::Vec4d tileExtends)
+void ellipsoidTechnique::modifyHeightfield(region& modificationROI, osg::HeightField* h, region tileExtends)
 {
         //OSG_NOTIFY( osg::ALWAYS ) << "ellipsoidTechnique::modifyHeightfield()" << std::endl;
-        //OSG_NOTIFY( osg::ALWAYS ) << "LAT: " << tileExtends[0] << " | " << tileExtends[1] << std::endl;
-        //OSG_NOTIFY( osg::ALWAYS ) << "LON: " << tileExtends[2] << " | " << tileExtends[3] << std::endl;
+        //OSG_NOTIFY( osg::ALWAYS ) << "LAT: " << tileExtends._lat_min << " | " << tileExtends._lat_max << std::endl;
+        //OSG_NOTIFY( osg::ALWAYS ) << "LON: " << tileExtends._lon_min << " | " << tileExtends._lon_max << std::endl;
 
         // calculate colum start/end and row start/end of affected vertices
@@ -22 +22 @@
         
         // Determine loop variables..
-        if(tileExtends[0]<modificationROI[0])
-                startY = (modificationROI[0] - tileExtends[0]) / h->getYInterval();
-        if(tileExtends[1]>modificationROI[1])
-                endY = (modificationROI[1] - tileExtends[0]) / h->getYInterval();
+        if(tileExtends._lat_min<modificationROI._lat_min)
+                startY = (modificationROI._lat_min - tileExtends._lat_min) / h->getYInterval();
+        if(tileExtends._lat_max>modificationROI._lat_max)
+                endY = (modificationROI._lat_max - tileExtends._lat_min) / h->getYInterval();
 
-        if(tileExtends[2]<modificationROI[2])
-                startX = (modificationROI[2] - tileExtends[2]) / h->getXInterval();
-        if(tileExtends[3]>modificationROI[3])
-                endX = (modificationROI[3] - tileExtends[2]) / h->getXInterval();
+        if(tileExtends._lon_min<modificationROI._lon_min)
+                startX = (modificationROI._lon_min - tileExtends._lon_min) / h->getXInterval();
+        if(tileExtends._lon_max>modificationROI._lon_max)
+                endX = (modificationROI._lon_max - tileExtends._lon_min) / h->getXInterval();
 
 

experimental/TerrainTest/ellipsoidTechnique.h

@@ -9 +9 @@
         ~ellipsoidTechnique();
 
-        void modifyHeightfield(osg::Vec4d& modificationROI, osg::HeightField* h, osg::Vec4d tileExtends);
+        void modifyHeightfield(region& modificationROI, osg::HeightField* h, region tileExtends);
         void setModifiedHeight(double height) {_height=height;}