Changeset 258 for experimental

Timestamp:

Feb 23, 2011, 8:28:20 AM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/TerrainTest

Files:

• ModificationVisitor.cpp (modified) (4 diffs)
• ModificationVisitor.h (modified) (2 diffs)
• Plugins terrainmod/Plugins terrainmod.vcproj (modified) (2 diffs)
• ellipsoidTechnique.cpp (added)
• ellipsoidTechnique.h (added)

experimental/TerrainTest/ModificationVisitor.cpp

@@ -6 +6 @@
 {
         setTraversalMode( osg::NodeVisitor::TRAVERSE_ALL_CHILDREN );
+        technique = new ellipsoidTechnique();
 }
 
@@ -43 +44 @@
 void ModificationVisitor::modifyTile(osgTerrain::TerrainTile* tile)
 {
-        //OSG_NOTIFY( osg::ALWAYS ) << "ModificationVisitor::modifyTile()" << std::endl;
+        //OSG_NOTIFY( osg::ALWAYS ) << "ModificationVisitor::modifyTile() : Checking if tile is affected.." << std::endl;
         HeightFieldLayer* hfl = dynamic_cast<HeightFieldLayer*>(tile->getElevationLayer());
         osg::HeightField* h = hfl->getHeightField();
@@ -54 +55 @@
 
         // Determine extend of the tile.
-        int rows = h->getNumRows();
-        int cols = h->getNumColumns();
         double lat_min = h->getOrigin()[1];
-        double lat_max = lat_min + rows * h->getYInterval();
+        double lat_max = lat_min + h->getNumRows() * h->getYInterval();
         double lon_min = h->getOrigin()[0];
-        double lon_max = lon_min + cols * h->getXInterval();
+        double lon_max = lon_min + h->getNumColumns() * h->getXInterval();
 
         // Check if tile is fully or partially inside ROI:
@@ -65 +64 @@
                 && lon_max>dest_lon_min && lon_min<dest_lon_max )       // lon inside ROI
         {
-                OSG_NOTIFY( osg::ALWAYS ) << "ModificationVisitor::modifyTile() :: affected Tile" << std::endl;
-                OSG_NOTIFY( osg::ALWAYS ) << "LAT: " << lat_min << " | " << lat_max << std::endl;
-                OSG_NOTIFY( osg::ALWAYS ) << "LON: " << lon_min << " | " << lon_max << std::endl;
-
-
-                // calculate colum start/end and row start/end of affected vertices
-                int startX=0,startY=0,endX=cols,endY=rows;
-
-
-                // modify height value of affected vertices
-                h->setHeight( 0,0, 600);
-
+                technique->modifyHeightfield(h, lat_min, lat_max, lon_min, lon_max);
         }
-
-
-
-
-
-
-
-        //OSG_NOTIFY( osg::ALWAYS ) << "Origin: " << h->getOrigin()[0] << " | " << h->getOrigin()[1] << std::endl;
-        //OSG_NOTIFY( osg::ALWAYS ) << "X-Intervall: " << h->getXInterval() << std::endl;
-        //OSG_NOTIFY( osg::ALWAYS ) << "Y-Intervall: " << h->getYInterval() << std::endl;
-        //if(dest_lat_min<=lat_min && lat_max<=dest_lat_max && dest_lon_min<=lon_min && lon_max<=dest_lon_max)
-        //{
-        //      OSG_NOTIFY( osg::ALWAYS ) << "ModificationVisitor::modifyTile() :: affected Tile" << std::endl;
-        //      OSG_NOTIFY( osg::ALWAYS ) << "LAT: " << lat_min << " | " << lat_max << std::endl;
-        //      OSG_NOTIFY( osg::ALWAYS ) << "LON: " << lon_min << " | " << lon_max << std::endl;
-
-        //      h->setHeight( 0,0, 1000);
-        //}
-        //OpenThreads::Thread::microSleep( 50000 );
 }

experimental/TerrainTest/ModificationVisitor.h

@@ -6 +6 @@
 #include <osgTerrain/TerrainTile>
 #include <osgTerrain/Layer>
+
+#include "ellipsoidTechnique.h"
 
 
@@ -18 +20 @@
         void modifyTile(osgTerrain::TerrainTile* tile);
         std::string _extensionToSet;
+
+        ellipsoidTechnique* technique;
 };

experimental/TerrainTest/Plugins terrainmod/Plugins terrainmod.vcproj

@@ -180 +180 @@
                         >
                         <File
+                                RelativePath="..\ellipsoidTechnique.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\ModificationVisitor.cpp"
                                 >
@@ -194 +198 @@
                         >
                         <File
+                                RelativePath="..\ellipsoidTechnique.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\ModificationVisitor.h"
                                 >