FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change TileID::layer to TileID::level

Browse Source
This commit is contained in:
Robert Osfield 2008-09-20 15:43:38 +00:00
parent c35159fdde
commit ae08a5b261
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/osgTerrain/TerrainTile
View File

@ -32,37 +32,37 @@ class TileID
public:
TileID():
layer(-1),
level(-1),
x(-1),
y(-1) {}
TileID(int in_layer, int in_x, int in_y):
layer(in_layer),
TileID(int in_level, int in_x, int in_y):
level(in_level),
x(in_x),
y(in_y) {}
bool operator == (const TileID& rhs) const
{
return (layer==rhs.layer) && (x==rhs.x) && (y==rhs.y);
return (level==rhs.level) && (x==rhs.x) && (y==rhs.y);
}
bool operator != (const TileID& rhs) const
{
return (layer!=rhs.layer) || (x!=rhs.x) || (y!=rhs.y);
return (level!=rhs.level) || (x!=rhs.x) || (y!=rhs.y);
}
bool operator < (const TileID& rhs) const
{
if (layer<rhs.layer) return true;
if (layer>rhs.layer) return false;
if (level<rhs.level) return true;
if (level>rhs.level) return false;
if (x<rhs.x) return true;
if (x>rhs.x) return false;
return y<rhs.y;
}
bool valid() const { return layer>=0; }
bool valid() const { return level>=0; }
int layer;
int level;
int x;
int y;
};

6
src/osgPlugins/ive/TerrainTile.cpp
View File

@ -33,7 +33,7 @@ void TerrainTile::write(DataOutputStream* out)
if (out->getVersion() >= VERSION_0026)
{
out->writeInt(getTileID().layer);
out->writeInt(getTileID().level);
out->writeInt(getTileID().x);
out->writeInt(getTileID().y);
}
@ -86,10 +86,10 @@ void TerrainTile::read(DataInputStream* in)
if (in->getVersion() >= VERSION_0026)
{
int layer = in->readInt();
int level = in->readInt();
int x = in->readInt();
int y = in->readInt();
setTileID(osgTerrain::TileID(layer,x,y));
setTileID(osgTerrain::TileID(level,x,y));
}
if (in->getVersion() >= VERSION_0023)