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

Merge pull request #28896 from Ranoller/master

Browse source 
Fix tilemap displaced textures and shapes
This commit is contained in:
Rémi Verschelde 2019-05-28 22:25:18 +02:00 committed by GitHub
commit 84331549db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
editor/plugins/tile_map_editor_plugin.cpp
View file

@ -760,7 +760,7 @@ void TileMapEditor::_draw_cell(Control *p_viewport, int p_cell, const Point2i &p
r.position += (r.size + Vector2(spacing, spacing)) * offset; r.position += (r.size + Vector2(spacing, spacing)) * offset;
} }
Size2 sc = p_xform.get_scale(); Size2 sc = p_xform.get_scale();
Size2 cell_size = node->get_cell_size();
Rect2 rect = Rect2(); Rect2 rect = Rect2();
rect.position = node->map_to_world(p_point) + node->get_cell_draw_offset(); rect.position = node->map_to_world(p_point) + node->get_cell_draw_offset();
@ -770,62 +770,25 @@ void TileMapEditor::_draw_cell(Control *p_viewport, int p_cell, const Point2i &p
rect.size = r.size; rect.size = r.size;
} }
if (rect.size.y > rect.size.x) {
if ((p_flip_h && (p_flip_v || p_transpose)) || (p_flip_v && !p_transpose))
tile_ofs.y += rect.size.y - rect.size.x;
} else if (rect.size.y < rect.size.x) {
if ((p_flip_v && (p_flip_h || p_transpose)) || (p_flip_h && !p_transpose))
tile_ofs.x += rect.size.x - rect.size.y;
}
if (p_transpose) { if (p_transpose) {
SWAP(tile_ofs.x, tile_ofs.y); SWAP(tile_ofs.x, tile_ofs.y);
rect.position.x += cell_size.x / 2 - rect.size.y / 2;
rect.position.y += cell_size.y / 2 - rect.size.x / 2;
} else {
rect.position += cell_size / 2 - rect.size / 2;
} }
if (p_flip_h) { if (p_flip_h) {
sc.x *= -1.0; sc.x *= -1.0;
tile_ofs.x *= -1.0; tile_ofs.x *= -1.0;
} }
if (p_flip_v) { if (p_flip_v) {
sc.y *= -1.0; sc.y *= -1.0;
tile_ofs.y *= -1.0; tile_ofs.y *= -1.0;
} }
if (node->get_tile_origin() == TileMap::TILE_ORIGIN_TOP_LEFT) {
rect.position += tile_ofs; rect.position += tile_ofs;
} else if (node->get_tile_origin() == TileMap::TILE_ORIGIN_BOTTOM_LEFT) {
Size2 cell_size = node->get_cell_size();
rect.position += tile_ofs;
if (p_transpose) {
if (p_flip_h)
rect.position.x -= cell_size.x;
else
rect.position.x += cell_size.x;
} else {
if (p_flip_v)
rect.position.y -= cell_size.y;
else
rect.position.y += cell_size.y;
}
} else if (node->get_tile_origin() == TileMap::TILE_ORIGIN_CENTER) {
Size2 cell_size = node->get_cell_size();
rect.position += tile_ofs;
if (p_flip_h)
rect.position.x -= cell_size.x / 2;
else
rect.position.x += cell_size.x / 2;
if (p_flip_v)
rect.position.y -= cell_size.y / 2;
else
rect.position.y += cell_size.y / 2;
}
rect.position = p_xform.xform(rect.position); rect.position = p_xform.xform(rect.position);
rect.size *= sc; rect.size *= sc;

91
scene/2d/tile_map.cpp
View file

@ -202,47 +202,27 @@ void TileMap::_fix_cell_transform(Transform2D &xform, const Cell &p_cell, const
Size2 s = p_sc; Size2 s = p_sc;
Vector2 offset = p_offset; Vector2 offset = p_offset;
if (tile_origin == TILE_ORIGIN_BOTTOM_LEFT)
offset.y += cell_size.y;
else if (tile_origin == TILE_ORIGIN_CENTER) {
offset += cell_size / 2;
}
if (s.y > s.x) {
if ((p_cell.flip_h && (p_cell.flip_v || p_cell.transpose)) || (p_cell.flip_v && !p_cell.transpose))
offset.y += s.y - s.x;
} else if (s.y < s.x) {
if ((p_cell.flip_v && (p_cell.flip_h || p_cell.transpose)) || (p_cell.flip_h && !p_cell.transpose))
offset.x += s.x - s.y;
}
if (p_cell.transpose) { if (p_cell.transpose) {
SWAP(xform.elements[0].x, xform.elements[0].y); SWAP(xform.elements[0].x, xform.elements[0].y);
SWAP(xform.elements[1].x, xform.elements[1].y); SWAP(xform.elements[1].x, xform.elements[1].y);
SWAP(offset.x, offset.y); SWAP(offset.x, offset.y);
SWAP(s.x, s.y); SWAP(s.x, s.y);
} }
if (p_cell.flip_h) { if (p_cell.flip_h) {
xform.elements[0].x = -xform.elements[0].x; xform.elements[0].x = -xform.elements[0].x;
xform.elements[1].x = -xform.elements[1].x; xform.elements[1].x = -xform.elements[1].x;
if (tile_origin == TILE_ORIGIN_TOP_LEFT || tile_origin == TILE_ORIGIN_BOTTOM_LEFT)
offset.x = s.x - offset.x; offset.x = s.x - offset.x;
else if (tile_origin == TILE_ORIGIN_CENTER)
offset.x = s.x - offset.x / 2;
} }
if (p_cell.flip_v) { if (p_cell.flip_v) {
xform.elements[0].y = -xform.elements[0].y; xform.elements[0].y = -xform.elements[0].y;
xform.elements[1].y = -xform.elements[1].y; xform.elements[1].y = -xform.elements[1].y;
if (tile_origin == TILE_ORIGIN_TOP_LEFT)
offset.y = s.y - offset.y; offset.y = s.y - offset.y;
else if (tile_origin == TILE_ORIGIN_BOTTOM_LEFT) {
offset.y += s.y;
} else if (tile_origin == TILE_ORIGIN_CENTER) {
offset.y += s.y;
} }
}
xform.elements[2].x += offset.x; offset += cell_size / 2 - s / 2;
xform.elements[2].y += offset.y; xform.elements[2] += offset;
} }
void TileMap::update_dirty_quadrants() { void TileMap::update_dirty_quadrants() {
@ -390,65 +370,26 @@ void TileMap::update_dirty_quadrants() {
rect.size.x += fp_adjust; rect.size.x += fp_adjust;
rect.size.y += fp_adjust; rect.size.y += fp_adjust;
if (rect.size.y > rect.size.x) { if (c.transpose) {
if ((c.flip_h && (c.flip_v || c.transpose)) || (c.flip_v && !c.transpose))
tile_ofs.y += rect.size.y - rect.size.x;
} else if (rect.size.y < rect.size.x) {
if ((c.flip_v && (c.flip_h || c.transpose)) || (c.flip_h && !c.transpose))
tile_ofs.x += rect.size.x - rect.size.y;
}
/* rect.size.x+=fp_adjust;
rect.size.y+=fp_adjust;*/
if (c.transpose)
SWAP(tile_ofs.x, tile_ofs.y); SWAP(tile_ofs.x, tile_ofs.y);
rect.position.x += cell_size.x / 2 - rect.size.y / 2;
rect.position.y += cell_size.y / 2 - rect.size.x / 2;
} else {
rect.position += cell_size / 2 - rect.size / 2;
}
if (c.flip_h) { if (c.flip_h) {
rect.size.x = -rect.size.x; rect.size.x = -rect.size.x;
tile_ofs.x = -tile_ofs.x; tile_ofs.x = -tile_ofs.x;
} }
if (c.flip_v) { if (c.flip_v) {
rect.size.y = -rect.size.y; rect.size.y = -rect.size.y;
tile_ofs.y = -tile_ofs.y; tile_ofs.y = -tile_ofs.y;
} }
Vector2 center_ofs;
if (tile_origin == TILE_ORIGIN_TOP_LEFT) {
rect.position += tile_ofs; rect.position += tile_ofs;
} else if (tile_origin == TILE_ORIGIN_BOTTOM_LEFT) {
rect.position += tile_ofs;
if (c.transpose) {
if (c.flip_h)
rect.position.x -= cell_size.x;
else
rect.position.x += cell_size.x;
} else {
if (c.flip_v)
rect.position.y -= cell_size.y;
else
rect.position.y += cell_size.y;
}
} else if (tile_origin == TILE_ORIGIN_CENTER) {
rect.position += tile_ofs;
if (c.flip_h)
rect.position.x -= cell_size.x / 2;
else
rect.position.x += cell_size.x / 2;
if (c.flip_v)
rect.position.y -= cell_size.y / 2;
else
rect.position.y += cell_size.y / 2;
}
Ref<Texture> normal_map = tile_set->tile_get_normal_map(c.id); Ref<Texture> normal_map = tile_set->tile_get_normal_map(c.id);
Color modulate = tile_set->tile_get_modulate(c.id); Color modulate = tile_set->tile_get_modulate(c.id);
Color self_modulate = get_self_modulate(); Color self_modulate = get_self_modulate();
@ -471,7 +412,7 @@ void TileMap::update_dirty_quadrants() {
Vector2 shape_ofs = shapes[j].shape_transform.get_origin(); Vector2 shape_ofs = shapes[j].shape_transform.get_origin();
_fix_cell_transform(xform, c, shape_ofs + center_ofs, s); _fix_cell_transform(xform, c, shape_ofs, s);
xform *= shapes[j].shape_transform.untranslated(); xform *= shapes[j].shape_transform.untranslated();
@ -523,7 +464,7 @@ void TileMap::update_dirty_quadrants() {
if (navpoly.is_valid()) { if (navpoly.is_valid()) {
Transform2D xform; Transform2D xform;
xform.set_origin(offset.floor() + q.pos); xform.set_origin(offset.floor() + q.pos);
_fix_cell_transform(xform, c, npoly_ofs + center_ofs, s); _fix_cell_transform(xform, c, npoly_ofs, s);
int pid = navigation->navpoly_add(navpoly, nav_rel * xform); int pid = navigation->navpoly_add(navpoly, nav_rel * xform);
@ -573,7 +514,7 @@ void TileMap::update_dirty_quadrants() {
} }
Transform2D navxform; Transform2D navxform;
navxform.set_origin(offset.floor()); navxform.set_origin(offset.floor());
_fix_cell_transform(navxform, c, npoly_ofs + center_ofs, s); _fix_cell_transform(navxform, c, npoly_ofs, s);
vs->canvas_item_set_transform(debug_navigation_item, navxform); vs->canvas_item_set_transform(debug_navigation_item, navxform);
vs->canvas_item_add_triangle_array(debug_navigation_item, indices, vertices, colors); vs->canvas_item_add_triangle_array(debug_navigation_item, indices, vertices, colors);
@ -593,7 +534,7 @@ void TileMap::update_dirty_quadrants() {
Vector2 occluder_ofs = tile_set->tile_get_occluder_offset(c.id); Vector2 occluder_ofs = tile_set->tile_get_occluder_offset(c.id);
Transform2D xform; Transform2D xform;
xform.set_origin(offset.floor() + q.pos); xform.set_origin(offset.floor() + q.pos);
_fix_cell_transform(xform, c, occluder_ofs + center_ofs, s); _fix_cell_transform(xform, c, occluder_ofs, s);
RID orid = VS::get_singleton()->canvas_light_occluder_create(); RID orid = VS::get_singleton()->canvas_light_occluder_create();
VS::get_singleton()->canvas_light_occluder_set_transform(orid, get_global_transform() * xform); VS::get_singleton()->canvas_light_occluder_set_transform(orid, get_global_transform() * xform);