Changeset 287

Timestamp:

May 29, 2011, 1:37:04 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/TerrainTest

Files:

• ReaderWriterTerrainMod.cpp (modified) (1 diff)
• rampedEllipsoidTechnique.cpp (modified) (2 diffs)

experimental/TerrainTest/ReaderWriterTerrainMod.cpp

@@ -28 +28 @@
                 options->getBuildKdTreesHint() == Options::BUILD_KDTREES :
                                 osgDB::Registry::instance()->getBuildKdTreesHint() == Options::BUILD_KDTREES;
-        // Save original KdTree Hint
+        // If options are available: Save it'S original KdTree Hint.
         Options::BuildKdTreesHint originalHint = Options::NO_PREFERENCE;
         if(options)

experimental/TerrainTest/rampedEllipsoidTechnique.cpp

@@ -82 +82 @@
                         double height_org = h->getHeight(x,y);
                         double delta_h = _height - height_org;
-                        // preset offsetvalue to max and let every region try to lower it...
+                        // preset offset value to max and let every ramp function try to lower it...
                         double destination_height = std::numeric_limits<double>::max();
 
                         // 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
+                        if( Y_startCore<=y && y<=Y_endCore && X_startCore<=x && x<=X_endCore )  // If vertex is inside core: Apply final height
                         {
-                                        if(_height<destination_height)
-                                        destination_height = _height;
+                                destination_height = _height;
                         }
+                        // Startramp
                         if(Y_startRamp<=y && y<Y_startCore) // Vertex is inside Y start ramp
                         {
@@ -107 +107 @@
                                         destination_height = dest;
                         }
+                        // End ramp
                         if(Y_endCore<=y && y<Y_endRamp)  // Vertex is inside Y end ramp
                         {