adrido/minetest-mapper-cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename some constants for clarity

Browse Source
This commit is contained in:
Rogier 2015-01-03 19:10:19 +01:00
parent b71c1a3089
commit 5aa358aafe
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
TileGenerator.cpp
View File

@ -163,8 +163,8 @@ TileGenerator::TileGenerator():
m_mapXEndNodeOffset(0), m_mapXEndNodeOffset(0),
m_mapYEndNodeOffset(0), m_mapYEndNodeOffset(0),
m_nextStoredYCoord(0), m_nextStoredYCoord(0),
m_tileXOrigin(TILE_WORLDCENTERED), m_tileXOrigin(TILECENTER_AT_WORLDCENTER),
m_tileZOrigin(TILE_WORLDCENTERED), m_tileZOrigin(TILECENTER_AT_WORLDCENTER),
m_tileWidth(0), m_tileWidth(0),
m_tileHeight(0), m_tileHeight(0),
m_tileBorderSize(1), m_tileBorderSize(1),
@ -887,16 +887,16 @@ void TileGenerator::computeMapParameters()
// Set special values for origin (which depend on other paramters) // Set special values for origin (which depend on other paramters)
if (m_tileWidth) { if (m_tileWidth) {
switch (m_tileXOrigin) { switch (m_tileXOrigin) {
case TILE_WORLDCENTERED: case TILECENTER_AT_WORLDCENTER:
m_tileXOrigin = -m_tileWidth / 2; m_tileXOrigin = -m_tileWidth / 2;
break; break;
case TILE_AT_WORLDCENTER: case TILECORNER_AT_WORLDCENTER:
m_tileXOrigin = 0; m_tileXOrigin = 0;
break; break;
case TILE_MAPCENTERED: case TILECENTER_AT_MAPCENTER:
m_tileXOrigin = m_xMin * 16 + m_mapXStartNodeOffset + mapWidth / 2 - m_tileWidth / 2; m_tileXOrigin = m_xMin * 16 + m_mapXStartNodeOffset + mapWidth / 2 - m_tileWidth / 2;
break; break;
case TILE_AT_MAPCENTER: case TILECORNER_AT_MAPCENTER:
m_tileXOrigin = m_xMin * 16 + m_mapXStartNodeOffset + mapWidth / 2; m_tileXOrigin = m_xMin * 16 + m_mapXStartNodeOffset + mapWidth / 2;
break; break;
default: default:
@ -907,16 +907,16 @@ void TileGenerator::computeMapParameters()
} }
if (m_tileHeight) { if (m_tileHeight) {
switch (m_tileZOrigin) { switch (m_tileZOrigin) {
case TILE_WORLDCENTERED: case TILECENTER_AT_WORLDCENTER:
m_tileZOrigin = -m_tileHeight / 2; m_tileZOrigin = -m_tileHeight / 2;
break; break;
case TILE_AT_WORLDCENTER: case TILECORNER_AT_WORLDCENTER:
m_tileZOrigin = 0; m_tileZOrigin = 0;
break; break;
case TILE_MAPCENTERED: case TILECENTER_AT_MAPCENTER:
m_tileZOrigin = (m_zMax + 1) * 16 - 1 - m_mapYStartNodeOffset - mapHeight / 2 - m_tileHeight / 2; m_tileZOrigin = (m_zMax + 1) * 16 - 1 - m_mapYStartNodeOffset - mapHeight / 2 - m_tileHeight / 2;
break; break;
case TILE_AT_MAPCENTER: case TILECORNER_AT_MAPCENTER:
m_tileZOrigin = (m_zMax + 1) * 16 - 1 - m_mapYStartNodeOffset - mapHeight / 2; m_tileZOrigin = (m_zMax + 1) * 16 - 1 - m_mapYStartNodeOffset - mapHeight / 2;
break; break;
default: default:

8
TileGenerator.h
View File

@ -29,10 +29,10 @@
#include "Color.h" #include "Color.h"
#include "db.h" #include "db.h"
#define TILE_WORLDCENTERED INT_MAX #define TILECENTER_AT_WORLDCENTER (INT_MAX)
#define TILE_AT_WORLDCENTER (INT_MAX - 1) #define TILECORNER_AT_WORLDCENTER (INT_MAX - 1)
#define TILE_MAPCENTERED INT_MIN #define TILECENTER_AT_MAPCENTER (INT_MIN)
#define TILE_AT_MAPCENTER (INT_MIN + 1) #define TILECORNER_AT_MAPCENTER (INT_MIN + 1)
class TileGenerator class TileGenerator
{ {

8
mapper.cpp
View File

@ -726,15 +726,15 @@ int main(int argc, char *argv[])
NodeCoord coord; NodeCoord coord;
if (iss.str() == "world") { if (iss.str() == "world") {
if (origin) if (origin)
generator.setTileOrigin(TILE_AT_WORLDCENTER, TILE_AT_WORLDCENTER); generator.setTileOrigin(TILECORNER_AT_WORLDCENTER, TILECORNER_AT_WORLDCENTER);
else else
generator.setTileCenter(TILE_WORLDCENTERED, TILE_WORLDCENTERED); generator.setTileCenter(TILECENTER_AT_WORLDCENTER, TILECENTER_AT_WORLDCENTER);
} }
else if (iss.str() == "map") { else if (iss.str() == "map") {
if (origin) if (origin)
generator.setTileOrigin(TILE_AT_MAPCENTER, TILE_AT_MAPCENTER); generator.setTileOrigin(TILECORNER_AT_MAPCENTER, TILECORNER_AT_MAPCENTER);
else else
generator.setTileCenter(TILE_MAPCENTERED, TILE_MAPCENTERED); generator.setTileCenter(TILECENTER_AT_MAPCENTER, TILECENTER_AT_MAPCENTER);
} }
else { else {
bool result = true; bool result = true;