Changeset 168

Timestamp:

Nov 26, 2010, 11:55:13 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/TerrainTest

Files:

• myTerrainTechnique.cpp (modified) (2 diffs)
• myTileLoadedCallback.cpp (modified) (2 diffs)
• osgterrain.cpp (modified) (1 diff)

experimental/TerrainTest/myTerrainTechnique.cpp

@@ -4 +4 @@
 using namespace osgTerrain;
 
-myTerrainTechnique::myTerrainTechnique(void)
+myTerrainTechnique::myTerrainTechnique(void) : osgTerrain::GeometryTechnique()
 {
-        //OSG_ALWAYS<<className()<<"Constructed by Constructor"<<std::endl;
+        OSG_ALWAYS<<className()<<"Constructed by Constructor"<<std::endl;
+
 }
 
@@ -21 +22 @@
 void myTerrainTechnique::update(osgUtil::UpdateVisitor* uv)
 {
-        //HeightFieldLayer* hfl = dynamic_cast<HeightFieldLayer*>( getTerrainTile()->getElevationLayer() );
-        //osg::HeightField* h = hfl->getHeightField();
+        HeightFieldLayer* hfl = dynamic_cast<HeightFieldLayer*>( getTerrainTile()->getElevationLayer() );
+        osg::HeightField* h = hfl->getHeightField();
+        h->setHeight( 0,0, 1000);
 
-        //float height = h->getHeight( 0,0 );
-        ////OSG_ALWAYS<<"retrieved height: " << height << std::endl;
-        //height +=50000;
-        //h->setHeight( 0,0, height);
-        //OSG_ALWAYS<<"modified height: " << height << std::endl;
-        ////getTerrainTile()->setDirty( true ); // Neccessary
-
-
-        GeometryTechnique::update( uv);
+    GeometryTechnique::update( uv); 
 }

experimental/TerrainTest/myTileLoadedCallback.cpp

@@ -8 +8 @@
 myTileLoadedCallback::myTileLoadedCallback(osgTerrain::Terrain* terrain) : _terrain(terrain)
 {
- OSG_ALWAYS << "test";
 }
 
@@ -24 +23 @@
 {
         //OSG_ALWAYS << "Executing myTileLoadedCallback!" << std::endl;
+        tile->setTerrain( _terrain );
         tile->setTerrainTechnique( new osgTerrain::myTerrainTechnique() );
-        //_terrain->updateTerrainTileOnNextFrame(tile);
+        _terrain->updateTerrainTileOnNextFrame(tile);
 }
     

experimental/TerrainTest/osgterrain.cpp

@@ -214 +214 @@
     terrain->setVerticalScale(verticalScale);
     terrain->setBlendingPolicy(blendingPolicy);
-        osg::ref_ptr<osgTerrain::TerrainTechnique> myT = new osgTerrain::myTerrainTechnique();
-        terrain->setTerrainTechniquePrototype( myT );
+        //osg::ref_ptr<osgTerrain::TerrainTechnique> myT = new osgTerrain::myTerrainTechnique();
+        //terrain->setTerrainTechniquePrototype( myT );
 
         //// Manually set the terrain technque for a tile ( his example, the first found tile) works, but then the whole database has to be processed