Build fixes

This commit is contained in:
Robert Osfield
2007-03-19 10:54:39 +00:00
parent 794553700f
commit 32166ca631
2 changed files with 28 additions and 88 deletions

View File

@@ -19,11 +19,12 @@
#include <osg/CoordinateSystemNode>
#include <osgTerrain/TerrainTechnique>
#include <osgTerrain/Layer>
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.*/
* This allows TerrainTechnique's to be pluged in at runtime.*/
class OSGTERRAIN_EXPORT TerrainNode : public osg::Group
{
public:
@@ -38,62 +39,30 @@ class OSGTERRAIN_EXPORT TerrainNode : public osg::Group
virtual void traverse(osg::NodeVisitor& nv);
/** Set the HeightField for this TerrainNode.
* If a Renderer is attached then this will be notified.*/
void setHeightField(osg::HeightField* heightField);
/** Set the TerrainTechnique*/
void setTerrainTechnique(osgTerrain::TerrainTechnique* TerrainTechnique);
/** Get the HeightField.*/
osg::HeightField* getHeightField() { return _heightField.get(); }
/** Get the TerrainTechnique*/
TerrainTechnique* getTerrainTechnique() { return _terrainTechnique.get(); }
/** Get the const HeightField.*/
const osg::HeightField* getHeightField() const { return _heightField.get(); }
/** Tell the Renderer that the height field has been modified, so
* that any cached data will need updating*/
void heightFieldHasBeenModified();
/** Set the Renderer*/
void setRenderer(osgTerrain::TerrainTechnique* renderer);
/** Get the const TerrainTechnique*/
const TerrainTechnique* getTerrainTechnique() const { return _terrainTechnique.get(); }
/** Get the Renderer*/
TerrainTechnique* getRenderer() { return _renderer.get(); }
/** Get the const Renderer*/
const TerrainTechnique* getRenderer() const { return _renderer.get(); }
void setHeightLayer(osgTerrain::Layer* layer);
osgTerrain::Layer* getHeightLayer();
void setBaseTextureImage(osg::Image* image) { _baseTextureImage = image; }
osg::Image* getBaseTextureImage() { return _baseTextureImage.get(); }
const osg::Image* getBaseTextureImage() const { return _baseTextureImage.get(); }
void setDetailTextureImage(osg::Image* image) { _detailTextureImage = image; }
osg::Image* getDetailTextureImage() { return _detailTextureImage.get(); }
const osg::Image* getDetailTextureImage() const { return _detailTextureImage.get(); }
void setCloudShadowTextureImage(osg::Image* image) { _cloudShadowTextureImage = image; }
osg::Image* getCloudShadowTextureImage() { return _cloudShadowTextureImage.get(); }
const osg::Image* getCloudShadowTextureImage() const { return _cloudShadowTextureImage.get(); }
void setNormalMapImage(osg::Image* image) { _normalMapImage = image ; }
osg::Image* getNormalMapImage() { return _normalMapImage.get(); }
const osg::Image* getNormalMapImage() const { return _normalMapImage.get(); }
void computeNormalMap();
void addColorLayer(osgTerrain::Layer* layer);
void removeColorLayer(osgTerrain::Layer* layer);
protected:
virtual ~TerrainNode();
osg::ref_ptr<osg::HeightField> _heightField;
osg::ref_ptr<TerrainTechnique> _renderer;
osg::ref_ptr<osg::Image> _baseTextureImage;
osg::ref_ptr<osg::Image> _detailTextureImage;
osg::ref_ptr<osg::Image> _cloudShadowTextureImage;
osg::ref_ptr<osg::Image> _normalMapImage;
osg::ref_ptr<TerrainTechnique> _terrainTechnique;
osg::ref_ptr<Layer> _heightLayer;
};
}