From 35c5bd2c92662ff04f600eaad0d316a422ce96f2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 27 Mar 2008 10:55:39 +0000 Subject: [PATCH] Renamed Terrain to TerrainTile --- examples/osgterrain/osgterrain.cpp | 24 ++++---- include/osgTerrain/TerrainSystem | 8 +-- include/osgTerrain/TerrainTechnique | 10 ++-- include/osgTerrain/{Terrain => TerrainTile} | 16 ++--- include/osgTerrain/TileSystem | 4 +- src/osgPlugins/ive/CMakeLists.txt | 4 +- src/osgPlugins/ive/CompositeLayer.h | 2 +- src/osgPlugins/ive/DataInputStream.cpp | 8 +-- src/osgPlugins/ive/DataInputStream.h | 2 +- src/osgPlugins/ive/DataOutputStream.cpp | 6 +- src/osgPlugins/ive/DataOutputStream.h | 2 +- src/osgPlugins/ive/HeightFieldLayer.h | 2 +- src/osgPlugins/ive/ImageLayer.h | 3 +- src/osgPlugins/ive/Layer.h | 2 +- src/osgPlugins/ive/ReadWrite.h | 3 +- .../ive/{Terrain.cpp => TerrainTile.cpp} | 14 ++--- .../ive/{Terrain.h => TerrainTile.h} | 8 +-- src/osgPlugins/osgTerrain/CMakeLists.txt | 2 +- src/osgPlugins/osgTerrain/Locator.cpp | 2 +- .../osgTerrain/ReaderWriterOsgTerrain.cpp | 2 +- .../{Terrain.cpp => TerrainTile.cpp} | 60 +++++++++---------- src/osgTerrain/CMakeLists.txt | 4 +- src/osgTerrain/GeometryTechnique.cpp | 2 +- src/osgTerrain/TerrainTechnique.cpp | 2 +- .../{Terrain.cpp => TerrainTile.cpp} | 23 ++++--- 25 files changed, 105 insertions(+), 110 deletions(-) rename include/osgTerrain/{Terrain => TerrainTile} (94%) rename src/osgPlugins/ive/{Terrain.cpp => TerrainTile.cpp} (89%) rename src/osgPlugins/ive/{Terrain.h => TerrainTile.h} (86%) rename src/osgPlugins/osgTerrain/{Terrain.cpp => TerrainTile.cpp} (85%) rename src/osgTerrain/{Terrain.cpp => TerrainTile.cpp} (85%) diff --git a/examples/osgterrain/osgterrain.cpp b/examples/osgterrain/osgterrain.cpp index b5f99f6d5..990694e6f 100644 --- a/examples/osgterrain/osgterrain.cpp +++ b/examples/osgterrain/osgterrain.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include @@ -634,7 +634,7 @@ int main(int argc, char** argv) } - osg::ref_ptr terrain = new osgTerrain::Terrain; + osg::ref_ptr terrainTile = new osgTerrain::TerrainTile; osg::ref_ptr locator = new osgTerrain::Locator; osg::ref_ptr validDataOperator = new osgTerrain::NoDataValue(0.0); osg::ref_ptr lastAppliedLayer; @@ -667,7 +667,7 @@ int main(int argc, char** argv) else if (arguments.read(pos, "-b")) { - terrain->setTreatBoundariesToValidDataAsDefaultValue(true); + terrainTile->setTreatBoundariesToValidDataAsDefaultValue(true); } else if (arguments.read(pos, "-e",x,y,w,h)) @@ -712,7 +712,7 @@ int main(int argc, char** argv) hfl->transform(offset,scale); } - terrain->setElevationLayer(hfl.get()); + terrainTile->setElevationLayer(hfl.get()); lastAppliedLayer = hfl.get(); @@ -747,7 +747,7 @@ int main(int argc, char** argv) imageLayer->transform(offset,scale); } - terrain->setElevationLayer(imageLayer.get()); + terrainTile->setElevationLayer(imageLayer.get()); lastAppliedLayer = imageLayer.get(); @@ -782,7 +782,7 @@ int main(int argc, char** argv) imageLayer->transform(offset,scale); } - terrain->setColorLayer(layerNum, imageLayer.get()); + terrainTile->setColorLayer(layerNum, imageLayer.get()); lastAppliedLayer = imageLayer.get(); @@ -817,9 +817,9 @@ int main(int argc, char** argv) osg::notify(osg::NOTICE)<<"--filter "<getColorLayer(layerNum)) + if (terrainTile->getColorLayer(layerNum)) { - terrain->getColorLayer(layerNum)->setFilter(filter); + terrainTile->getColorLayer(layerNum)->setFilter(filter); } } @@ -842,7 +842,7 @@ int main(int argc, char** argv) osg::notify(osg::NOTICE)<<"--tf "<setColorLayer(layerNum, new osgTerrain::ContourLayer(tf.get())); + terrainTile->setColorLayer(layerNum, new osgTerrain::ContourLayer(tf.get())); } else { @@ -854,14 +854,14 @@ int main(int argc, char** argv) osg::ref_ptr scene = new osg::Group; - if (terrain.valid() && (terrain->getElevationLayer() || terrain->getColorLayer(0))) + if (terrainTile.valid() && (terrainTile->getElevationLayer() || terrainTile->getColorLayer(0))) { osg::notify(osg::NOTICE)<<"Terrain created"<addChild(terrain.get()); + scene->addChild(terrainTile.get()); osg::ref_ptr geometryTechnique = new osgTerrain::GeometryTechnique; - terrain->setTerrainTechnique(geometryTechnique.get()); + terrainTile->setTerrainTechnique(geometryTechnique.get()); viewer.addEventHandler(new FilterHandler(geometryTechnique.get())); viewer.addEventHandler(new LayerHandler(lastAppliedLayer.get())); } diff --git a/include/osgTerrain/TerrainSystem b/include/osgTerrain/TerrainSystem index 9e32c4c96..f842a832e 100644 --- a/include/osgTerrain/TerrainSystem +++ b/include/osgTerrain/TerrainSystem @@ -17,7 +17,7 @@ #include #include -#include +#include namespace osgTerrain { @@ -50,14 +50,8 @@ class OSGTERRAIN_EXPORT TerrainSystem : public osg::Group virtual ~TerrainSystem(); - friend class TerrainManager; - - void registerPotentialMember(Terrain* terrain); - osg::ref_ptr _terrainTechnique; - typedef std::list< osg::observer_ptr > TerrainList; - TerrainList _incomingTerrain; }; diff --git a/include/osgTerrain/TerrainTechnique b/include/osgTerrain/TerrainTechnique index 09c106176..3eded6df1 100644 --- a/include/osgTerrain/TerrainTechnique +++ b/include/osgTerrain/TerrainTechnique @@ -23,7 +23,7 @@ namespace osgTerrain { -class Terrain; +class TerrainTile; class OSGTERRAIN_EXPORT TerrainTechnique : public osg::Object { @@ -36,8 +36,8 @@ class OSGTERRAIN_EXPORT TerrainTechnique : public osg::Object META_Object(osgTerrain, TerrainTechnique); - Terrain* getTerrain() { return _terrain; } - const Terrain* getTerrain() const { return _terrain; } + TerrainTile* getTerrainTile() { return _terrain; } + const TerrainTile* getTerrainTile() const { return _terrain; } virtual void init(); @@ -61,9 +61,9 @@ class OSGTERRAIN_EXPORT TerrainTechnique : public osg::Object virtual ~TerrainTechnique(); - friend class osgTerrain::Terrain; + friend class osgTerrain::TerrainTile; - Terrain* _terrain; + TerrainTile* _terrain; bool _dirty; }; diff --git a/include/osgTerrain/Terrain b/include/osgTerrain/TerrainTile similarity index 94% rename from include/osgTerrain/Terrain rename to include/osgTerrain/TerrainTile index fa7a43ec1..4177754a2 100644 --- a/include/osgTerrain/Terrain +++ b/include/osgTerrain/TerrainTile @@ -11,8 +11,8 @@ * OpenSceneGraph Public License for more details. */ -#ifndef OSGTERRAIN_TERRAIN -#define OSGTERRAIN_TERRAIN 1 +#ifndef OSGTERRAIN_TERRAINTILE +#define OSGTERRAIN_TERRAINTILE 1 #include #include @@ -56,16 +56,16 @@ class TileID /** 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 Terrain : public osg::Group +class OSGTERRAIN_EXPORT TerrainTile : public osg::Group { public: - Terrain(); + TerrainTile(); /** Copy constructor using CopyOp to manage deep vs shallow copy.*/ - Terrain(const Terrain&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); + TerrainTile(const TerrainTile&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); - META_Node(osgTerrain, Terrain); + META_Node(osgTerrain, TerrainTile); virtual void traverse(osg::NodeVisitor& nv); @@ -120,7 +120,7 @@ class OSGTERRAIN_EXPORT Terrain : public osg::Group /** Set a color layer with specified layer number.*/ - void setColorLayer(unsigned int i, osgTerrain::Layer* layer); + void setColorLayer(unsigned int i, Layer* layer); /** Get color layer with specified layer number.*/ Layer* getColorLayer(unsigned int i) { return i<_colorLayers.size() ? _colorLayers[i].get() : 0; } @@ -151,7 +151,7 @@ class OSGTERRAIN_EXPORT Terrain : public osg::Group protected: - virtual ~Terrain(); + virtual ~TerrainTile(); typedef std::vector< osg::ref_ptr > Layers; diff --git a/include/osgTerrain/TileSystem b/include/osgTerrain/TileSystem index 44b127a18..ab4b8bca1 100644 --- a/include/osgTerrain/TileSystem +++ b/include/osgTerrain/TileSystem @@ -14,7 +14,7 @@ #ifndef OSGTERRAIN_TILESYSTEM #define OSGTERRAIN_TILESYSTEM 1 -#include +#include #include #include @@ -36,7 +36,7 @@ class OSGTERRAIN_EXPORT TileSystem : public osg::Object virtual ~TileSystem(); - typedef std::map< TileID, osg::observer_ptr > TileMap; + typedef std::map< TileID, osg::observer_ptr > TileMap; TileMap _tileMap; }; diff --git a/src/osgPlugins/ive/CMakeLists.txt b/src/osgPlugins/ive/CMakeLists.txt index 04ab4dfff..02769b584 100644 --- a/src/osgPlugins/ive/CMakeLists.txt +++ b/src/osgPlugins/ive/CMakeLists.txt @@ -91,7 +91,7 @@ SET(TARGET_SRC Texture3D.cpp TextureCubeMap.cpp TextureRectangle.cpp - Terrain.cpp + TerrainTile.cpp Locator.cpp Layer.cpp HeightFieldLayer.cpp @@ -194,7 +194,7 @@ SET(TARGET_H Texture3D.h TextureCubeMap.h TextureRectangle.h - Terrain.h + TerrainTile.h Transform.h Locator.h Layer.h diff --git a/src/osgPlugins/ive/CompositeLayer.h b/src/osgPlugins/ive/CompositeLayer.h index de82457e7..63425f3b9 100644 --- a/src/osgPlugins/ive/CompositeLayer.h +++ b/src/osgPlugins/ive/CompositeLayer.h @@ -1,7 +1,7 @@ #ifndef IVE_COMPOSITELAYER #define IVE_COMPOSITELAYER 1 -#include +#include #include "ReadWrite.h" namespace ive diff --git a/src/osgPlugins/ive/DataInputStream.cpp b/src/osgPlugins/ive/DataInputStream.cpp index f347585da..b9e4338cf 100644 --- a/src/osgPlugins/ive/DataInputStream.cpp +++ b/src/osgPlugins/ive/DataInputStream.cpp @@ -89,7 +89,7 @@ #include "Text.h" -#include "Terrain.h" +#include "TerrainTile.h" #include "Locator.h" #include "ImageLayer.h" #include "HeightFieldLayer.h" @@ -1457,9 +1457,9 @@ osg::Node* DataInputStream::readNode() node = new osgFX::MultiTextureControl(); ((ive::MultiTextureControl*)(node))->read(this); } - else if(nodeTypeID== IVETERRAIN){ - node = new osgTerrain::Terrain(); - ((ive::Terrain*)(node))->read(this); + else if(nodeTypeID== IVETERRAINTILE){ + node = new osgTerrain::TerrainTile(); + ((ive::TerrainTile*)(node))->read(this); } else{ throw Exception("Unknown node identification in DataInputStream::readNode()"); diff --git a/src/osgPlugins/ive/DataInputStream.h b/src/osgPlugins/ive/DataInputStream.h index b16976090..3133d7f33 100644 --- a/src/osgPlugins/ive/DataInputStream.h +++ b/src/osgPlugins/ive/DataInputStream.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include diff --git a/src/osgPlugins/ive/DataOutputStream.cpp b/src/osgPlugins/ive/DataOutputStream.cpp index e5d30d444..723eccab0 100644 --- a/src/osgPlugins/ive/DataOutputStream.cpp +++ b/src/osgPlugins/ive/DataOutputStream.cpp @@ -90,7 +90,7 @@ #include "Text.h" -#include "Terrain.h" +#include "TerrainTile.h" #include "Locator.h" #include "ImageLayer.h" #include "HeightFieldLayer.h" @@ -1060,8 +1060,8 @@ void DataOutputStream::writeNode(const osg::Node* node) else if(dynamic_cast(node)){ ((ive::MultiTextureControl*)(node))->write(this); } - else if(dynamic_cast(node)){ - ((ive::Terrain*)(node))->write(this); + else if(dynamic_cast(node)){ + ((ive::TerrainTile*)(node))->write(this); } else if(dynamic_cast(node)){ ((ive::Group*)(node))->write(this); diff --git a/src/osgPlugins/ive/DataOutputStream.h b/src/osgPlugins/ive/DataOutputStream.h index ad7b05a42..e795f8c6b 100644 --- a/src/osgPlugins/ive/DataOutputStream.h +++ b/src/osgPlugins/ive/DataOutputStream.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include "IveVersion.h" #include "DataTypeSize.h" diff --git a/src/osgPlugins/ive/HeightFieldLayer.h b/src/osgPlugins/ive/HeightFieldLayer.h index 3c273f016..d9fe4f3ad 100644 --- a/src/osgPlugins/ive/HeightFieldLayer.h +++ b/src/osgPlugins/ive/HeightFieldLayer.h @@ -14,7 +14,7 @@ #ifndef IVE_HEIGHTFIELDLAYER #define IVE_HEIGHTFIELDLAYER 1 -#include +#include #include "ReadWrite.h" namespace ive diff --git a/src/osgPlugins/ive/ImageLayer.h b/src/osgPlugins/ive/ImageLayer.h index f8f11b88e..e40c05bf0 100644 --- a/src/osgPlugins/ive/ImageLayer.h +++ b/src/osgPlugins/ive/ImageLayer.h @@ -14,7 +14,8 @@ #ifndef IVE_IMAGELAYER #define IVE_IMAGELAYER 1 -#include +#include + #include "ReadWrite.h" namespace ive diff --git a/src/osgPlugins/ive/Layer.h b/src/osgPlugins/ive/Layer.h index b1e8cadab..f85189015 100644 --- a/src/osgPlugins/ive/Layer.h +++ b/src/osgPlugins/ive/Layer.h @@ -14,7 +14,7 @@ #ifndef IVE_LAYER #define IVE_LAYER 1 -#include +#include #include "ReadWrite.h" namespace ive diff --git a/src/osgPlugins/ive/ReadWrite.h b/src/osgPlugins/ive/ReadWrite.h index 13c3976a3..8306f7281 100644 --- a/src/osgPlugins/ive/ReadWrite.h +++ b/src/osgPlugins/ive/ReadWrite.h @@ -121,7 +121,7 @@ namespace ive { #define IVEDIRECTIONALSECTOR 0x0010000A // osgTerrain classes -#define IVETERRAIN 0x00200001 +#define IVETERRAINTILE 0x00200001 #define IVELOCATOR 0x00200002 #define IVELAYER 0x00200003 #define IVEIMAGELAYER 0x00200004 @@ -130,6 +130,7 @@ namespace ive { #define IVEPROXYLAYER 0x00200007 #define IVETERRAINTECHNIQUE 0x00200008 #define IVEGEOMETRYTECHNIQUE 0x00200009 +//#define IVETERRAIN 0x0020000A // osgFX classes #define IVEMULTITEXTURECONTROL 0x01000001 diff --git a/src/osgPlugins/ive/Terrain.cpp b/src/osgPlugins/ive/TerrainTile.cpp similarity index 89% rename from src/osgPlugins/ive/Terrain.cpp rename to src/osgPlugins/ive/TerrainTile.cpp index c2472ead1..614f2a4d7 100644 --- a/src/osgPlugins/ive/Terrain.cpp +++ b/src/osgPlugins/ive/TerrainTile.cpp @@ -12,7 +12,7 @@ */ #include "Exception.h" -#include "Terrain.h" +#include "TerrainTile.h" #include "Group.h" #include "Layer.h" @@ -20,10 +20,10 @@ using namespace ive; -void Terrain::write(DataOutputStream* out) +void TerrainTile::write(DataOutputStream* out) { // Write Terrain's identification. - out->writeInt(IVETERRAIN); + out->writeInt(IVETERRAINTILE); // If the osg class is inherited by any other class we should also write this to file. osg::Group* group = dynamic_cast(this); if(group) @@ -69,11 +69,11 @@ void Terrain::write(DataOutputStream* out) } -void Terrain::read(DataInputStream* in) +void TerrainTile::read(DataInputStream* in) { // Peek on Terrain's identification. int id = in->peekInt(); - if (id != IVETERRAIN) throw Exception("Terrain::read(): Expected Terrain identification."); + if (id != IVETERRAINTILE) throw Exception("TerrainTile::read(): Expected Terrain identification."); // Read Terrain's identification. id = in->readInt(); @@ -121,7 +121,7 @@ void Terrain::read(DataInputStream* in) } -void Terrain::writeTerrainTechnique(DataOutputStream* out, osgTerrain::TerrainTechnique* technique) +void TerrainTile::writeTerrainTechnique(DataOutputStream* out, osgTerrain::TerrainTechnique* technique) { if (dynamic_cast(technique)) { @@ -134,7 +134,7 @@ void Terrain::writeTerrainTechnique(DataOutputStream* out, osgTerrain::TerrainTe } } -osgTerrain::TerrainTechnique* Terrain::readTerrainTechnique(DataInputStream* in) +osgTerrain::TerrainTechnique* TerrainTile::readTerrainTechnique(DataInputStream* in) { bool hasTechnique = in->readBool(); if (!hasTechnique) return 0; diff --git a/src/osgPlugins/ive/Terrain.h b/src/osgPlugins/ive/TerrainTile.h similarity index 86% rename from src/osgPlugins/ive/Terrain.h rename to src/osgPlugins/ive/TerrainTile.h index fe5883793..b97d7b69f 100644 --- a/src/osgPlugins/ive/Terrain.h +++ b/src/osgPlugins/ive/TerrainTile.h @@ -11,17 +11,17 @@ * OpenSceneGraph Public License for more details. */ -#ifndef IVE_TERRAIN -#define IVE_TERRAIN 1 +#ifndef IVE_TERRAINTILE +#define IVE_TERRAINTILE 1 -#include +#include #include "ReadWrite.h" namespace ive { -class Terrain : public osgTerrain::Terrain, public ReadWrite +class TerrainTile : public osgTerrain::TerrainTile, public ReadWrite { public: void write(DataOutputStream* out); diff --git a/src/osgPlugins/osgTerrain/CMakeLists.txt b/src/osgPlugins/osgTerrain/CMakeLists.txt index 7bf08a745..3c55676d6 100644 --- a/src/osgPlugins/osgTerrain/CMakeLists.txt +++ b/src/osgPlugins/osgTerrain/CMakeLists.txt @@ -7,7 +7,7 @@ SET(TARGET_SRC HeightFieldLayer.cpp CompositeLayer.cpp Layer.cpp - Terrain.cpp + TerrainTile.cpp GeometryTechnique.cpp ReaderWriterOsgTerrain.cpp ) diff --git a/src/osgPlugins/osgTerrain/Locator.cpp b/src/osgPlugins/osgTerrain/Locator.cpp index 50b056b1f..aab97d09a 100644 --- a/src/osgPlugins/osgTerrain/Locator.cpp +++ b/src/osgPlugins/osgTerrain/Locator.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/osgPlugins/osgTerrain/ReaderWriterOsgTerrain.cpp b/src/osgPlugins/osgTerrain/ReaderWriterOsgTerrain.cpp index ab3098f05..dd44730b8 100644 --- a/src/osgPlugins/osgTerrain/ReaderWriterOsgTerrain.cpp +++ b/src/osgPlugins/osgTerrain/ReaderWriterOsgTerrain.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include class ReaderWriterTerrain : public osgDB::ReaderWriter { diff --git a/src/osgPlugins/osgTerrain/Terrain.cpp b/src/osgPlugins/osgTerrain/TerrainTile.cpp similarity index 85% rename from src/osgPlugins/osgTerrain/Terrain.cpp rename to src/osgPlugins/osgTerrain/TerrainTile.cpp index 5711a4e1d..8eb806c24 100644 --- a/src/osgPlugins/osgTerrain/Terrain.cpp +++ b/src/osgPlugins/osgTerrain/TerrainTile.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -13,16 +13,16 @@ #include #include -bool Terrain_readLocalData(osg::Object &obj, osgDB::Input &fr); -bool Terrain_writeLocalData(const osg::Object &obj, osgDB::Output &fw); +bool TerrainTile_readLocalData(osg::Object &obj, osgDB::Input &fr); +bool TerrainTile_writeLocalData(const osg::Object &obj, osgDB::Output &fw); -osgDB::RegisterDotOsgWrapperProxy Terrain_Proxy +osgDB::RegisterDotOsgWrapperProxy TerrainTile_Proxy ( - new osgTerrain::Terrain, - "Terrain", - "Object Node Terrain Group", - Terrain_readLocalData, - Terrain_writeLocalData + new osgTerrain::TerrainTile, + "TerrainTile", + "Object Node TerrainTile Group", + TerrainTile_readLocalData, + TerrainTile_writeLocalData ); osg::TransferFunction* readTransferFunction(osgDB::Input& fr) @@ -112,9 +112,9 @@ osg::TransferFunction* readTransferFunction(osgDB::Input& fr) } -bool Terrain_readLocalData(osg::Object& obj, osgDB::Input &fr) +bool TerrainTile_readLocalData(osg::Object& obj, osgDB::Input &fr) { - osgTerrain::Terrain& terrain = static_cast(obj); + osgTerrain::TerrainTile& terrainTile = static_cast(obj); bool itrAdvanced = false; @@ -122,7 +122,7 @@ bool Terrain_readLocalData(osg::Object& obj, osgDB::Input &fr) if (readObject.valid()) itrAdvanced = true; osgTerrain::Locator* locator = dynamic_cast(readObject.get()); - if (locator) terrain.setLocator(locator); + if (locator) terrainTile.setLocator(locator); if (fr.matchSequence("ElevationLayer {")) { @@ -158,7 +158,7 @@ bool Terrain_readLocalData(osg::Object& obj, osgDB::Input &fr) if (minLevel!=0) proxyLayer->setMinLevel(minLevel); if (maxLevel!=MAXIMUM_NUMBER_OF_LEVELS) proxyLayer->setMaxLevel(maxLevel); - terrain.setElevationLayer(proxyLayer); + terrainTile.setElevationLayer(proxyLayer); fr += 2; @@ -174,7 +174,7 @@ bool Terrain_readLocalData(osg::Object& obj, osgDB::Input &fr) if (minLevel!=0) readLayer->setMinLevel(minLevel); if (maxLevel!=MAXIMUM_NUMBER_OF_LEVELS) readLayer->setMaxLevel(maxLevel); - terrain.setElevationLayer(readLayer); + terrainTile.setElevationLayer(readLayer); } if (readObject.valid()) localAdvanced = true; @@ -229,7 +229,7 @@ bool Terrain_readLocalData(osg::Object& obj, osgDB::Input &fr) if (minLevel!=0) proxyLayer->setMinLevel(minLevel); if (maxLevel!=MAXIMUM_NUMBER_OF_LEVELS) proxyLayer->setMaxLevel(maxLevel); - terrain.setColorLayer(layerNum, proxyLayer); + terrainTile.setColorLayer(layerNum, proxyLayer); } fr += 2; @@ -246,7 +246,7 @@ bool Terrain_readLocalData(osg::Object& obj, osgDB::Input &fr) if (minLevel!=0) readLayer->setMinLevel(minLevel); if (maxLevel!=MAXIMUM_NUMBER_OF_LEVELS) readLayer->setMaxLevel(maxLevel); - terrain.setColorLayer(layerNum, readLayer); + terrainTile.setColorLayer(layerNum, readLayer); } if (readObject.valid()) localAdvanced = true; @@ -262,7 +262,7 @@ bool Terrain_readLocalData(osg::Object& obj, osgDB::Input &fr) readObject = fr.readObjectOfType(osgDB::type_wrapper()); if (readObject.valid()) { - terrain.setTerrainTechnique(dynamic_cast(readObject.get())); + terrainTile.setTerrainTechnique(dynamic_cast(readObject.get())); itrAdvanced = true; } @@ -270,25 +270,25 @@ bool Terrain_readLocalData(osg::Object& obj, osgDB::Input &fr) return itrAdvanced; } -bool Terrain_writeLocalData(const osg::Object& obj, osgDB::Output& fw) +bool TerrainTile_writeLocalData(const osg::Object& obj, osgDB::Output& fw) { - const osgTerrain::Terrain& terrain = static_cast(obj); + const osgTerrain::TerrainTile& terrainTile = static_cast(obj); int prec = fw.precision(); fw.precision(15); - if (terrain.getLocator()) + if (terrainTile.getLocator()) { - fw.writeObject(*terrain.getLocator()); + fw.writeObject(*terrainTile.getLocator()); } - if (terrain.getElevationLayer()) + if (terrainTile.getElevationLayer()) { fw.indent()<<"ElevationLayer {"<(terrain.getElevationLayer()); + const osgTerrain::ProxyLayer* proxyLayer = dynamic_cast(terrainTile.getElevationLayer()); if (proxyLayer) { if (!proxyLayer->getFileName().empty()) @@ -312,9 +312,9 @@ bool Terrain_writeLocalData(const osg::Object& obj, osgDB::Output& fw) fw.indent()<<"ProxyLayer "<getFileName()<0) @@ -361,7 +361,7 @@ bool Terrain_writeLocalData(const osg::Object& obj, osgDB::Output& fw) } else if (layer) { - fw.writeObject(*terrain.getColorLayer(i)); + fw.writeObject(*terrainTile.getColorLayer(i)); } fw.moveOut(); @@ -370,9 +370,9 @@ bool Terrain_writeLocalData(const osg::Object& obj, osgDB::Output& fw) } } - if (terrain.getTerrainTechnique()) + if (terrainTile.getTerrainTechnique()) { - fw.writeObject(*terrain.getTerrainTechnique()); + fw.writeObject(*terrainTile.getTerrainTechnique()); } fw.precision(prec); diff --git a/src/osgTerrain/CMakeLists.txt b/src/osgTerrain/CMakeLists.txt index 1b9657202..ab1764078 100644 --- a/src/osgTerrain/CMakeLists.txt +++ b/src/osgTerrain/CMakeLists.txt @@ -10,7 +10,7 @@ SET(LIB_PUBLIC_HEADERS ${HEADER_PATH}/Export ${HEADER_PATH}/Locator ${HEADER_PATH}/Layer - ${HEADER_PATH}/Terrain + ${HEADER_PATH}/TerrainTile ${HEADER_PATH}/TerrainTechnique ${HEADER_PATH}/TerrainSystem ${HEADER_PATH}/TileSystem @@ -25,7 +25,7 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_PUBLIC_HEADERS} Layer.cpp Locator.cpp - Terrain.cpp + TerrainTile.cpp TerrainTechnique.cpp TerrainSystem.cpp TileSystem.cpp diff --git a/src/osgTerrain/GeometryTechnique.cpp b/src/osgTerrain/GeometryTechnique.cpp index 74675ec0b..4706a3e32 100644 --- a/src/osgTerrain/GeometryTechnique.cpp +++ b/src/osgTerrain/GeometryTechnique.cpp @@ -12,7 +12,7 @@ */ #include -#include +#include #include diff --git a/src/osgTerrain/TerrainTechnique.cpp b/src/osgTerrain/TerrainTechnique.cpp index c5407b5f8..38387e956 100644 --- a/src/osgTerrain/TerrainTechnique.cpp +++ b/src/osgTerrain/TerrainTechnique.cpp @@ -12,7 +12,7 @@ */ #include -#include +#include using namespace osgTerrain; diff --git a/src/osgTerrain/Terrain.cpp b/src/osgTerrain/TerrainTile.cpp similarity index 85% rename from src/osgTerrain/Terrain.cpp rename to src/osgTerrain/TerrainTile.cpp index d475985d4..9cf1943cf 100644 --- a/src/osgTerrain/Terrain.cpp +++ b/src/osgTerrain/TerrainTile.cpp @@ -11,7 +11,7 @@ * OpenSceneGraph Public License for more details. */ -#include +#include #include #include @@ -19,7 +19,7 @@ using namespace osg; using namespace osgTerrain; -Terrain::Terrain(): +TerrainTile::TerrainTile(): _terrainSystem(0), _hasBeenTraversal(false), _requiresNormals(true), @@ -29,7 +29,7 @@ Terrain::Terrain(): setThreadSafeRefUnref(true); } -Terrain::Terrain(const Terrain& terrain,const osg::CopyOp& copyop): +TerrainTile::TerrainTile(const TerrainTile& terrain,const osg::CopyOp& copyop): Group(terrain,copyop), _terrainSystem(0), _hasBeenTraversal(false), @@ -43,11 +43,11 @@ Terrain::Terrain(const Terrain& terrain,const osg::CopyOp& copyop): if (terrain.getTerrainTechnique()) setTerrainTechnique(dynamic_cast(terrain.getTerrainTechnique()->cloneType())); } -Terrain::~Terrain() +TerrainTile::~TerrainTile() { } -void Terrain::traverse(osg::NodeVisitor& nv) +void TerrainTile::traverse(osg::NodeVisitor& nv) { if (!_hasBeenTraversal) { @@ -63,7 +63,7 @@ void Terrain::traverse(osg::NodeVisitor& nv) osgTerrain::TerrainSystem* ts = dynamic_cast(*itr); if (ts) { - osg::notify(osg::NOTICE)<<"Assigning terrain system "<isDirty()) { @@ -100,8 +100,7 @@ void Terrain::init() } } - -void Terrain::setTerrainTechnique(osgTerrain::TerrainTechnique* terrainTechnique) +void TerrainTile::setTerrainTechnique(TerrainTechnique* terrainTechnique) { if (_terrainTechnique == terrainTechnique) return; @@ -114,19 +113,19 @@ void Terrain::setTerrainTechnique(osgTerrain::TerrainTechnique* terrainTechnique } -void Terrain::setElevationLayer(osgTerrain::Layer* layer) +void TerrainTile::setElevationLayer(Layer* layer) { _elevationLayer = layer; } -void Terrain::setColorLayer(unsigned int i, osgTerrain::Layer* layer) +void TerrainTile::setColorLayer(unsigned int i, Layer* layer) { if (_colorLayers.size() <= i) _colorLayers.resize(i+1); _colorLayers[i] = layer; } -osg::BoundingSphere Terrain::computeBound() const +osg::BoundingSphere TerrainTile::computeBound() const { osg::BoundingSphere bs;