1 files changed, 12 insertions, 9 deletions

diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp
index 4f892a31fc..9d70b75027 100644
--- a/scene/2d/tile_map.cpp
+++ b/scene/2d/tile_map.cpp
@@ -29,7 +29,7 @@
 /*************************************************************************/
 #include "tile_map.h"
 #include "io/marshalls.h"
-#include "method_bind_ext.inc"
+#include "method_bind_ext.gen.inc"
 #include "os/os.h"
 #include "servers/physics_2d_server.h"
 
@@ -441,35 +441,38 @@ void TileMap::_update_dirty_quadrants() {
 					rect.position.y -= center.y;
 			}
 
+			Ref<Texture> normal_map = tile_set->tile_get_normal_map(c.id);
 			Color modulate = tile_set->tile_get_modulate(c.id);
 			Color self_modulate = get_self_modulate();
 			modulate = Color(modulate.r * self_modulate.r, modulate.g * self_modulate.g,
 					modulate.b * self_modulate.b, modulate.a * self_modulate.a);
 			if (r == Rect2()) {
-				tex->draw_rect(canvas_item, rect, false, modulate, c.transpose);
+				tex->draw_rect(canvas_item, rect, false, modulate, c.transpose, normal_map);
 			} else {
-				tex->draw_rect_region(canvas_item, rect, r, modulate, c.transpose);
+				tex->draw_rect_region(canvas_item, rect, r, modulate, c.transpose, normal_map);
 			}
 
-			Vector<Ref<Shape2D> > shapes = tile_set->tile_get_shapes(c.id);
+			Vector<TileSet::ShapeData> shapes = tile_set->tile_get_shapes(c.id);
 
 			for (int i = 0; i < shapes.size(); i++) {
 
-				Ref<Shape2D> shape = shapes[i];
+				Ref<Shape2D> shape = shapes[i].shape;
 				if (shape.is_valid()) {
-
-					Vector2 shape_ofs = tile_set->tile_get_shape_offset(c.id);
 					Transform2D xform;
 					xform.set_origin(offset.floor());
 
-					_fix_cell_transform(xform, c, shape_ofs + center_ofs, s);
+					_fix_cell_transform(xform, c, center_ofs, s);
+
+					xform *= shapes[i].shape_transform;
 
 					if (debug_canvas_item.is_valid()) {
 						vs->canvas_item_add_set_transform(debug_canvas_item, xform);
 						shape->draw(debug_canvas_item, debug_collision_color);
 					}
 					ps->body_add_shape(q.body, shape->get_rid(), xform);
-					ps->body_set_shape_metadata(q.body, shape_idx++, Vector2(E->key().x, E->key().y));
+					ps->body_set_shape_metadata(q.body, shape_idx, Vector2(E->key().x, E->key().y));
+					ps->body_set_shape_as_one_way_collision(q.body, shape_idx, shapes[i].one_way_collision);
+					shape_idx++;
 				}
 			}