From 33cba8392ab941061b07d161271cf02629ffe6b6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 5 Feb 2009 12:36:53 +0000 Subject: [PATCH] Added exports to TileID classes, and moved their constructors to .cpp's. --- include/osgTerrain/TerrainTile | 12 +++--------- include/osgVolume/VolumeTile | 14 +++----------- src/osgTerrain/TerrainTile.cpp | 18 ++++++++++++++++++ src/osgVolume/VolumeTile.cpp | 21 +++++++++++++++++++++ 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/include/osgTerrain/TerrainTile b/include/osgTerrain/TerrainTile index 616c69392..82ba82ea8 100644 --- a/include/osgTerrain/TerrainTile +++ b/include/osgTerrain/TerrainTile @@ -27,19 +27,13 @@ namespace osgTerrain { class Terrain; -class TileID +class OSGTERRAIN_EXPORT TileID { public: - TileID(): - level(-1), - x(-1), - y(-1) {} + TileID(); - TileID(int in_level, int in_x, int in_y): - level(in_level), - x(in_x), - y(in_y) {} + TileID(int in_level, int in_x, int in_y); bool operator == (const TileID& rhs) const { diff --git a/include/osgVolume/VolumeTile b/include/osgVolume/VolumeTile index 6b5e1052b..199435968 100644 --- a/include/osgVolume/VolumeTile +++ b/include/osgVolume/VolumeTile @@ -26,21 +26,13 @@ namespace osgVolume { class Volume; -class TileID +class OSGVOLUME_EXPORT TileID { public: - TileID(): - level(-1), - x(-1), - y(-1), - z(-1) {} + TileID(); - TileID(int in_level, int in_x, int in_y, int in_z): - level(in_level), - x(in_x), - y(in_y), - z(in_z) {} + TileID(int in_level, int in_x, int in_y, int in_z); bool operator == (const TileID& rhs) const { diff --git a/src/osgTerrain/TerrainTile.cpp b/src/osgTerrain/TerrainTile.cpp index 9d5d9142d..55b213cbf 100644 --- a/src/osgTerrain/TerrainTile.cpp +++ b/src/osgTerrain/TerrainTile.cpp @@ -23,6 +23,24 @@ using namespace osg; using namespace osgTerrain; +///////////////////////////////////////////////////////////////////////////////// +// +// TileID +// +TileID::TileID(): + level(-1), + x(-1), + y(-1) +{ +} + +TileID::TileID(int in_level, int in_x, int in_y): + level(in_level), + x(in_x), + y(in_y) +{ +} + ///////////////////////////////////////////////////////////////////////////////// // // TerrainTile diff --git a/src/osgVolume/VolumeTile.cpp b/src/osgVolume/VolumeTile.cpp index cdb4153f3..c03450044 100644 --- a/src/osgVolume/VolumeTile.cpp +++ b/src/osgVolume/VolumeTile.cpp @@ -18,6 +18,27 @@ using namespace osg; using namespace osgVolume; +///////////////////////////////////////////////////////////////////////////////// +// +// TileID +// +TileID::TileID(): + level(-1), + x(-1), + y(-1), + z(-1) +{ +} + +TileID::TileID(int in_level, int in_x, int in_y, int in_z): + level(in_level), + x(in_x), + y(in_y), + z(in_z) +{ +} + + ///////////////////////////////////////////////////////////////////////////////// // // VolumeTile