Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iso almost working

This commit is contained in:
Ricardo Quesada 2014-02-06 22:20:28 -08:00
parent ad7b54eb0e
commit e33baac396
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cocos/2d/CCTMXLayer2.cpp
View File

@ -240,28 +240,34 @@ int TMXLayer2::getTileIndex(int x, int y, cocos2d::Point baseTile)
switch (_layerOrientation)
{
case TMXOrientationOrtho:
if( baseTile.x + x < 0 || baseTile.x + x >= _layerSize.width
|| baseTile.y + y < 0 || baseTile.y + y >= _layerSize.height)
x += baseTile.x;
y += baseTile.y;
if( x < 0 || x >= _layerSize.width
|| y < 0 || y >= _layerSize.height)
tileidx = -1;
else
tileidx = (_layerSize.height - (baseTile.y + y) - 1) * _layerSize.width + baseTile.x + x;
tileidx = (_layerSize.height - y - 1) * _layerSize.width + x;
break;
case TMXOrientationIso:
x += baseTile.x;
y -= baseTile.y*2 + 1;
int xx = x + (y-1) / 2;
int yy = y/2 - x;
x += baseTile.x;
y -= baseTile.y*2;
int xx = x + y/2;
int yy = (y+1)/2 - x;
if( xx < 0 || xx >= _layerSize.width
|| yy < 0 || yy >= _layerSize.height )
tileidx = -1;
else
tileidx = xx + _layerSize.width * yy;
break;
}
return tileidx;
}
@ -405,6 +411,8 @@ void TMXLayer2::setupTiles()
case TMXOrientationIso:
_screenGridSize.width = ceil(screenSize.width / _mapTileSize.width) + 2;
_screenGridSize.height = ceil(screenSize.height / (_mapTileSize.height/2)) + 4;
// _screenGridSize.width = 3;
// _screenGridSize.height = 4;
break;
case TMXOrientationHex:
break;

4
tests/test-cpp/Classes/TileMapTest/TileMapTest.cpp
View File

@ -284,9 +284,9 @@ TMXOrthoTest::TMXOrthoTest()
//addChild(color, -1);
// riq
// auto map = TMXTiledMap2::create("TileMaps/iso-test1.tmx");
auto map = TMXTiledMap2::create("TileMaps/iso-test1.tmx");
// auto map = TMXTiledMap2::create("TileMaps/orthogonal-test2.tmx");
auto map = TMXTiledMap::create("TileMaps/orthogonal-test-vertexz.tmx");
// auto map = TMXTiledMap::create("TileMaps/orthogonal-test-vertexz.tmx");
addChild(map, 0, kTagTileMap);