FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed osgTerrain::TerrainSystem to osgTerrain::Terrain

Browse Source
This commit is contained in:
Robert Osfield
2008-03-27 11:55:03 +00:00
parent 35c5bd2c92
commit 6396a156a2
12 changed files with 75 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/osgTerrain/TerrainSystem → include/osgTerrain/Terrain
View File

@@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGTERRAINSYSTEM
#define OSGTERRAINSYSTEM 1
#ifndef OSGTerrain
#define OSGTerrain 1
#include <osg/Group>
#include <osg/CoordinateSystemNode>
@@ -21,23 +21,23 @@
namespace osgTerrain {
/** TerrainSystem provides a framework for loosely coupling height field data with height rendering algorithms.
/** Terrain provides a framework for loosely coupling height field data with height rendering algorithms.
* This allows TerrainTechnique's to be plugged in at runtime.*/
class OSGTERRAIN_EXPORT TerrainSystem : public osg::Group
class OSGTERRAIN_EXPORT Terrain : public osg::Group
{
public:
TerrainSystem();
Terrain();
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
TerrainSystem(const TerrainSystem&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
Terrain(const Terrain&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
META_Node(osgTerrain, TerrainSystem);
META_Node(osgTerrain, Terrain);
virtual void traverse(osg::NodeVisitor& nv);
/** Set the TerrainTechnique that is used as the prototype for all Terrain below the TerrainSystem. */
/** Set the TerrainTechnique that is used as the prototype for all Terrain below the Terrain. */
void setTerrainTechnique(osgTerrain::TerrainTechnique* TerrainTechnique);
/** Get the TerrainTechnique*/
@@ -48,7 +48,7 @@ class OSGTERRAIN_EXPORT TerrainSystem : public osg::Group
protected:
virtual ~TerrainSystem();
virtual ~Terrain();
osg::ref_ptr<TerrainTechnique> _terrainTechnique;

10
include/osgTerrain/TerrainTechnique
View File

@@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGTERRAIN_terrainTECHNIQUE
#define OSGTERRAIN_terrainTECHNIQUE 1
#ifndef OSGTERRAIN_terrainTileTECHNIQUE
#define OSGTERRAIN_terrainTileTECHNIQUE 1
#include <osg/Object>
@@ -36,8 +36,8 @@ class OSGTERRAIN_EXPORT TerrainTechnique : public osg::Object
META_Object(osgTerrain, TerrainTechnique);
TerrainTile* getTerrainTile() { return _terrain; }
const TerrainTile* getTerrainTile() const { return _terrain; }
TerrainTile* getTerrainTile() { return _terrainTile; }
const TerrainTile* getTerrainTile() const { return _terrainTile; }
virtual void init();
@@ -63,7 +63,7 @@ class OSGTERRAIN_EXPORT TerrainTechnique : public osg::Object
friend class osgTerrain::TerrainTile;
TerrainTile* _terrain;
TerrainTile* _terrainTile;
bool _dirty;
};

16
include/osgTerrain/TerrainTile
View File

@@ -23,7 +23,7 @@
namespace osgTerrain {
class TerrainSystem;
class Terrain;
class TileID
{
@@ -73,14 +73,14 @@ class OSGTERRAIN_EXPORT TerrainTile : public osg::Group
void init();
/** Set the TerrainSystem that this Terrain tile is a member of.*/
void setTerrainSystem(TerrainSystem* ts) { _terrainSystem = ts; }
/** Set the Terrain that this Terrain tile is a member of.*/
void setTerrain(Terrain* ts) { _terrain = ts; }
/** Get the TerrainSystem that this Terrain tile is a member of.*/
TerrainSystem* getTerrainSystem() { return _terrainSystem; }
/** Get the Terrain that this Terrain tile is a member of.*/
Terrain* getTerrain() { return _terrain; }
/** Get the const TerrainSystem that this Terrain tile is a member of.*/
const TerrainSystem* getTerrainSystem() const { return _terrainSystem; }
/** Get the const Terrain that this Terrain tile is a member of.*/
const Terrain* getTerrain() const { return _terrain; }
void setTileID(const TileID& tileID) { _tileID = tileID; }
@@ -156,7 +156,7 @@ class OSGTERRAIN_EXPORT TerrainTile : public osg::Group
typedef std::vector< osg::ref_ptr<Layer> > Layers;
TerrainSystem* _terrainSystem;
Terrain* _terrain;
bool _hasBeenTraversal;