Changeset 262 for experimental

Timestamp:

Feb 25, 2011, 11:01:49 PM (14 years ago)

Author:

Torben Dannhauer

Message:

introduced abstract "terrainModficationTechnique" base class. this class will be derived by every terrainTechnique, e.g. ellipsoidTechnique

Location:

experimental/TerrainTest

Files:

• ModificationVisitor.cpp (modified) (3 diffs)
• ModificationVisitor.h (modified) (1 diff)
• Plugins terrainmod/Plugins terrainmod.vcproj (modified) (2 diffs)
• ellipsoidTechnique.cpp (modified) (2 diffs)
• ellipsoidTechnique.h (modified) (2 diffs)
• terrainModificationTechnique.cpp (added)
• terrainModificationTechnique.h (added)

experimental/TerrainTest/ModificationVisitor.cpp

@@ -6 +6 @@
 {
         setTraversalMode( osg::NodeVisitor::TRAVERSE_ALL_CHILDREN );
-        technique = new ellipsoidTechnique();
+        _technique = new ellipsoidTechnique();
+
+        // Set ROI to flatten and estimated height after correction
+        _technique->setModifiedHeight(450);
 }
 
@@ -49 +52 @@
 
         // ROI to flatten
-        double roi_lat_min = 48.336808;
-        double roi_lat_max = 48.370467;
-        double roi_lon_min = 11.736750;
-        double roi_lon_max = 11.835322;
+        osg::Vec4d modificationROI = osg::Vec4d( 48.336808, 48.370467, 11.736750, 11.835322 );          // roi_lat_min, roi_lat_max, roi_lon_min, roi_lon_max
 
         // Determine extend of the tile.
@@ -61 +61 @@
 
         // Check if tile is fully or partially inside ROI:
-        if(lat_max>roi_lat_min && lat_min<roi_lat_max                   // lat inside ROI
-                && lon_max>roi_lon_min && lon_min<roi_lon_max ) // lon inside ROI
+        if(lat_max>modificationROI[0] && lat_min<modificationROI[1]                     // lat inside ROI?
+                && lon_max>modificationROI[2] && lon_min<modificationROI[3] )   // lon inside ROI?
         {
-                technique->modifyHeightfield(h, lat_min, lat_max, lon_min, lon_max);
+                _technique->modifyHeightfield( modificationROI, h, osg::Vec4d(lat_min, lat_max, lon_min, lon_max) );
         }
 }

experimental/TerrainTest/ModificationVisitor.h

@@ -20 +20 @@
         void modifyTile(osgTerrain::TerrainTile* tile);
         std::string _extensionToSet;
+        osg::ref_ptr<ellipsoidTechnique> _technique;
 
-        ellipsoidTechnique* technique;
 };

experimental/TerrainTest/Plugins terrainmod/Plugins terrainmod.vcproj

@@ -191 +191 @@
                                 >
                         </File>
+                        <File
+                                RelativePath="..\terrainModificationTechnique.cpp"
+                                >
+                        </File>
                 </Filter>
                 <Filter
@@ -209 +213 @@
                                 >
                         </File>
+                        <File
+                                RelativePath="..\terrainModificationTechnique.h"
+                                >
+                        </File>
                 </Filter>
                 <Filter

experimental/TerrainTest/ellipsoidTechnique.cpp

@@ -5 +5 @@
 ellipsoidTechnique::ellipsoidTechnique()
 {
+        _height = 0.0;
 }
 
@@ -11 +12 @@
 }
 
-void ellipsoidTechnique::modifyHeightfield(osg::HeightField* h, double lat_min, double lat_max, double lon_min, double lon_max)
+void ellipsoidTechnique::modifyHeightfield(osg::Vec4d& modificationROI, osg::HeightField* h, osg::Vec4d tileExtends)
 {
         OSG_NOTIFY( osg::ALWAYS ) << "ellipsoidTechnique::modifyHeightfield()" << std::endl;
-        OSG_NOTIFY( osg::ALWAYS ) << "LAT: " << lat_min << " | " << lat_max << std::endl;
-        OSG_NOTIFY( osg::ALWAYS ) << "LON: " << lon_min << " | " << lon_max << std::endl;
-
-        int rows = h->getNumRows();
-        int cols = h->getNumColumns();
+        OSG_NOTIFY( osg::ALWAYS ) << "LAT: " << tileExtends[0] << " | " << tileExtends[1] << std::endl;
+        OSG_NOTIFY( osg::ALWAYS ) << "LON: " << tileExtends[2] << " | " << tileExtends[3] << std::endl;
 
         // calculate colum start/end and row start/end of affected vertices
-        int startX=0,startY=0,endX=cols,endY=rows;
+        int startX=0, startY=0, endX=h->getNumColumns(), endY=h->getNumRows();
 
-        double roi_lat_min = 48.336808;
-        double roi_lat_max = 48.370467;
-        double roi_lon_min = 11.736750;
-        double roi_lon_max = 11.835322;
+        
+        // Dertermine 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();
 
-        // dertermining loop variables
-        if(lat_min<roi_lat_min)
-                startY = (roi_lat_min - lat_min) / h->getYInterval();
-        if(lat_max>roi_lat_max)
-                endY = (roi_lat_max - lat_min) / h->getYInterval();
-
-        if(lon_min<roi_lon_min)
-                startX = (roi_lon_min - lon_min) / h->getXInterval();
-        if(lon_max>roi_lon_max)
-                endX = (roi_lon_max - lon_min) / h->getXInterval();
+        if(tileExtends[2]<modificationROI[2])
+                startX = (modificationROI[2] - tileExtends[2]) / h->getXInterval();
+        if(tileExtends[3]>modificationROI[3])
+                endX = (modificationROI[3] - tileExtends[2]) / h->getXInterval();
 
 
-        // modify height value of affected vertices
+        // Modify height value of affected vertices
         for(int x=startX;x<endX;x++)
         {
                 for(int y=startY;y<endY;y++)
                 {
-                        h->setHeight( x, y, 550);
+                        h->setHeight( x, y, _height);
                 }
         }
-
 }
 

experimental/TerrainTest/ellipsoidTechnique.h

@@ -1 +1 @@
 #pragma once
 
-#include <osgTerrain/GeometryTechnique>
-#include <osg/Image>
+#include "terrainModificationTechnique.h"
 
-class ellipsoidTechnique
+
+class ellipsoidTechnique : public terrainModificationTechnique
 {
 public:
@@ -10 +10 @@
         ~ellipsoidTechnique();
 
-        void modifyHeightfield(osg::HeightField* h, double lat_min, double lat_max, double lon_min, double lon_max);
+        void modifyHeightfield(osg::Vec4d& modificationROI, osg::HeightField* h, osg::Vec4d tileExtends);
+        void setModifiedHeight(double height) {_height=height;}
+
+private:
+        double _height;
 };