diff --git a/VisualStudio/osgTerrain/osgTerrain.dsp b/VisualStudio/osgTerrain/osgTerrain.dsp index b4f919419..b75506e92 100644 --- a/VisualStudio/osgTerrain/osgTerrain.dsp +++ b/VisualStudio/osgTerrain/osgTerrain.dsp @@ -155,11 +155,11 @@ LIB32=link.exe -lib # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\..\src\osgTerrain\HeightFieldNode.cpp +SOURCE=..\..\src\osgTerrain\TerrainNode.cpp # End Source File # Begin Source File -SOURCE=..\..\src\osgTerrain\HeightFieldRenderer.cpp +SOURCE=..\..\src\osgTerrain\TerrainTechnique.cpp # End Source File # Begin Source File @@ -175,7 +175,11 @@ SOURCE=..\..\include\osgTerrain\Export # End Source File # Begin Source File -SOURCE=..\..\include\osgTerrain\HeightFieldNode +SOURCE=..\..\include\osgTerrain\TerrainNode +# End Source File +# Begin Source File + +SOURCE=..\..\include\osgTerrain\TerrainTechnique # End Source File # Begin Source File diff --git a/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj b/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj index b79d38e63..f42665b53 100644 --- a/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj +++ b/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj @@ -482,8 +482,8 @@ 000A28FF06CAFE60009EE43A /* osgprerender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 000A28FC06CAFE5F009EE43A /* osgprerender.cpp */; }; 000A291106CAFF80009EE43A /* osgprerendercubemap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 000A290E06CAFF7F009EE43A /* osgprerendercubemap.cpp */; }; 000A291F06CB0128009EE43A /* osgreflect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 000A291C06CB0127009EE43A /* osgreflect.cpp */; }; - 001852A0078C583400D3FC44 /* HeightFieldNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0018529C078C583000D3FC44 /* HeightFieldNode.cpp */; }; - 001852A1078C583400D3FC44 /* HeightFieldRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0018529D078C583200D3FC44 /* HeightFieldRenderer.cpp */; }; + 001852A0078C583400D3FC44 /* TerrainNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0018529C078C583000D3FC44 /* TerrainNode.cpp */; }; + 001852A1078C583400D3FC44 /* TerrainTechnique.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0018529D078C583200D3FC44 /* TerrainTechnique.cpp */; }; 001852A2078C583400D3FC44 /* Version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0018529E078C583300D3FC44 /* Version.cpp */; }; 001D0006065AA4BD003310BF /* atmosphere.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 001DFFD9065AA4BD003310BF /* atmosphere.cpp */; }; 001D0007065AA4BD003310BF /* atmosphere.h in Headers */ = {isa = PBXBuildFile; fileRef = 001DFFDA065AA4BD003310BF /* atmosphere.h */; }; @@ -1587,8 +1587,8 @@ 009DA001081D78E7001FA987 /* MultiTextureControl in Headers */ = {isa = PBXBuildFile; fileRef = 009D9FFF081D78C4001FA987 /* MultiTextureControl */; settings = {ATTRIBUTES = (Public, ); }; }; 009DA003081D7900001FA987 /* MultiTextureControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 009DA002081D7900001FA987 /* MultiTextureControl.cpp */; }; 009DA015081D7999001FA987 /* Export in Headers */ = {isa = PBXBuildFile; fileRef = 0018528A078C57A100D3FC44 /* Export */; settings = {ATTRIBUTES = (Public, ); }; }; - 009DA016081D7999001FA987 /* HeightFieldNode in Headers */ = {isa = PBXBuildFile; fileRef = 0018528B078C57A300D3FC44 /* HeightFieldNode */; settings = {ATTRIBUTES = (Public, ); }; }; - 009DA017081D7999001FA987 /* HeightFieldRenderer in Headers */ = {isa = PBXBuildFile; fileRef = 0018528C078C57A400D3FC44 /* HeightFieldRenderer */; settings = {ATTRIBUTES = (Public, ); }; }; + 009DA016081D7999001FA987 /* TerrainNode in Headers */ = {isa = PBXBuildFile; fileRef = 0018528B078C57A300D3FC44 /* TerrainNode */; settings = {ATTRIBUTES = (Public, ); }; }; + 009DA017081D7999001FA987 /* TerrainTechnique in Headers */ = {isa = PBXBuildFile; fileRef = 0018528C078C57A400D3FC44 /* TerrainTechnique */; settings = {ATTRIBUTES = (Public, ); }; }; 009DA018081D7999001FA987 /* Version in Headers */ = {isa = PBXBuildFile; fileRef = 0018528D078C57A500D3FC44 /* Version */; settings = {ATTRIBUTES = (Public, ); }; }; 009DA0CB081D7AB7001FA987 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1182CF05D64A5900EB53E5 /* OpenGL.framework */; }; 009DA0CC081D7AB7001FA987 /* osg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE117FB305D63B3800EB53E5 /* osg.framework */; }; @@ -4830,11 +4830,11 @@ 000A290E06CAFF7F009EE43A /* osgprerendercubemap.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = osgprerendercubemap.cpp; sourceTree = ""; }; 000A291C06CB0127009EE43A /* osgreflect.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = osgreflect.cpp; sourceTree = ""; }; 0018528A078C57A100D3FC44 /* Export */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Export; path = ../../include/osgTerrain/Export; sourceTree = SOURCE_ROOT; }; - 0018528B078C57A300D3FC44 /* HeightFieldNode */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = HeightFieldNode; path = ../../include/osgTerrain/HeightFieldNode; sourceTree = SOURCE_ROOT; }; - 0018528C078C57A400D3FC44 /* HeightFieldRenderer */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = HeightFieldRenderer; path = ../../include/osgTerrain/HeightFieldRenderer; sourceTree = SOURCE_ROOT; }; + 0018528B078C57A300D3FC44 /* TerrainNode */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = TerrainNode; path = ../../include/osgTerrain/TerrainNode; sourceTree = SOURCE_ROOT; }; + 0018528C078C57A400D3FC44 /* TerrainTechnique */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = TerrainTechnique; path = ../../include/osgTerrain/TerrainTechnique; sourceTree = SOURCE_ROOT; }; 0018528D078C57A500D3FC44 /* Version */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Version; path = ../../include/osgTerrain/Version; sourceTree = SOURCE_ROOT; }; - 0018529C078C583000D3FC44 /* HeightFieldNode.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = HeightFieldNode.cpp; path = ../../src/osgTerrain/HeightFieldNode.cpp; sourceTree = SOURCE_ROOT; }; - 0018529D078C583200D3FC44 /* HeightFieldRenderer.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = HeightFieldRenderer.cpp; path = ../../src/osgTerrain/HeightFieldRenderer.cpp; sourceTree = SOURCE_ROOT; }; + 0018529C078C583000D3FC44 /* TerrainNode.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = TerrainNode.cpp; path = ../../src/osgTerrain/TerrainNode.cpp; sourceTree = SOURCE_ROOT; }; + 0018529D078C583200D3FC44 /* TerrainTechnique.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = TerrainTechnique.cpp; path = ../../src/osgTerrain/TerrainTechnique.cpp; sourceTree = SOURCE_ROOT; }; 0018529E078C583300D3FC44 /* Version.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = Version.cpp; path = ../../src/osgTerrain/Version.cpp; sourceTree = SOURCE_ROOT; }; 001D0000065AA4BD003310BF /* tracks.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = tracks.h; path = ../../src/osgPlugins/lib3ds/tracks.h; sourceTree = SOURCE_ROOT; }; 001D0001065AA4BD003310BF /* types.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = types.h; path = ../../src/osgPlugins/lib3ds/types.h; sourceTree = SOURCE_ROOT; }; @@ -10784,8 +10784,8 @@ 6320CCFE07845B7C00FE3D2C /* osgTerrain */ = { isa = PBXGroup; children = ( - 0018529C078C583000D3FC44 /* HeightFieldNode.cpp */, - 0018529D078C583200D3FC44 /* HeightFieldRenderer.cpp */, + 0018529C078C583000D3FC44 /* TerrainNode.cpp */, + 0018529D078C583200D3FC44 /* TerrainTechnique.cpp */, 0018529E078C583300D3FC44 /* Version.cpp */, ); name = osgTerrain; @@ -12748,8 +12748,8 @@ buildActionMask = 2147483647; files = ( 009DA015081D7999001FA987 /* Export in Headers */, - 009DA016081D7999001FA987 /* HeightFieldNode in Headers */, - 009DA017081D7999001FA987 /* HeightFieldRenderer in Headers */, + 009DA016081D7999001FA987 /* TerrainNode in Headers */, + 009DA017081D7999001FA987 /* TerrainTechnique in Headers */, 009DA018081D7999001FA987 /* Version in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -18410,8 +18410,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 001852A0078C583400D3FC44 /* HeightFieldNode.cpp in Sources */, - 001852A1078C583400D3FC44 /* HeightFieldRenderer.cpp in Sources */, + 001852A0078C583400D3FC44 /* TerrainNode.cpp in Sources */, + 001852A1078C583400D3FC44 /* TerrainTechnique.cpp in Sources */, 001852A2078C583400D3FC44 /* Version.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/include/osgTerrain/HeightFieldNode b/include/osgTerrain/TerrainNode similarity index 81% rename from include/osgTerrain/HeightFieldNode rename to include/osgTerrain/TerrainNode index 20cdf0b89..737cdccff 100644 --- a/include/osgTerrain/HeightFieldNode +++ b/include/osgTerrain/TerrainNode @@ -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 #include #include -#include +#include 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 _heightField; - osg::ref_ptr _renderer; + osg::ref_ptr _renderer; osg::ref_ptr _baseTextureImage; osg::ref_ptr _detailTextureImage; diff --git a/include/osgTerrain/HeightFieldRenderer b/include/osgTerrain/TerrainTechnique similarity index 64% rename from include/osgTerrain/HeightFieldRenderer rename to include/osgTerrain/TerrainTechnique index 6c5cb196e..9e037676f 100644 --- a/include/osgTerrain/HeightFieldRenderer +++ b/include/osgTerrain/TerrainTechnique @@ -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 @@ -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; }; diff --git a/src/osgTerrain/CMakeLists.txt b/src/osgTerrain/CMakeLists.txt index 6fecbea95..ccce12362 100644 --- a/src/osgTerrain/CMakeLists.txt +++ b/src/osgTerrain/CMakeLists.txt @@ -8,8 +8,8 @@ SET(LIB_NAME osgTerrain) SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME}) SET(LIB_PUBLIC_HEADERS ${HEADER_PATH}/Export - ${HEADER_PATH}/HeightFieldNode - ${HEADER_PATH}/HeightFieldRenderer + ${HEADER_PATH}/TerrainNode + ${HEADER_PATH}/TerrainTechnique ${HEADER_PATH}/Version ) @@ -17,8 +17,8 @@ SET(LIB_PUBLIC_HEADERS ADD_LIBRARY(${LIB_NAME} ${OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC} ${LIB_PUBLIC_HEADERS} - HeightFieldNode.cpp - HeightFieldRenderer.cpp + TerrainNode.cpp + TerrainTechnique.cpp Version.cpp ) diff --git a/src/osgTerrain/GNUmakefile b/src/osgTerrain/GNUmakefile index 9cd04ec06..ba1e2c471 100644 --- a/src/osgTerrain/GNUmakefile +++ b/src/osgTerrain/GNUmakefile @@ -3,13 +3,13 @@ include $(TOPDIR)/Make/makedefs CXXFILES = \ - HeightFieldNode.cpp\ - HeightFieldRenderer.cpp\ + TerrainNode.cpp\ + TerrainTechnique.cpp\ Version.cpp\ DEF += -DOSGTERRAIN_LIBRARY -LIBS += -losgFX -losgDB -losgUtil -losg $(GL_LIBS) $(OTHER_LIBS) +LIBS += -losgDB -losgUtil -losg $(GL_LIBS) $(OTHER_LIBS) TARGET_BASENAME = osgTerrain LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT) diff --git a/src/osgTerrain/HeightFieldNode.cpp b/src/osgTerrain/TerrainNode.cpp similarity index 100% rename from src/osgTerrain/HeightFieldNode.cpp rename to src/osgTerrain/TerrainNode.cpp diff --git a/src/osgTerrain/HeightFieldRenderer.cpp b/src/osgTerrain/TerrainTechnique.cpp similarity index 100% rename from src/osgTerrain/HeightFieldRenderer.cpp rename to src/osgTerrain/TerrainTechnique.cpp