1 files changed, 17 insertions, 29 deletions

diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h
index 3c964ec667..78f34e46ce 100644
--- a/scene/resources/tile_set.h
+++ b/scene/resources/tile_set.h
@@ -34,13 +34,12 @@
 #include "core/array.h"
 #include "core/resource.h"
 #include "scene/2d/light_occluder_2d.h"
-#include "scene/2d/navigation_polygon.h"
+#include "scene/2d/navigation_region_2d.h"
 #include "scene/resources/convex_polygon_shape_2d.h"
 #include "scene/resources/shape_2d.h"
 #include "scene/resources/texture.h"
 
 class TileSet : public Resource {
-
 	GDCLASS(TileSet, Resource);
 
 public:
@@ -48,13 +47,10 @@ public:
 		Ref<Shape2D> shape;
 		Transform2D shape_transform;
 		Vector2 autotile_coord;
-		bool one_way_collision;
-		float one_way_collision_margin;
+		bool one_way_collision = false;
+		float one_way_collision_margin = 1.0;
 
-		ShapeData() {
-			one_way_collision = false;
-			one_way_collision_margin = 1.0;
-		}
+		ShapeData() {}
 	};
 
 	enum BitmaskMode {
@@ -92,27 +88,22 @@ public:
 	};
 
 	struct AutotileData {
-		BitmaskMode bitmask_mode;
-		Size2 size;
-		int spacing;
-		Vector2 icon_coord;
+		BitmaskMode bitmask_mode = BITMASK_2X2;
+		// Default size to prevent invalid value
+		Size2 size = Size2(64, 64);
+		Vector2 icon_coord = Vector2(0, 0);
+		int spacing = 0;
 		Map<Vector2, uint32_t> flags;
 		Map<Vector2, Ref<OccluderPolygon2D>> occluder_map;
 		Map<Vector2, Ref<NavigationPolygon>> navpoly_map;
 		Map<Vector2, int> priority_map;
 		Map<Vector2, int> z_index_map;
 
-		// Default size to prevent invalid value
-		explicit AutotileData() :
-				bitmask_mode(BITMASK_2X2),
-				size(64, 64),
-				spacing(0),
-				icon_coord(0, 0) {}
+		explicit AutotileData() {}
 	};
 
 private:
 	struct TileData {
-
 		String name;
 		Ref<Texture2D> texture;
 		Ref<Texture2D> normal_map;
@@ -124,16 +115,13 @@ private:
 		Vector2 navigation_polygon_offset;
 		Ref<NavigationPolygon> navigation_polygon;
 		Ref<ShaderMaterial> material;
-		TileMode tile_mode;
-		Color modulate;
+		TileMode tile_mode = SINGLE_TILE;
+		// Default modulate for back-compat
+		Color modulate = Color(1, 1, 1);
 		AutotileData autotile_data;
-		int z_index;
+		int z_index = 0;
 
-		// Default modulate for back-compat
-		explicit TileData() :
-				tile_mode(SINGLE_TILE),
-				modulate(1, 1, 1),
-				z_index(0) {}
+		explicit TileData() {}
 	};
 
 	Map<int, TileData> tile_map;
@@ -194,8 +182,8 @@ public:
 	void autotile_set_bitmask(int p_id, Vector2 p_coord, uint32_t p_flag);
 	uint32_t autotile_get_bitmask(int p_id, Vector2 p_coord);
 	const Map<Vector2, uint32_t> &autotile_get_bitmask_map(int p_id);
-	Vector2 autotile_get_subtile_for_bitmask(int p_id, uint16_t p_bitmask, const Node *p_tilemap_node = NULL, const Vector2 &p_tile_location = Vector2());
-	Vector2 atlastile_get_subtile_by_priority(int p_id, const Node *p_tilemap_node = NULL, const Vector2 &p_tile_location = Vector2());
+	Vector2 autotile_get_subtile_for_bitmask(int p_id, uint16_t p_bitmask, const Node *p_tilemap_node = nullptr, const Vector2 &p_tile_location = Vector2());
+	Vector2 atlastile_get_subtile_by_priority(int p_id, const Node *p_tilemap_node = nullptr, const Vector2 &p_tile_location = Vector2());
 
 	void tile_set_shape(int p_id, int p_shape_id, const Ref<Shape2D> &p_shape);
 	Ref<Shape2D> tile_get_shape(int p_id, int p_shape_id) const;