Changeset 276

Timestamp:

Mar 20, 2011, 1:50:24 PM (14 years ago)

Author:

Torben Dannhauer

Message:

 

Location:

experimental/TerrainTest

Files:

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

experimental/TerrainTest/ModificationManager.cpp

@@ -53 +53 @@
         terrain->setTerrainTechniquePrototype( geomTechnique );
 #ifdef USE_TERRAIN_PROTO_WORKAROUND
-        osg::ref_ptr<osgTerrain::myTileLoadedCallback> tlcb = new osgTerrain::myTileLoadedCallback( terrain);
+        osg::ref_ptr<osgTerrain::GeometryTechniquePrototypeWorkaroundTLC> tlcb = new osgTerrain::GeometryTechniquePrototypeWorkaroundTLC();
         osgTerrain::TerrainTile::setTileLoadedCallback(tlcb);
 #endif

experimental/TerrainTest/myTileLoadedCallback.h

@@ -1 +1 @@
 #pragma once
 #include <osgTerrain/TerrainTile>
-#include "myTerrainTechnique.h"
 
 
 namespace osgTerrain {
 
-class  myTileLoadedCallback : public TerrainTile::TileLoadedCallback
+template <class T>
+class  GeometryTechniquePrototypeWorkaroundTLC : public TerrainTile::TileLoadedCallback
 {
 public:
         //! Constructor: Nothing to do.
-        myTileLoadedCallback() {};
+        GeometryTechniquePrototypeWorkaroundTLC() {};
 
         //! Destructor: Nothing to do.
-        virtual ~myTileLoadedCallback() {};
+        virtual ~GeometryTechniquePrototypeWorkaroundTLC() {};
 
         /**
@@ -30 +30 @@
          * @param options : Reader writer optins. Defined as interface, but in this class not used.
          */ 
-        virtual void loaded(osgTerrain::TerrainTile* tile, const osgDB::ReaderWriter::Options* options) const {tile->setTerrainTechnique( new osgTerrain::myTerrainTechnique() );}; 
+        virtual void loaded(osgTerrain::TerrainTile* tile, const osgDB::ReaderWriter::Options* options) const {tile->setTerrainTechnique( new T() );}; 
 };
 

experimental/TerrainTest/osgterrain.cpp

@@ -234 +234 @@
 
         // Use Tile load Callback
-        osg::ref_ptr<osgTerrain::myTileLoadedCallback> tlcb = new osgTerrain::myTileLoadedCallback();
+        osg::ref_ptr<osgTerrain::GeometryTechniquePrototypeWorkaroundTLC<osgTerrain::myTerrainTechnique> > tlcb = new osgTerrain::GeometryTechniquePrototypeWorkaroundTLC<osgTerrain::myTerrainTechnique>();
         osgTerrain::TerrainTile::setTileLoadedCallback(tlcb);