asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compie error in TileMap::_fix_cell_transform(...)

Browse source
This commit is contained in:
marynate 2015-03-09 16:28:08 +08:00
parent 09489e3a78
commit 7957709cb1
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scene/2d/tile_map.cpp
View file

@ -215,23 +215,24 @@ bool TileMap::get_center_y() const {
return center_y;
}
void TileMap::_fix_cell_transform(Matrix32& xform,const Cell& c,Vector2& offset,const Size2 &sc) {
void TileMap::_fix_cell_transform(Matrix32& xform,const Cell& p_cell, const Vector2& p_offset, const Size2 &p_sc) {
Size2 s=sc;
Size2 s=p_sc;
Vector2 offset = p_offset;
if (c.transpose) {
if (p_cell.transpose) {
SWAP(xform.elements[0].x, xform.elements[0].y);
SWAP(xform.elements[1].x, xform.elements[1].y);
SWAP(offset.x, offset.y);
SWAP(s.x, s.y);
}
if (c.flip_h) {
if (p_cell.flip_h) {
xform.elements[0].x=-xform.elements[0].x;
xform.elements[1].x=-xform.elements[1].x;
if (tile_origin==TILE_ORIGIN_TOP_LEFT)
offset.x=s.x-offset.x;
}
if (c.flip_v) {
if (p_cell.flip_v) {
xform.elements[0].y=-xform.elements[0].y;
xform.elements[1].y=-xform.elements[1].y;
if (tile_origin==TILE_ORIGIN_TOP_LEFT)

2
scene/2d/tile_map.h
View file

@ -148,7 +148,7 @@ private:
uint32_t collision_layer;
TileOrigin tile_origin;
void _fix_cell_transform(Matrix32& xform, const Cell& c, Vector2 &offset, const Size2 &s);
void _fix_cell_transform(Matrix32& xform, const Cell& p_cell, const Vector2 &p_offset, const Size2 &p_sc);
Map<PosKey,Quadrant>::Element *_create_quadrant(const PosKey& p_qk);
void _erase_quadrant(Map<PosKey,Quadrant>::Element *Q);