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

Change --tileorigin to accept ',' as separator

Browse Source 
The previous separator (':') still works, but is not advertised.
This commit is contained in:
Rogier 2014-04-15 10:56:25 +02:00
parent 2119a6ae75
commit ec7178dde3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -128,7 +128,7 @@ tiles <tilesize>[+<border>]
logically *between* pixels, so they have no actual coordinates. logically *between* pixels, so they have no actual coordinates.
tileorigin x:y tileorigin x,y
Arrange the tiles so that one tile has its bottom-left (i.e. south-west) Arrange the tiles so that one tile has its bottom-left (i.e. south-west)
corner at map coordinates x,y. corner at map coordinates x,y.

4
mapper.cpp
View File

@ -43,7 +43,7 @@ void usage()
" --forcegeometry\n" " --forcegeometry\n"
" --sqlite-cacheworldrow\n" " --sqlite-cacheworldrow\n"
" --tiles <tilesize>[+<border>]\n" " --tiles <tilesize>[+<border>]\n"
" --tileorigin x:y|center-world|center-map\n" " --tileorigin x,y|center-world|center-map\n"
" --verbose\n" " --verbose\n"
" --progress\n" " --progress\n"
"Color format: '#000000'\n"; "Color format: '#000000'\n";
@ -195,7 +195,7 @@ int main(int argc, char *argv[])
int x, y; int x, y;
char c; char c;
origin >> x >> c >> y; origin >> x >> c >> y;
if (origin.fail() || c != ':') { if (origin.fail() || (c != ':' && c != ',')) {
if (string("center-world") == optarg) if (string("center-world") == optarg)
generator.setTileOrigin(TILECENTER_IS_WORLDCENTER, TILECENTER_IS_WORLDCENTER); generator.setTileOrigin(TILECENTER_IS_WORLDCENTER, TILECENTER_IS_WORLDCENTER);
else if (string("center-map") == optarg) else if (string("center-map") == optarg)