Changeset 269 for experimental/TerrainTest/rampedEllipsoidTechnique.cpp

Timestamp:

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

Author:

Torben Dannhauer

Message:

 

File:

• experimental/TerrainTest/rampedEllipsoidTechnique.cpp (modified) (8 diffs)

experimental/TerrainTest/rampedEllipsoidTechnique.cpp

@@ -13 +13 @@
 }
 
-void rampedEllipsoidTechnique::modifyHeightfield(osg::Vec4d& modificationROI, osg::HeightField* h, osg::Vec4d tileExtends)
+void rampedEllipsoidTechnique::modifyHeightfield(region& modificationROI, osg::HeightField* h, region tileExtends)
 {
         //OSG_NOTIFY( osg::ALWAYS ) << "rampedEllipsoidTechnique::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;
 
         // Determine modificationROI without ramp
-        double deltaLatPerSide = (modificationROI[1] - modificationROI[0]) * _rampWidthFactor / 2.0;
-        double deltaLonPerSide = (modificationROI[3] - modificationROI[2]) * _rampWidthFactor / 2.0;
-        osg::Vec4d coreROI = modificationROI;
-        coreROI[0]+=deltaLatPerSide;
-        coreROI[1]-=deltaLatPerSide;
-        coreROI[2]+=deltaLonPerSide;
-        coreROI[3]-=deltaLonPerSide;
+        double deltaLatPerSide = modificationROI.delta_lat() * _rampWidthFactor / 2.0;
+        double deltaLonPerSide = modificationROI.delta_lon() * _rampWidthFactor / 2.0;
+        region coreROI = modificationROI;
+        coreROI._lat_min+=deltaLatPerSide;
+        coreROI._lat_max-=deltaLatPerSide;
+        coreROI._lon_min+=deltaLonPerSide;
+        coreROI._lon_max-=deltaLonPerSide;
 
         // Calculate colum start/end and row start/end of affected vertices
@@ -33 +33 @@
 
         // Lat
-        Y_startRamp = round((modificationROI[0]-tileExtends[0]) / h->getYInterval());
-        Y_startCore = round((coreROI[0]-tileExtends[0]) / h->getYInterval());
-        Y_endCore   = round((coreROI[1]-tileExtends[0]) / h->getYInterval());
-        Y_endRamp   = round((modificationROI[1]-tileExtends[0]) / h->getYInterval());
+        Y_startRamp = round((modificationROI._lat_min-tileExtends._lat_min) / h->getYInterval());
+        Y_startCore = round((coreROI._lat_min-tileExtends._lat_min) / h->getYInterval());
+        Y_endCore   = round((coreROI._lat_max-tileExtends._lat_min) / h->getYInterval());
+        Y_endRamp   = round((modificationROI._lat_max-tileExtends._lat_min) / h->getYInterval());
 
         clampValue(Y_startRamp, Y_start, Y_end);
@@ -44 +44 @@
 
         // Lon
-        X_startRamp = round((modificationROI[2]-tileExtends[2]) / h->getXInterval());
-        X_startCore = round((coreROI[2]-tileExtends[2]) / h->getXInterval());
-        X_endCore   = round((coreROI[3]-tileExtends[2]) / h->getXInterval());
-        X_endRamp   = round((modificationROI[3]-tileExtends[2]) / h->getXInterval());
+        X_startRamp = round((modificationROI._lon_min-tileExtends._lon_min) / h->getXInterval());
+        X_startCore = round((coreROI._lon_min-tileExtends._lon_min) / h->getXInterval());
+        X_endCore   = round((coreROI._lon_max-tileExtends._lon_min) / h->getXInterval());
+        X_endRamp   = round((modificationROI._lon_max-tileExtends._lon_min) / h->getXInterval());
 
         clampValue(X_startRamp, X_start, X_end);
@@ -61 +61 @@
                 {
                         // Calculate vertex position in global coordinate system (lat/lon)
-                        double vertex_lat = y*h->getYInterval()+tileExtends[0];
-                        double vertex_lon = x*h->getXInterval()+tileExtends[2];
+                        double vertex_lat = y*h->getYInterval()+tileExtends._lat_min;
+                        double vertex_lon = x*h->getXInterval()+tileExtends._lon_min;
                         // Calculate vertex delta h: h_dest - h_org
                         double height_org = h->getHeight(x,y);
@@ -77 +77 @@
                         if(Y_startRamp<=y && y<Y_startCore) // Vertex is inside Y start ramp
                         {
-                                double delta_s = abs(modificationROI[0]-vertex_lat);
+                                double delta_s = abs(modificationROI._lat_min-vertex_lat);
                                 double gradient = delta_h/deltaLatPerSide;
                                 double dest = delta_s*gradient + height_org;
@@ -85 +85 @@
                         if(X_startRamp<=x && x<X_startCore)     // Vertex is inside X start ramp
                         {
-                                double delta_s = abs(modificationROI[2]-vertex_lon);
+                                double delta_s = abs(modificationROI._lon_min-vertex_lon);
                                 double gradient = delta_h/deltaLonPerSide;
                                 double dest = delta_s*gradient + height_org;
@@ -93 +93 @@
                         if(Y_endCore<=y && y<Y_endRamp)  // Vertex is inside Y end ramp
                         {
-                                double delta_s = abs(modificationROI[1]-vertex_lat);
+                                double delta_s = abs(modificationROI._lat_max-vertex_lat);
                                 double gradient = delta_h/deltaLatPerSide;
                                 double dest = delta_s*gradient + height_org;
@@ -101 +101 @@
                         if (X_endCore<=x && x<X_endRamp) // Vertex is inside X end ramp
                         {
-                                double delta_s = abs(modificationROI[3]-vertex_lon);
+                                double delta_s = abs(modificationROI._lon_max-vertex_lon);
                                 double gradient = delta_h/deltaLonPerSide;
                                 double dest = delta_s*gradient + height_org;