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

Renamed HeightFieldNode and HeightFieldRenderer to TerrainNode and TerrainTechnique respectively

Browse Source
This commit is contained in:
Robert Osfield
2007-03-14 11:24:04 +00:00
parent bd1d9e33d5
commit c489b0af2c
8 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/osgTerrain/HeightFieldNode → include/osgTerrain/TerrainNode
View File

@@ -11,34 +11,34 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGTERRAIN_HEIGHTFIELDNODE
#define OSGTERRAIN_HEIGHTFIELDNODE 1
#ifndef OSGTERRAIN_TERRAINNODE
#define OSGTERRAIN_TERRAINNODE 1
#include <osg/Group>
#include <osg/Image>
#include <osg/CoordinateSystemNode>
#include <osgTerrain/HeightFieldRenderer>
#include <osgTerrain/TerrainTechnique>
namespace osgTerrain {
/** Terrain provides a framework for loosly coupling height field data with height rendering algorithms.
* This allows renderer's to be pluged in at runtime.*/
class OSGTERRAIN_EXPORT HeightFieldNode : public osg::Group
class OSGTERRAIN_EXPORT TerrainNode : public osg::Group
{
public:
HeightFieldNode();
TerrainNode();
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
HeightFieldNode(const HeightFieldNode&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
TerrainNode(const TerrainNode&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
META_Node(osgTerrain, HeightFieldNode);
META_Node(osgTerrain, TerrainNode);
virtual void traverse(osg::NodeVisitor& nv);
/** Set the HeightField for this HeightFieldNode.
/** Set the HeightField for this TerrainNode.
* If a Renderer is attached then this will be notified.*/
void setHeightField(osg::HeightField* heightField);
@@ -53,13 +53,13 @@ class OSGTERRAIN_EXPORT HeightFieldNode : public osg::Group
void heightFieldHasBeenModified();
/** Set the Renderer*/
void setRenderer(osgTerrain::HeightFieldRenderer* renderer);
void setRenderer(osgTerrain::TerrainTechnique* renderer);
/** Get the Renderer*/
HeightFieldRenderer* getRenderer() { return _renderer.get(); }
TerrainTechnique* getRenderer() { return _renderer.get(); }
/** Get the const Renderer*/
const HeightFieldRenderer* getRenderer() const { return _renderer.get(); }
const TerrainTechnique* getRenderer() const { return _renderer.get(); }
void setBaseTextureImage(osg::Image* image) { _baseTextureImage = image; }
@@ -83,11 +83,11 @@ class OSGTERRAIN_EXPORT HeightFieldNode : public osg::Group
protected:
virtual ~HeightFieldNode();
virtual ~TerrainNode();
osg::ref_ptr<osg::HeightField> _heightField;
osg::ref_ptr<HeightFieldRenderer> _renderer;
osg::ref_ptr<TerrainTechnique> _renderer;
osg::ref_ptr<osg::Image> _baseTextureImage;
osg::ref_ptr<osg::Image> _detailTextureImage;

22
include/osgTerrain/HeightFieldRenderer → include/osgTerrain/TerrainTechnique
View File

@@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGTERRAIN_HEIGHTFIELDHeightFieldRenderer
#define OSGTERRAIN_HEIGHTFIELDHeightFieldRenderer 1
#ifndef OSGTERRAIN_TERRAINTECHNIQUE
#define OSGTERRAIN_TERRAINTECHNIQUE 1
#include <osg/Object>
@@ -23,19 +23,19 @@
namespace osgTerrain {
class HeightFieldNode;
class TerrainNode;
class OSGTERRAIN_EXPORT HeightFieldRenderer : public osg::Object
class OSGTERRAIN_EXPORT TerrainTechnique : public osg::Object
{
public:
HeightFieldRenderer();
TerrainTechnique();
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
HeightFieldRenderer(const HeightFieldRenderer&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
TerrainTechnique(const TerrainTechnique&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
HeightFieldNode* getHeightFieldNode() { return _heightFieldNode; }
const HeightFieldNode* getHeightFieldNode() const { return _heightFieldNode; }
TerrainNode* getTerrainNode() { return _terrainNode; }
const TerrainNode* getTerrainNode() const { return _terrainNode; }
virtual void initialize() = 0;
@@ -47,11 +47,11 @@ class OSGTERRAIN_EXPORT HeightFieldRenderer : public osg::Object
protected:
virtual ~HeightFieldRenderer();
virtual ~TerrainTechnique();
friend class osgTerrain::HeightFieldNode;
friend class osgTerrain::TerrainNode;
HeightFieldNode* _heightFieldNode;
TerrainNode* _terrainNode;
};