Changeset 277

Timestamp:

Mar 20, 2011, 5:12:24 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/TerrainTest

Files:

• ModificationManager (added)
• ModificationManager.cpp (modified) (2 diffs)
• ModificationManager.h (modified) (3 diffs)
• ModificationManager/Export.h (added)
• ModificationManager/ModificationManager.cpp (added)
• ModificationManager/ModificationManager.h (added)
• ModificationManager/ModificationManager.vcproj (added)
• TerrainTest.sln (modified) (4 diffs)
• myTerrainTechnique.cpp (modified) (2 diffs)
• myTileLoadedCallback.h (modified) (2 diffs)
• osgterrain.cpp (modified) (1 diff)

experimental/TerrainTest/ModificationManager.cpp

@@ -17 +17 @@
 #include "ModificationManager.h"
 
+// Used geometryTechniques
+#include "myTerrainTechnique.h"
+
+// Used terrainTechniques.
+//-
+
 #define USE_TERRAIN_PROTO_WORKAROUND USE_TERRAIN_PROTO_WORKAROUND
 
+
+using namespace osgTerrain;
 
 void ModificationManager::addTerrainToManage(osgTerrain::Terrain* terrain)
@@ -41 +49 @@
 void ModificationManager::setGeometryTechniquePrototype( osgTerrain::GeometryTechnique* geomTechnique, osgTerrain::Terrain* terrain )
 {
-        if(!geomTechnique)      // Remove the installed geometry technique
+        for(unsigned int i=0;i<managedTerrain.size();i++)
         {
-                terrain->setTerrainTechniquePrototype( NULL );
-#ifdef USE_TERRAIN_PROTO_WORKAROUND
-                osgTerrain::TerrainTile::setTileLoadedCallback(NULL);
-#endif
-                return;
-        }
-
-
-        terrain->setTerrainTechniquePrototype( geomTechnique );
-#ifdef USE_TERRAIN_PROTO_WORKAROUND
-        osg::ref_ptr<osgTerrain::GeometryTechniquePrototypeWorkaroundTLC> tlcb = new osgTerrain::GeometryTechniquePrototypeWorkaroundTLC();
-        osgTerrain::TerrainTile::setTileLoadedCallback(tlcb);
-#endif
-
-
+                if(terrain==NULL || terrain==managedTerrain[i])
+                {
+                        if(!geomTechnique)      // Remove the installed geometry technique
+                        {
+                                terrain->setTerrainTechniquePrototype( NULL );
+                                #ifdef USE_TERRAIN_PROTO_WORKAROUND
+                                                osgTerrain::TerrainTile::setTileLoadedCallback(NULL);
+                                #endif
+                        }
+                        else
+                        {
+                                terrain->setTerrainTechniquePrototype( geomTechnique );
+                                #ifdef USE_TERRAIN_PROTO_WORKAROUND
+                                        osg::ref_ptr<osgTerrain::GeometryTechniquePrototypeWorkaroundTLC<osgTerrain::myTerrainTechnique> > tlcb = new osgTerrain::GeometryTechniquePrototypeWorkaroundTLC<osgTerrain::myTerrainTechnique>();
+                                        osgTerrain::TerrainTile::setTileLoadedCallback(tlcb);
+                                #endif
+                        }
+                        return;
+                }       // IF END
+        }       // FOR END
 }
 

experimental/TerrainTest/ModificationManager.h

@@ -25 +25 @@
 
 
+
+namespace osgTerrain {
 
 
@@ -73 +75 @@
         //bool removeRoi(region modificationROI);
 
+
+
+        /**
+         * \brief This functions sets the geometryTechniqueProtoype. The geometryTechnique is responsible for creating a renderable mesh from the tile data.
+         * 
+         * If you want to use a geometryTechnique different from the standard one, you have to use this function.
+         * 
+         * @param geomTechnique : GeometryTechnique you want to use for the specified terrain.
+         * @param terrain : Terrain you want to set it's geometryTechniquePrototype. If NULL, the geometrytechnique will be applied to all terrains.
+         */ 
         void setGeometryTechniquePrototype( osgTerrain::GeometryTechnique* geomTechnique, osgTerrain::Terrain* terrain=NULL );
+
+        /**
+         * \brief This function sets the terrainModificationTechnique.
+         * 
+         * The terrainModificationTechnique can modify the tile data before the data is used by the geometryTechnique to create the renderable mesh.
+         * 
+         * @param terrainModTechnique 
+         * @param terrain 
+         */ 
+        void setTerrainModificationTechnique( osgTerrain::GeometryTechnique* terrainModTechnique, osgTerrain::Terrain* terrain=NULL );
 
 
@@ -87 +109 @@
 
 };
+
+}       // Namespace end.

experimental/TerrainTest/TerrainTest.sln

@@ -1165 +1165 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Terrain Modification", "Terrain Modification", "{805F6302-F552-4A31-8AB3-02EEBEE17C32}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModificationManager", "ModificationManager\ModificationManager.vcproj", "{C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}"
 EndProject
 Global
@@ -2524 +2526 @@
                 {F495149B-D575-4E9F-B7A0-F4BC82C25945}.RelWithDebInfo|Win32.Build.0 = RelWithDebInfo|Win32
                 {F495149B-D575-4E9F-B7A0-F4BC82C25945}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.Debug|Win32.ActiveCfg = Debug|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.Debug|Win32.Build.0 = Debug|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.Debug|x64.ActiveCfg = Debug|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.MinSizeRel|Win32.ActiveCfg = Release|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.MinSizeRel|Win32.Build.0 = Release|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.MinSizeRel|x64.ActiveCfg = Release|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.Release|Win32.ActiveCfg = Release|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.Release|Win32.Build.0 = Release|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.Release|x64.ActiveCfg = Release|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58}.RelWithDebInfo|x64.ActiveCfg = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
@@ -2529 +2543 @@
         EndGlobalSection
         GlobalSection(NestedProjects) = preSolution
+                {59A20266-19E6-4ABD-A43A-6485BA7C1537} = {805F6302-F552-4A31-8AB3-02EEBEE17C32}
+                {31EA52E8-FAAA-4B5E-BC40-4E4E7050E5F1} = {805F6302-F552-4A31-8AB3-02EEBEE17C32}
+                {C6A93F26-EE4F-4B7A-BA20-11D7E34C6F58} = {805F6302-F552-4A31-8AB3-02EEBEE17C32}
                 {834311F5-F14B-488D-A1F3-1690916382BC} = {B5054884-F605-4747-8FBE-0279E25559E6}
                 {77FC9035-6034-40B5-A7C4-ADA3480AAE93} = {B5054884-F605-4747-8FBE-0279E25559E6}
@@ -2637 +2654 @@
                 {2094AEB9-51C2-4BE8-AE77-ECFADAFC753E} = {A94F2911-F2EE-4766-932E-2C517D262916}
                 {EF8EE8C4-C778-4523-A6C2-BADEFD105751} = {A94F2911-F2EE-4766-932E-2C517D262916}
-                {59A20266-19E6-4ABD-A43A-6485BA7C1537} = {805F6302-F552-4A31-8AB3-02EEBEE17C32}
-                {31EA52E8-FAAA-4B5E-BC40-4E4E7050E5F1} = {805F6302-F552-4A31-8AB3-02EEBEE17C32}
         EndGlobalSection
 EndGlobal

experimental/TerrainTest/myTerrainTechnique.cpp

@@ -32 +32 @@
         h->setHeight( 0,0, 1000);
 
+        //OpenThreads::Thread::microSleep( 50000 );     / To simulate some complex tile modification.
+
          /*
          ImageLayer* il = dynamic_cast<ImageLayer*>( getTerrainTile()->getColorLayer(0) );
@@ -46 +48 @@
          
     GeometryTechnique::init(dirtyMask, assumeMultiThreaded);
-
-        //OpenThreads::Thread::microSleep( 50000 );     / To simulate some complex tile modification.
 }

experimental/TerrainTest/myTileLoadedCallback.h

@@ -18 +18 @@
          * \brief This function must be implemented. 
          * 
-         * @return : Extrnal layer loding status.
+         * @return : Extrnal layer loading status.
          */ 
         virtual bool deferExternalLayerLoading() const {return true;}
@@ -28 +28 @@
          * 
          * @param tile : Loaded tile.
-         * @param options : Reader writer optins. Defined as interface, but in this class not used.
+         * @param options : Reader writer options. Defined in the base class, but here not used.
          */ 
         virtual void loaded(osgTerrain::TerrainTile* tile, const osgDB::ReaderWriter::Options* options) const {tile->setTerrainTechnique( new T() );}; 

experimental/TerrainTest/osgterrain.cpp

@@ -215 +215 @@
     }
 
-        //osgDB::DatabasePager::create()->setDoPreCompile(true);
-
     osgTerrain::Terrain* terrain = findTopMostNodeOfType<osgTerrain::Terrain>(rootnode);
     if (!terrain)