Change Terrain so that it subclassed from CoordinateSystemNode.
Implemented new update scheme of GeometryTechnique to avoid potential threading issues. Added Terrain support to .ive.
This commit is contained in:
@@ -34,7 +34,7 @@ class OSGTERRAIN_EXPORT GeometryTechnique : public TerrainTechnique
|
||||
|
||||
META_Object(osgTerrain, GeometryTechnique);
|
||||
|
||||
virtual void init();
|
||||
virtual void init(int dirtyMask, bool assumeMultiThreaded);
|
||||
|
||||
virtual Locator* computeMasterLocator();
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
#ifndef OSGTerrain
|
||||
#define OSGTerrain 1
|
||||
|
||||
#include <osg/Group>
|
||||
#include <osg/CoordinateSystemNode>
|
||||
|
||||
#include <osgTerrain/TerrainTile>
|
||||
@@ -23,7 +22,7 @@ namespace osgTerrain {
|
||||
|
||||
/** Terrain provides a framework for loosely coupling height field data with height rendering algorithms.
|
||||
* This allows TerrainTechniques to be plugged in at runtime.*/
|
||||
class OSGTERRAIN_EXPORT Terrain : public osg::Group
|
||||
class OSGTERRAIN_EXPORT Terrain : public osg::CoordinateSystemNode
|
||||
{
|
||||
public:
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ class OSGTERRAIN_EXPORT TerrainTechnique : public osg::Object, public osg::Obser
|
||||
TerrainTile* getTerrainTile() { return _terrainTile; }
|
||||
const TerrainTile* getTerrainTile() const { return _terrainTile; }
|
||||
|
||||
virtual void init();
|
||||
virtual void init(int dirtyMask, bool assumeMultiThreaded);
|
||||
|
||||
virtual void update(osgUtil::UpdateVisitor* nv);
|
||||
|
||||
|
||||
@@ -78,8 +78,7 @@ class OSGTERRAIN_EXPORT TerrainTile : public osg::Group
|
||||
virtual void traverse(osg::NodeVisitor& nv);
|
||||
|
||||
/** Call init on any attached TerrainTechnique.*/
|
||||
void init();
|
||||
|
||||
void init(int dirtyMask, bool assumeMultiThreaded);
|
||||
|
||||
/** Set the Terrain that this Terrain tile is a member of.*/
|
||||
void setTerrain(Terrain* ts);
|
||||
|
||||
Reference in New Issue
Block a user