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

iso almost working 100% ok

This commit is contained in:
Ricardo Quesada 2014-02-06 18:47:45 -08:00
parent cf08d0b3f9
commit ad7b54eb0e
2 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
cocos/2d/CCTMXLayer2.cpp
View File

@ -181,7 +181,7 @@ void TMXLayer2::onDraw()
tile = _tiles[tileidx]; tile = _tiles[tileidx];
// vertices are sorted from top to bottom to support overlapping, so we need to convert 'y' to the new index // vertices are sorted from top to bottom to support overlapping, so we need to convert 'y' to the new index
int screenidx = ((_screenGridSize.height-y-1) * (_screenGridSize.width)) + x; int screenidx = ((y+1) * (_screenGridSize.width)) + x;
GLfloat *texbase = texcoords + screenidx * 4 * 2; GLfloat *texbase = texcoords + screenidx * 4 * 2;
float left, right, top, bottom; float left, right, top, bottom;
@ -248,8 +248,11 @@ int TMXLayer2::getTileIndex(int x, int y, cocos2d::Point baseTile)
break; break;
case TMXOrientationIso: case TMXOrientationIso:
int xx = x + ((y+1)/2) - 2; x += baseTile.x;
int yy = y/2 +1 - x; y -= baseTile.y*2 + 1;
int xx = x + (y-1) / 2;
int yy = y/2 - x;
if( xx < 0 || xx >= _layerSize.width if( xx < 0 || xx >= _layerSize.width
|| yy < 0 || yy >= _layerSize.height ) || yy < 0 || yy >= _layerSize.height )
@ -296,7 +299,6 @@ void TMXLayer2::setupVertices()
{ {
for (int x=0; x < _screenGridSize.width; x++, tilePtr += 4 * 2) for (int x=0; x < _screenGridSize.width; x++, tilePtr += 4 * 2)
{ {
GLfloat xpos0, xpos1, ypos0, ypos1; GLfloat xpos0, xpos1, ypos0, ypos1;
setVerticesForPos(x, y, &xpos0, &xpos1, &ypos0, &ypos1); setVerticesForPos(x, y, &xpos0, &xpos1, &ypos0, &ypos1);
@ -331,9 +333,9 @@ void TMXLayer2::setVerticesForPos(int x, int y, GLfloat *xpos0, GLfloat *xpos1,
*ypos1 = *ypos0 + _tileSet->_tileSize.height; *ypos1 = *ypos0 + _tileSet->_tileSize.height;
break; break;
case TMXOrientationIso: case TMXOrientationIso:
*xpos0 = _mapTileSize.width * x + _mapTileSize.width/2 * (y%2); *xpos0 = _mapTileSize.width * x - _mapTileSize.width/2 * (y%2);
*xpos1 = *xpos0 + _tileSet->_tileSize.width; *xpos1 = *xpos0 + _tileSet->_tileSize.width;
*ypos0 = _mapTileSize.height * y / 2; *ypos0 = _mapTileSize.height * (y-1) / 2;
*ypos1 = *ypos0 + _tileSet->_tileSize.height; *ypos1 = *ypos0 + _tileSet->_tileSize.height;
break; break;
case TMXOrientationHex: case TMXOrientationHex:
@ -390,19 +392,19 @@ void TMXLayer2::setupTiles()
//CFByteOrder o = CFByteOrderGetCurrent(); //CFByteOrder o = CFByteOrderGetCurrent();
// Parse cocos2d properties // Parse cocos2d properties
this->parseInternalProperties(); // this->parseInternalProperties();
Size screenSize = Director::getInstance()->getWinSize(); Size screenSize = Director::getInstance()->getWinSize();
switch (_layerOrientation) switch (_layerOrientation)
{ {
case TMXOrientationOrtho: case TMXOrientationOrtho:
_screenGridSize.width = (ceil(screenSize.width / (_mapTileSize.width)) + 1); _screenGridSize.width = ceil(screenSize.width / _mapTileSize.width) + 1;
_screenGridSize.height = (ceil(screenSize.height / (_mapTileSize.height)) + 1); _screenGridSize.height = ceil(screenSize.height / _mapTileSize.height) + 1;
break; break;
case TMXOrientationIso: case TMXOrientationIso:
_screenGridSize.width = (ceil(screenSize.width / (_mapTileSize.width)) + 1); _screenGridSize.width = ceil(screenSize.width / _mapTileSize.width) + 2;
_screenGridSize.height = (ceil(screenSize.height / (_mapTileSize.height/2)) + 1); _screenGridSize.height = ceil(screenSize.height / (_mapTileSize.height/2)) + 4;
break; break;
case TMXOrientationHex: case TMXOrientationHex:
break; break;
@ -427,32 +429,32 @@ void TMXLayer2::parseInternalProperties()
{ {
// if cc_vertex=automatic, then tiles will be rendered using vertexz // if cc_vertex=automatic, then tiles will be rendered using vertexz
auto vertexz = getProperty("cc_vertexz"); // auto vertexz = getProperty("cc_vertexz");
if (!vertexz.isNull()) // if (!vertexz.isNull())
{ // {
std::string vertexZStr = vertexz.asString(); // std::string vertexZStr = vertexz.asString();
// If "automatic" is on, then parse the "cc_alpha_func" too // // If "automatic" is on, then parse the "cc_alpha_func" too
if (vertexZStr == "automatic") // if (vertexZStr == "automatic")
{ // {
_useAutomaticVertexZ = true; // _useAutomaticVertexZ = true;
auto alphaFuncVal = getProperty("cc_alpha_func"); // auto alphaFuncVal = getProperty("cc_alpha_func");
float alphaFuncValue = alphaFuncVal.asFloat(); // float alphaFuncValue = alphaFuncVal.asFloat();
setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST)); // setShaderProgram(ShaderCache::getInstance()->getProgram(GLProgram::SHADER_NAME_POSITION_TEXTURE_ALPHA_TEST));
//
GLint alphaValueLocation = glGetUniformLocation(getShaderProgram()->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE); // GLint alphaValueLocation = glGetUniformLocation(getShaderProgram()->getProgram(), GLProgram::UNIFORM_NAME_ALPHA_TEST_VALUE);
//
// NOTE: alpha test shader is hard-coded to use the equivalent of a glAlphaFunc(GL_GREATER) comparison // // NOTE: alpha test shader is hard-coded to use the equivalent of a glAlphaFunc(GL_GREATER) comparison
//
// use shader program to set uniform // // use shader program to set uniform
getShaderProgram()->use(); // getShaderProgram()->use();
getShaderProgram()->setUniformLocationWith1f(alphaValueLocation, alphaFuncValue); // getShaderProgram()->setUniformLocationWith1f(alphaValueLocation, alphaFuncValue);
CHECK_GL_ERROR_DEBUG(); // CHECK_GL_ERROR_DEBUG();
} // }
else // else
{ // {
_vertexZvalue = vertexz.asInt(); // _vertexZvalue = vertexz.asInt();
} // }
} // }
} }

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

@ -283,8 +283,11 @@ TMXOrthoTest::TMXOrthoTest()
//auto color = LayerColor::create( Color4B(64,64,64,255) ); //auto color = LayerColor::create( Color4B(64,64,64,255) );
//addChild(color, -1); //addChild(color, -1);
auto map = TMXTiledMap2::create("TileMaps/iso-test.tmx"); // riq
// auto map = TMXTiledMap2::create("TileMaps/iso-test1.tmx");
// auto map = TMXTiledMap2::create("TileMaps/orthogonal-test2.tmx"); // auto map = TMXTiledMap2::create("TileMaps/orthogonal-test2.tmx");
auto map = TMXTiledMap::create("TileMaps/orthogonal-test-vertexz.tmx");
addChild(map, 0, kTagTileMap); addChild(map, 0, kTagTileMap);
Size CC_UNUSED s = map->getContentSize(); Size CC_UNUSED s = map->getContentSize();