Update TileMap nodes to TileMapLayer in various demos (#1276)

2d/hexagonal_map/project.godot

@@ -14,7 +14,7 @@ config/name="Hexagonal Game"
 config/description="Very simple demo showing a hexagonal TileMap and TileSet."
 config/tags=PackedStringArray("2d", "demo", "official", "tilemap")
 run/main_scene="res://map.tscn"
-config/features=PackedStringArray("4.5")
+config/features=PackedStringArray("4.6")
 config/icon="res://icon.webp"
 
 [debug]

2d/kinematic_character/project.godot

@@ -16,7 +16,7 @@ CharacterBody2D. The character moves around, is affected by moving
 platforms, can jump through one-way collision platforms, etc."
 config/tags=PackedStringArray("2d", "demo", "official", "physics")
 run/main_scene="res://world.tscn"
-config/features=PackedStringArray("4.5")
+config/features=PackedStringArray("4.6")
 config/icon="res://icon.webp"
 
 [debug]

2d/physics_platformer/project.godot

@@ -17,7 +17,7 @@ but can be more difficult to handle, as they require
 manual modification of the RigidBody3D velocity."
 config/tags=PackedStringArray("2d", "demo", "official", "physics", "tilemap")
 run/main_scene="res://stage.tscn"
-config/features=PackedStringArray("4.5")
+config/features=PackedStringArray("4.6")
 config/icon="res://icon.webp"
 
 [debug]

2d/physics_tests/project.godot

@@ -13,7 +13,7 @@ config_version=5
 config/name="2D Physics Tests"
 config/tags=PackedStringArray("2d", "demo", "official", "physics")
 run/main_scene="res://main.tscn"
-config/features=PackedStringArray("4.5")
+config/features=PackedStringArray("4.6")
 config/icon="res://icon.webp"
 
 [autoload]

2d/physics_tests/tests/functional/test_character_tilemap.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=12 format=3 uid="uid://c6ncvkymn6dj3"]
+[gd_scene load_steps=12 format=4 uid="uid://c6ncvkymn6dj3"]
 
 [ext_resource type="Script" uid="uid://42jfsqbo43g2" path="res://tests/functional/test_character_tilemap.gd" id="1"]
 [ext_resource type="PackedScene" uid="uid://cwjfkltvisc0n" path="res://tests/test_options.tscn" id="3"]
@@ -22,26 +22,26 @@ friction = 0.0
 [sub_resource type="CircleShape2D" id="5"]
 radius = 16.0
 
-[node name="Test" type="Node2D"]
+[node name="Test" type="Node2D" unique_id=1030636021]
 script = ExtResource("1")
 
-[node name="LabelTestType" type="Label" parent="."]
+[node name="LabelTestType" type="Label" parent="." unique_id=273813499]
 offset_left = 14.0
 offset_top = 79.0
 offset_right = 145.0
 offset_bottom = 93.0
 text = "Testing: "
 
-[node name="Options" parent="." instance=ExtResource("3")]
+[node name="Options" parent="." unique_id=2047291445 instance=ExtResource("3")]
 
-[node name="LabelFloor" type="Label" parent="."]
+[node name="LabelFloor" type="Label" parent="." unique_id=1280584256]
 offset_left = 14.0
 offset_top = 237.929
 offset_right = 145.0
 offset_bottom = 251.929
 text = "ON FLOOR"
 
-[node name="LabelControls" type="Label" parent="."]
+[node name="LabelControls" type="Label" parent="." unique_id=913594692]
 offset_left = 14.0
 offset_top = 263.291
 offset_right = 145.0
@@ -49,41 +49,41 @@ offset_bottom = 277.291
 text = "LEFT/RIGHT - MOVE
 UP - JUMP"
 
-[node name="CharacterBody2D" type="CharacterBody2D" parent="."]
+[node name="CharacterBody2D" type="CharacterBody2D" parent="." unique_id=2071269796]
 position = Vector2(250, 460)
 collision_mask = 2147483649
 script = ExtResource("7")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D" unique_id=1318848413]
 shape = SubResource("2")
 debug_color = Color(0, 1, 0, 0.0980392)
 
-[node name="CharacterBodyRay2D" type="CharacterBody2D" parent="."]
+[node name="CharacterBodyRay2D" type="CharacterBody2D" parent="." unique_id=1233905106]
 position = Vector2(250, 460)
 collision_mask = 2147483649
 script = ExtResource("7")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBodyRay2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBodyRay2D" unique_id=176094435]
 position = Vector2(0, -8)
 shape = SubResource("RectangleShape2D_jx2e1")
 debug_color = Color(0, 1, 0, 0.0980392)
 
-[node name="CollisionShapeRay2D" type="CollisionShape2D" parent="CharacterBodyRay2D"]
+[node name="CollisionShapeRay2D" type="CollisionShape2D" parent="CharacterBodyRay2D" unique_id=442666417]
 position = Vector2(0, 8)
 shape = SubResource("RayShape2D_206f5")
 debug_color = Color(0, 1, 0, 0.0980392)
 
-[node name="CollisionShapeRay2DLeft" type="CollisionShape2D" parent="CharacterBodyRay2D"]
+[node name="CollisionShapeRay2DLeft" type="CollisionShape2D" parent="CharacterBodyRay2D" unique_id=1547201264]
 position = Vector2(-12, 8)
 shape = SubResource("RayShape2D_206f5")
 debug_color = Color(0, 1, 0, 0.0980392)
 
-[node name="CollisionShapeRay2DRight" type="CollisionShape2D" parent="CharacterBodyRay2D"]
+[node name="CollisionShapeRay2DRight" type="CollisionShape2D" parent="CharacterBodyRay2D" unique_id=661455822]
 position = Vector2(12, 8)
 shape = SubResource("RayShape2D_206f5")
 debug_color = Color(0, 1, 0, 0.0980392)
 
-[node name="RigidDynamicBody2D" type="RigidBody2D" parent="."]
+[node name="RigidDynamicBody2D" type="RigidBody2D" parent="." unique_id=1443676515]
 position = Vector2(250, 460)
 collision_mask = 2147483649
 physics_material_override = SubResource("1")
@@ -91,11 +91,11 @@ lock_rotation = true
 contact_monitor = true
 script = ExtResource("6")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidDynamicBody2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidDynamicBody2D" unique_id=2123118332]
 shape = SubResource("2")
 debug_color = Color(1, 1, 0, 0.0980392)
 
-[node name="RigidBodyRay2D" type="RigidBody2D" parent="."]
+[node name="RigidBodyRay2D" type="RigidBody2D" parent="." unique_id=2052998667]
 position = Vector2(250, 460)
 collision_mask = 2147483649
 physics_material_override = SubResource("1")
@@ -103,51 +103,51 @@ lock_rotation = true
 contact_monitor = true
 script = ExtResource("6")
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBodyRay2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBodyRay2D" unique_id=223096978]
 position = Vector2(0, -8)
 shape = SubResource("RectangleShape2D_jx2e1")
 debug_color = Color(1, 1, 0, 0.0980392)
 
-[node name="CollisionShapeRay2D" type="CollisionShape2D" parent="RigidBodyRay2D"]
+[node name="CollisionShapeRay2D" type="CollisionShape2D" parent="RigidBodyRay2D" unique_id=1354570530]
 position = Vector2(0, 8)
 shape = SubResource("RayShape2D_206f5")
 debug_color = Color(1, 1, 0, 0.0980392)
 
-[node name="CollisionShapeRay2DLeft" type="CollisionShape2D" parent="RigidBodyRay2D"]
+[node name="CollisionShapeRay2DLeft" type="CollisionShape2D" parent="RigidBodyRay2D" unique_id=1913232198]
 position = Vector2(-12, 8)
 shape = SubResource("RayShape2D_206f5")
 debug_color = Color(1, 1, 0, 0.0980392)
 
-[node name="CollisionShapeRay2DRight" type="CollisionShape2D" parent="RigidBodyRay2D"]
+[node name="CollisionShapeRay2DRight" type="CollisionShape2D" parent="RigidBodyRay2D" unique_id=1331621464]
 position = Vector2(12, 8)
 shape = SubResource("RayShape2D_206f5")
 debug_color = Color(1, 1, 0, 0.0980392)
 
-[node name="JumpTargetArea2D" type="Area2D" parent="."]
+[node name="JumpTargetArea2D" type="Area2D" parent="." unique_id=1409049323]
 visible = false
 position = Vector2(810, 390)
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="JumpTargetArea2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="JumpTargetArea2D" unique_id=741917641]
 shape = SubResource("5")
 disabled = true
 debug_color = Color(1, 0, 1, 0.0980392)
 
-[node name="FallTargetArea2D" type="Area2D" parent="."]
+[node name="FallTargetArea2D" type="Area2D" parent="." unique_id=29405138]
 visible = false
 position = Vector2(250, 480)
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="FallTargetArea2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="FallTargetArea2D" unique_id=1901041162]
 shape = SubResource("5")
 disabled = true
 debug_color = Color(1, 0, 1, 0.0980392)
 
-[node name="StaticSceneFlat" parent="." instance=ExtResource("4")]
+[node name="StaticSceneFlat" parent="." unique_id=1023216057 instance=ExtResource("4")]
 position = Vector2(0, 12)
 
-[node name="TileMap" type="TileMap" parent="."]
+[node name="TileMapLayer" type="TileMapLayer" parent="." unique_id=1978972898]
 texture_filter = 1
+use_parent_material = true
 scale = Vector2(2, 2)
+tile_map_data = PackedByteArray("AAAGAAwAAAABAAAAAAAHAAwAAAABAAAAAAAIAAwAAAABAAAAAAAJAAwAAAABAAAAAAAMAAcAAAABAAAAAAAMAAgAAAABAAAAAAAMAAkAAAABAAAAAAAMAAoAAAABAAAAAAAMAAsAAAABAAAAAAAMAAwAAAABAAAAAAAMAA0AAAABAAAAAAAMAA4AAAABAAAAAAAMAA8AAAABAAAAAAANAAcAAAABAAAAAAANAAgAAAABAAAAAAANAAkAAAABAAAAAAANAAoAAAABAAAAAAANAAsAAAABAAAAAAANAAwAAAABAAAAAAANAA0AAAABAAAAAAANAA4AAAABAAAAAAANAA8AAAABAAAAAAAOAAcAAAABAAAAAAAOAAgAAAABAAAAAAAOAAkAAAABAAAAAAAOAAoAAAABAAAAAAAOAAsAAAABAAAAAAAOAAwAAAABAAAAAAAOAA0AAAABAAAAAAAOAA4AAAABAAAAAAAOAA8AAAABAAAAAAAPAAcAAAABAAAAAAAPAAgAAAABAAAAAAAPAAkAAAABAAAAAAAPAAoAAAABAAAAAAAPAAsAAAABAAAAAAAPAAwAAAABAAAAAAAPAA0AAAABAAAAAAAPAA4AAAABAAAAAAAPAA8AAAABAAAAAAAQAAcAAAABAAAAAAAQAAgAAAABAAAAAAAQAAkAAAABAAAAAAAQAAoAAAABAAAAAAAQAAsAAAABAAAAAAAQAAwAAAABAAAAAAAQAA0AAAABAAAAAAAQAA4AAAABAAAAAAAQAA8AAAABAAAAAAARAAcAAAABAAAAAAARAAgAAAABAAAAAAARAAkAAAABAAAAAAARAAoAAAABAAAAAAARAAsAAAABAAAAAAARAAwAAAABAAAAAAARAA0AAAABAAAAAAARAA4AAAABAAAAAAARAA8AAAABAAAAAAASAAcAAAABAAAAAAASAAgAAAABAAAAAAASAAkAAAABAAAAAAASAAoAAAABAAAAAAASAAsAAAABAAAAAAASAAwAAAABAAAAAAASAA0AAAABAAAAAAASAA4AAAABAAAAAAASAA8AAAABAAAAAAATAAcAAAABAAAAAAATAAgAAAABAAAAAAATAAkAAAABAAAAAAATAAoAAAABAAAAAAATAAsAAAABAAAAAAATAAwAAAABAAAAAAATAA0AAAABAAAAAAATAA4AAAABAAAAAAATAA8AAAABAAAAAAAYAA0AAAAAAAAAAAAZAA0AAAAAAAAAAAAaAAsAAAAAAAAAAAAaAA0AAAAAAAAAAAAbAAsAAAAAAAAAAAAbAA0AAAAAAAAAAAAcAAsAAAAAAAAAAAAdAAsAAAAAAAAAAAA=")
 tile_set = ExtResource("5")
 collision_visibility_mode = 1
-format = 2
-layer_0/tile_data = PackedInt32Array(786438, 65536, 0, 786439, 65536, 0, 786440, 65536, 0, 786441, 65536, 0, 458764, 65536, 0, 524300, 65536, 0, 589836, 65536, 0, 655372, 65536, 0, 720908, 65536, 0, 786444, 65536, 0, 851980, 65536, 0, 917516, 65536, 0, 983052, 65536, 0, 458765, 65536, 0, 524301, 65536, 0, 589837, 65536, 0, 655373, 65536, 0, 720909, 65536, 0, 786445, 65536, 0, 851981, 65536, 0, 917517, 65536, 0, 983053, 65536, 0, 458766, 65536, 0, 524302, 65536, 0, 589838, 65536, 0, 655374, 65536, 0, 720910, 65536, 0, 786446, 65536, 0, 851982, 65536, 0, 917518, 65536, 0, 983054, 65536, 0, 458767, 65536, 0, 524303, 65536, 0, 589839, 65536, 0, 655375, 65536, 0, 720911, 65536, 0, 786447, 65536, 0, 851983, 65536, 0, 917519, 65536, 0, 983055, 65536, 0, 458768, 65536, 0, 524304, 65536, 0, 589840, 65536, 0, 655376, 65536, 0, 720912, 65536, 0, 786448, 65536, 0, 851984, 65536, 0, 917520, 65536, 0, 983056, 65536, 0, 458769, 65536, 0, 524305, 65536, 0, 589841, 65536, 0, 655377, 65536, 0, 720913, 65536, 0, 786449, 65536, 0, 851985, 65536, 0, 917521, 65536, 0, 983057, 65536, 0, 458770, 65536, 0, 524306, 65536, 0, 589842, 65536, 0, 655378, 65536, 0, 720914, 65536, 0, 786450, 65536, 0, 851986, 65536, 0, 917522, 65536, 0, 983058, 65536, 0, 458771, 65536, 0, 524307, 65536, 0, 589843, 65536, 0, 655379, 65536, 0, 720915, 65536, 0, 786451, 65536, 0, 851987, 65536, 0, 917523, 65536, 0, 983059, 65536, 0, 851992, 0, 0, 851993, 0, 0, 720922, 0, 0, 851994, 0, 0, 720923, 0, 0, 851995, 0, 0, 720924, 0, 0, 720925, 0, 0)

2d/skeleton/project.godot

@@ -16,7 +16,7 @@ Godot's Skeleton2D node. There are several movement-related animations and
 there is a simple character controller that controls the animations."
 config/tags=PackedStringArray("2d", "animation", "demo", "official", "rendering")
 run/main_scene="res://level.tscn"
-config/features=PackedStringArray("4.5")
+config/features=PackedStringArray("4.6")
 config/icon="res://icon.webp"
 
 [debug]