Changeset 290

Timestamp:

May 30, 2011, 8:03:34 AM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/TerrainTest

Files:

• ModificationVisitor.cpp (modified) (1 diff)
• rampedEllipsoidTechnique.cpp (modified) (8 diffs)

experimental/TerrainTest/ModificationVisitor.cpp

@@ -25 +25 @@
 
         // Set ROI to flatten and estimated height after correction
-        _technique->setModifiedHeight(300);     // 450
+        _technique->setModifiedHeight(450);     // 450
 
         ModificationManager::getInstance()->addTerrainToManage( new osgTerrain::Terrain() );

experimental/TerrainTest/rampedEllipsoidTechnique.cpp

@@ -30 +30 @@
 void rampedEllipsoidTechnique::modifyHeightfield(region& modificationROI, osg::HeightField* h, region tileExtends)
 {
-        OSG_NOTIFY( osg::ALWAYS ) << "rampedEllipsoidTechnique::modifyHeightfield()" << std::endl;
+        //OSG_NOTIFY( osg::ALWAYS ) << "rampedEllipsoidTechnique::modifyHeightfield()" << 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;
@@ -57 +57 @@
         clampValue(Y_endCore, Y_start, Y_end);
         clampValue(Y_endRamp, Y_start, Y_end);
-        OSG_NOTIFY( osg::ALWAYS ) << "Y_startRamp:" << Y_startRamp << " Y_startCore:" << Y_startCore << " Y_endCore:" << Y_endCore << " Y_endRamp:" << Y_endRamp << std::endl;
+        //OSG_NOTIFY( osg::ALWAYS ) << "Y_startRamp:" << Y_startRamp << " Y_startCore:" << Y_startCore << " Y_endCore:" << Y_endCore << " Y_endRamp:" << Y_endRamp << std::endl;
 
         // Lon
@@ -69 +69 @@
         clampValue(X_endCore, X_start, X_end);
         clampValue(X_endRamp, X_start, X_end);
-        OSG_NOTIFY( osg::ALWAYS ) << "X_startRamp:" << X_startRamp << " X_startCore:" << X_startCore << " X_endCore:" << X_endCore << " X_endRamp:" << X_endRamp << std::endl;
+        //OSG_NOTIFY( osg::ALWAYS ) << "X_startRamp:" << X_startRamp << " X_startCore:" << X_startCore << " X_endCore:" << X_endCore << " X_endRamp:" << X_endRamp << std::endl;
 
         // Modify height value of affected vertices in the core ROI
@@ -84 +84 @@
                         // preset offset value to max and let every ramp function try to lower it...
                         double current_vertex_delta = std::numeric_limits<double>::max();
-                        double destination_height = _height;
 
                         // Calculate vertex height according to the region it is in.
-                        //if( Y_startCore<=y && y<=Y_endCore && X_startCore<=x && x<=X_endCore )        // If vertex is inside core: Apply final height
-                        //{
-                        //      destination_height = _height;
-                        //}
-                        // Startramp
-                        if(Y_startRamp<=y && y<=Y_startCore) // Vertex is inside Y start ramp
+                        //// Estimated height in the core ROI
+                        double destination_height = _height;
+                        //// Startramp
+                        if(Y_startRamp<=y && y<=Y_startCore && Y_startRamp != Y_startCore) // Vertex is inside Y start ramp
                         {
                                 double delta_s = abs(modificationROI._lat_min-vertex_lat);
@@ -104 +101 @@
                                 }
                         }
-                        if(X_startRamp<=x && x<=X_startCore)    // Vertex is inside X start ramp
+                        if(X_startRamp<=x && x<=X_startCore && X_startRamp != X_startCore)      // Vertex is inside X start ramp
                         {
                                 double delta_s = abs(modificationROI._lon_min-vertex_lon);
@@ -116 +113 @@
                                 }
                         }
-                        // End ramp
-                        if(Y_endCore<=y && y<=Y_endRamp)  // Vertex is inside Y end ramp
+                        //// End ramp
+                        if(Y_endCore<=y && y<=Y_endRamp && Y_endCore != Y_endRamp)  // Vertex is inside Y end ramp
                         {
                                 double delta_s = abs(modificationROI._lat_max-vertex_lat);
@@ -129 +126 @@
                                 }
                         }
-                        if (X_endCore<=x && x<=X_endRamp) // Vertex is inside X end ramp
+                        if (X_endCore<=x && x<=X_endRamp && X_endCore != X_endRamp) // Vertex is inside X end ramp
                         {
                                 double delta_s = abs(modificationROI._lon_max-vertex_lon);
@@ -143 +140 @@
                         
                         // Set height to calculated value
-                        OSG_NOTIFY( osg::ALWAYS ) << "rampedEllipsoidTechnique: X,Y:"<<x<<","<<y<<" destination_height=" << destination_height << std::endl;
+                        //OSG_NOTIFY( osg::ALWAYS ) << "rampedEllipsoidTechnique: X,Y:"<<x<<","<<y<<" destination_height=" << destination_height << std::endl;
                         h->setHeight( x, y, destination_height);
                 }