Renamed Terrain to TerrainTile

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

src/osgPlugins/ive/CompositeLayer.h

@@ -1,7 +1,7 @@
 #ifndef IVE_COMPOSITELAYER
 #define IVE_COMPOSITELAYER 1
 
-#include <osgTerrain/Terrain>
+#include <osgTerrain/Layer>
 #include "ReadWrite.h"
 
 namespace ive

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()");

src/osgPlugins/ive/DataInputStream.h

@@ -21,7 +21,7 @@
 #include <osg/Uniform>
 #include <osg/ref_ptr>
 
-#include <osgTerrain/Terrain>
+#include <osgTerrain/TerrainTile>
 
 #include <osgDB/ReaderWriter>
 

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<const osgFX::MultiTextureControl*>(node)){
             ((ive::MultiTextureControl*)(node))->write(this);
         }
-        else if(dynamic_cast<const osgTerrain::Terrain*>(node)){
-            ((ive::Terrain*)(node))->write(this);
+        else if(dynamic_cast<const osgTerrain::TerrainTile*>(node)){
+            ((ive::TerrainTile*)(node))->write(this);
         }
         else if(dynamic_cast<const osg::Group*>(node)){
             ((ive::Group*)(node))->write(this);

src/osgPlugins/ive/DataOutputStream.h

@@ -16,7 +16,7 @@
 #include <osg/Uniform>
 #include <osgDB/ReaderWriter>
 
-#include <osgTerrain/Terrain>
+#include <osgTerrain/TerrainTile>
 
 #include "IveVersion.h"
 #include "DataTypeSize.h"

src/osgPlugins/ive/HeightFieldLayer.h

@@ -14,7 +14,7 @@
 #ifndef IVE_HEIGHTFIELDLAYER
 #define IVE_HEIGHTFIELDLAYER 1
 
-#include <osgTerrain/Terrain>
+#include <osgTerrain/Layer>
 #include "ReadWrite.h"
 
 namespace ive

src/osgPlugins/ive/ImageLayer.h

@@ -14,7 +14,8 @@
 #ifndef IVE_IMAGELAYER
 #define IVE_IMAGELAYER 1
 
-#include <osgTerrain/Terrain>
+#include <osgTerrain/Layer>
+
 #include "ReadWrite.h"
 
 namespace ive

src/osgPlugins/ive/Layer.h

@@ -14,7 +14,7 @@
 #ifndef IVE_LAYER
 #define IVE_LAYER 1
 
-#include <osgTerrain/Terrain>
+#include <osgTerrain/Layer>
 #include "ReadWrite.h"
 
 namespace ive

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

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<osg::Group*>(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<osgTerrain::GeometryTechnique*>(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;

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 <osgTerrain/Terrain>
+#include <osgTerrain/TerrainTile>
 
 #include "ReadWrite.h"
 
 namespace ive
 {
 
-class Terrain : public osgTerrain::Terrain, public ReadWrite
+class TerrainTile : public osgTerrain::TerrainTile, public ReadWrite
 {
 public:
 	void write(DataOutputStream* out);

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
 )

src/osgPlugins/osgTerrain/Locator.cpp

@@ -1,4 +1,4 @@
-#include <osgTerrain/Terrain>
+#include <osgTerrain/TerrainTile>
 
 #include <iostream>
 #include <string>

src/osgPlugins/osgTerrain/ReaderWriterOsgTerrain.cpp

@@ -11,7 +11,7 @@
 #include <osgDB/Input>
 #include <osgDB/Output>
 
-#include <osgTerrain/Terrain>
+#include <osgTerrain/TerrainTile>
 
 class ReaderWriterTerrain : public osgDB::ReaderWriter
 {

src/osgPlugins/osgTerrain/TerrainTile.cpp

@@ -1,4 +1,4 @@
-#include <osgTerrain/Terrain>
+#include <osgTerrain/TerrainTile>
 
 #include <iostream>
 #include <string>
@@ -13,16 +13,16 @@
 #include <osgDB/Output>
 #include <osgDB/ParameterOutput>
 
-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<osgTerrain::Terrain&>(obj);
+    osgTerrain::TerrainTile& terrainTile = static_cast<osgTerrain::TerrainTile&>(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<osgTerrain::Locator*>(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<osgTerrain::TerrainTechnique>());
     if (readObject.valid())
     {
-        terrain.setTerrainTechnique(dynamic_cast<osgTerrain::TerrainTechnique*>(readObject.get()));
+        terrainTile.setTerrainTechnique(dynamic_cast<osgTerrain::TerrainTechnique*>(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<const osgTerrain::Terrain&>(obj);
+    const osgTerrain::TerrainTile& terrainTile = static_cast<const osgTerrain::TerrainTile&>(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 {"<<std::endl;
 
         fw.moveIn();
         
-        const osgTerrain::ProxyLayer* proxyLayer = dynamic_cast<const osgTerrain::ProxyLayer*>(terrain.getElevationLayer());
+        const osgTerrain::ProxyLayer* proxyLayer = dynamic_cast<const osgTerrain::ProxyLayer*>(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 "<<proxyLayer->getFileName()<<std::endl;
             }
         }
-        else if (terrain.getElevationLayer())
+        else if (terrainTile.getElevationLayer())
         {
-            fw.writeObject(*terrain.getElevationLayer());
+            fw.writeObject(*terrainTile.getElevationLayer());
         }
 
         fw.moveOut();
@@ -322,9 +322,9 @@ bool Terrain_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
         fw.indent()<<"}"<<std::endl;
     }
 
-    for(unsigned int i=0; i<terrain.getNumColorLayers(); ++i)
+    for(unsigned int i=0; i<terrainTile.getNumColorLayers(); ++i)
     {
-        const osgTerrain::Layer* layer = terrain.getColorLayer(i);
+        const osgTerrain::Layer* layer = terrainTile.getColorLayer(i);
         if (layer)
         {
             if (i>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);

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

src/osgTerrain/GeometryTechnique.cpp

@@ -12,7 +12,7 @@
 */
 
 #include <osgTerrain/GeometryTechnique>
-#include <osgTerrain/Terrain>
+#include <osgTerrain/TerrainTile>
 
 #include <osgUtil/SmoothingVisitor>
 

src/osgTerrain/TerrainTechnique.cpp

@@ -12,7 +12,7 @@
 */
 
 #include <osgTerrain/TerrainTechnique>
-#include <osgTerrain/Terrain>
+#include <osgTerrain/TerrainTile>
 
 using namespace osgTerrain;
 

src/osgTerrain/TerrainTile.cpp

@@ -11,7 +11,7 @@
  * OpenSceneGraph Public License for more details.
 */
 
-#include <osgTerrain/Terrain>
+#include <osgTerrain/TerrainTile>
 #include <osgTerrain/TerrainSystem>
 
 #include <osg/ClusterCullingCallback>
@@ -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<TerrainTechnique*>(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<TerrainSystem*>(*itr);
                     if (ts) 
                     {
-                        osg::notify(osg::NOTICE)<<"Assigning terrain system "<<ts<<std::endl;                        
+                        osg::notify(osg::INFO)<<"Assigning terrain system "<<ts<<std::endl;                        
                         _terrainSystem = ts;
                     }
                 }
@@ -92,7 +92,7 @@ void Terrain::traverse(osg::NodeVisitor& nv)
     }
 }
 
-void Terrain::init()
+void TerrainTile::init()
 {
     if (_terrainTechnique.valid() && _terrainTechnique->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;