Bläddra i källkod

Merge pull request #14421 from PJB3005/17-12-08-fix_tilemap_occluder_offset

Fixes TileMap occluder offsets.
Rémi Verschelde 7 år sedan
förälder
incheckning
015cfc592d
1 ändrade filer med 1 tillägg och 4 borttagningar
  1. 1 4
      scene/2d/tile_map.cpp

+ 1 - 4
scene/2d/tile_map.cpp

@@ -513,16 +513,13 @@ void TileMap::_update_dirty_quadrants() {
 			}
 			}
 
 
 			Ref<OccluderPolygon2D> occluder;
 			Ref<OccluderPolygon2D> occluder;
-			Vector2 occluder_ofs;
 			if (tile_set->tile_get_is_autotile(c.id)) {
 			if (tile_set->tile_get_is_autotile(c.id)) {
 				occluder = tile_set->autotile_get_light_occluder(c.id, Vector2(c.autotile_coord_x, c.autotile_coord_y));
 				occluder = tile_set->autotile_get_light_occluder(c.id, Vector2(c.autotile_coord_x, c.autotile_coord_y));
-				occluder_ofs = tile_set->tile_get_occluder_offset(c.id);
 			} else {
 			} else {
 				occluder = tile_set->tile_get_light_occluder(c.id);
 				occluder = tile_set->tile_get_light_occluder(c.id);
-				occluder_ofs = Vector2();
 			}
 			}
 			if (occluder.is_valid()) {
 			if (occluder.is_valid()) {
-
+				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 + center_ofs, s);