From cb3259d2b9a05d2e84bf3c5d5351c37e887607c8 Mon Sep 17 00:00:00 2001 From: CenTdemeern1 Date: Sun, 9 Feb 2025 16:53:23 +0100 Subject: [PATCH] Save the tilesets and fix an oopsie --- .../Placeholders/Square/3D/mesh_library.tres | 68 ++++++++++++++++ Assets/Placeholders/Square/tileset.tres | 54 +++++++++++++ Scenes/Debugging/Square.tscn | 78 ++----------------- 3 files changed, 130 insertions(+), 70 deletions(-) create mode 100644 Assets/Placeholders/Square/3D/mesh_library.tres create mode 100644 Assets/Placeholders/Square/tileset.tres diff --git a/Assets/Placeholders/Square/3D/mesh_library.tres b/Assets/Placeholders/Square/3D/mesh_library.tres new file mode 100644 index 0000000..1acb622 --- /dev/null +++ b/Assets/Placeholders/Square/3D/mesh_library.tres @@ -0,0 +1,68 @@ +[gd_resource type="MeshLibrary" load_steps=13 format=3 uid="uid://ctek5p2fwk8gc"] + +[ext_resource type="ArrayMesh" uid="uid://xefwv6btevpj" path="res://Assets/Placeholders/Square/3D/BrickWall.obj" id="1_urd4w"] +[ext_resource type="ArrayMesh" uid="uid://bw8afk2dpfpsj" path="res://Assets/Placeholders/Square/3D/BrickWallTop.obj" id="2_jadoi"] +[ext_resource type="Texture2D" uid="uid://cqls3eniuv2m7" path="res://Assets/Placeholders/Square/3D/Sand.png" id="3_qdqvl"] +[ext_resource type="Texture2D" uid="uid://bkxxq2xfhmbkl" path="res://Assets/Placeholders/Square/3D/Wallfloor.png" id="4_ksuun"] +[ext_resource type="Texture2D" uid="uid://bv5wms22ienmu" path="res://Assets/Placeholders/Square/3D/Bricks.png" id="5_hmn5d"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6vgx6"] +albedo_texture = ExtResource("3_qdqvl") + +[sub_resource type="PlaneMesh" id="PlaneMesh_kkspe"] +material = SubResource("StandardMaterial3D_6vgx6") +size = Vector2(1, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vwl8k"] +albedo_texture = ExtResource("4_ksuun") + +[sub_resource type="PlaneMesh" id="PlaneMesh_2lmlp"] +material = SubResource("StandardMaterial3D_vwl8k") +size = Vector2(1, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tc8xf"] +albedo_texture = ExtResource("5_hmn5d") + +[sub_resource type="PlaneMesh" id="PlaneMesh_5yk84"] +material = SubResource("StandardMaterial3D_tc8xf") +size = Vector2(1, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_2df3s"] + +[resource] +item/0/name = "Wall" +item/0/mesh = ExtResource("1_urd4w") +item/0/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/0/shapes = [] +item/0/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/0/navigation_layers = 1 +item/1/name = "WallTop" +item/1/mesh = ExtResource("2_jadoi") +item/1/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/1/shapes = [] +item/1/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/1/navigation_layers = 1 +item/2/name = "Sand" +item/2/mesh = SubResource("PlaneMesh_kkspe") +item/2/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/2/shapes = [] +item/2/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/2/navigation_layers = 1 +item/3/name = "WallFloor" +item/3/mesh = SubResource("PlaneMesh_2lmlp") +item/3/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/3/shapes = [] +item/3/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/3/navigation_layers = 1 +item/4/name = "WallFlat" +item/4/mesh = SubResource("PlaneMesh_5yk84") +item/4/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/4/shapes = [] +item/4/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/4/navigation_layers = 1 +item/5/name = "" +item/5/mesh = SubResource("BoxMesh_2df3s") +item/5/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/5/shapes = [] +item/5/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) +item/5/navigation_layers = 1 diff --git a/Assets/Placeholders/Square/tileset.tres b/Assets/Placeholders/Square/tileset.tres new file mode 100644 index 0000000..a9cb4bd --- /dev/null +++ b/Assets/Placeholders/Square/tileset.tres @@ -0,0 +1,54 @@ +[gd_resource type="TileSet" load_steps=15 format=3 uid="uid://coub5ioem1v7o"] + +[ext_resource type="Texture2D" uid="uid://bsf3i6xos65r6" path="res://Assets/Placeholders/Square/Sand.png" id="1_7bax5"] +[ext_resource type="Texture2D" uid="uid://c2e7403lr3duh" path="res://Assets/Placeholders/Square/Bricks.png" id="2_xj148"] +[ext_resource type="Texture2D" uid="uid://bmkvaiqpxr2w3" path="res://Assets/Placeholders/Square/Wall.png" id="3_mojcc"] +[ext_resource type="Texture2D" uid="uid://4ev110wa21bc" path="res://Assets/Placeholders/Square/Wallfloor.png" id="4_16rtu"] +[ext_resource type="Texture2D" uid="uid://dldouys735qnt" path="res://Assets/Placeholders/Square/torch.png" id="5_45f1h"] +[ext_resource type="Texture2D" uid="uid://cu7g2n8h1rody" path="res://Assets/Placeholders/Square/black.png" id="6_j54rv"] +[ext_resource type="Texture2D" uid="uid://dbo3i5owyna26" path="res://Assets/Placeholders/Square/light.png" id="7_c3wgh"] + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_ewej5"] +texture = ExtResource("1_7bax5") +texture_region_size = Vector2i(128, 128) +0:0/0 = 0 + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_75j3w"] +texture = ExtResource("2_xj148") +texture_region_size = Vector2i(128, 128) +0:0/0 = 0 + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_t2mvs"] +texture = ExtResource("3_mojcc") +texture_region_size = Vector2i(128, 128) +0:0/0 = 0 + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_ft3s6"] +texture = ExtResource("4_16rtu") +texture_region_size = Vector2i(128, 128) +0:0/0 = 0 + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_tr0g7"] +texture = ExtResource("5_45f1h") +texture_region_size = Vector2i(128, 128) +0:0/0 = 0 + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_ch4y0"] +texture = ExtResource("6_j54rv") +texture_region_size = Vector2i(128, 128) +0:0/0 = 0 + +[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_1f5pr"] +texture = ExtResource("7_c3wgh") +texture_region_size = Vector2i(128, 128) +0:0/0 = 0 + +[resource] +tile_size = Vector2i(128, 128) +sources/0 = SubResource("TileSetAtlasSource_ewej5") +sources/1 = SubResource("TileSetAtlasSource_75j3w") +sources/2 = SubResource("TileSetAtlasSource_t2mvs") +sources/3 = SubResource("TileSetAtlasSource_ft3s6") +sources/4 = SubResource("TileSetAtlasSource_tr0g7") +sources/5 = SubResource("TileSetAtlasSource_ch4y0") +sources/6 = SubResource("TileSetAtlasSource_1f5pr") diff --git a/Scenes/Debugging/Square.tscn b/Scenes/Debugging/Square.tscn index 39a667a..eb6d931 100644 --- a/Scenes/Debugging/Square.tscn +++ b/Scenes/Debugging/Square.tscn @@ -1,17 +1,13 @@ -[gd_scene load_steps=34 format=4 uid="uid://gcninm0pku08"] +[gd_scene load_steps=22 format=4 uid="uid://gcninm0pku08"] [ext_resource type="Texture2D" uid="uid://bsf3i6xos65r6" path="res://Assets/Placeholders/Square/Sand.png" id="1_7o7in"] [ext_resource type="Texture2D" uid="uid://c2e7403lr3duh" path="res://Assets/Placeholders/Square/Bricks.png" id="2_a12mg"] [ext_resource type="Texture2D" uid="uid://bmkvaiqpxr2w3" path="res://Assets/Placeholders/Square/Wall.png" id="3_i854y"] [ext_resource type="Texture2D" uid="uid://4ev110wa21bc" path="res://Assets/Placeholders/Square/Wallfloor.png" id="4_5lc8u"] -[ext_resource type="ArrayMesh" uid="uid://xefwv6btevpj" path="res://Assets/Placeholders/Square/3D/BrickWall.obj" id="5_0wt5f"] [ext_resource type="Texture2D" uid="uid://dldouys735qnt" path="res://Assets/Placeholders/Square/torch.png" id="5_rl6nh"] -[ext_resource type="ArrayMesh" uid="uid://bw8afk2dpfpsj" path="res://Assets/Placeholders/Square/3D/BrickWallTop.obj" id="6_23jx1"] [ext_resource type="Texture2D" uid="uid://cu7g2n8h1rody" path="res://Assets/Placeholders/Square/black.png" id="6_p27iv"] [ext_resource type="Texture2D" uid="uid://dbo3i5owyna26" path="res://Assets/Placeholders/Square/light.png" id="7_adrcv"] -[ext_resource type="Texture2D" uid="uid://cqls3eniuv2m7" path="res://Assets/Placeholders/Square/3D/Sand.png" id="7_wq35j"] -[ext_resource type="Texture2D" uid="uid://bkxxq2xfhmbkl" path="res://Assets/Placeholders/Square/3D/Wallfloor.png" id="8_gvjmn"] -[ext_resource type="Texture2D" uid="uid://bv5wms22ienmu" path="res://Assets/Placeholders/Square/3D/Bricks.png" id="9_3si7n"] +[ext_resource type="MeshLibrary" uid="uid://ctek5p2fwk8gc" path="res://Assets/Placeholders/Square/3D/mesh_library.tres" id="8_h2p3u"] [ext_resource type="Shader" path="res://Assets/Placeholders/Square/3D/Project.gdshader" id="13_ajq7j"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_ewej5"] @@ -59,67 +55,6 @@ sources/4 = SubResource("TileSetAtlasSource_tr0g7") sources/5 = SubResource("TileSetAtlasSource_ch4y0") sources/6 = SubResource("TileSetAtlasSource_1f5pr") -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6vgx6"] -albedo_texture = ExtResource("7_wq35j") - -[sub_resource type="PlaneMesh" id="PlaneMesh_kkspe"] -material = SubResource("StandardMaterial3D_6vgx6") -size = Vector2(1, 1) - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_vwl8k"] -albedo_texture = ExtResource("8_gvjmn") - -[sub_resource type="PlaneMesh" id="PlaneMesh_2lmlp"] -material = SubResource("StandardMaterial3D_vwl8k") -size = Vector2(1, 1) - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tc8xf"] -albedo_texture = ExtResource("9_3si7n") - -[sub_resource type="PlaneMesh" id="PlaneMesh_5yk84"] -material = SubResource("StandardMaterial3D_tc8xf") -size = Vector2(1, 1) - -[sub_resource type="BoxMesh" id="BoxMesh_2df3s"] - -[sub_resource type="MeshLibrary" id="MeshLibrary_ajtuf"] -item/0/name = "Wall" -item/0/mesh = ExtResource("5_0wt5f") -item/0/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/0/shapes = [] -item/0/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/0/navigation_layers = 1 -item/1/name = "WallTop" -item/1/mesh = ExtResource("6_23jx1") -item/1/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/1/shapes = [] -item/1/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/1/navigation_layers = 1 -item/2/name = "Sand" -item/2/mesh = SubResource("PlaneMesh_kkspe") -item/2/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/2/shapes = [] -item/2/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/2/navigation_layers = 1 -item/3/name = "WallFloor" -item/3/mesh = SubResource("PlaneMesh_2lmlp") -item/3/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/3/shapes = [] -item/3/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/3/navigation_layers = 1 -item/4/name = "WallFlat" -item/4/mesh = SubResource("PlaneMesh_5yk84") -item/4/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/4/shapes = [] -item/4/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/4/navigation_layers = 1 -item/5/name = "" -item/5/mesh = SubResource("BoxMesh_2df3s") -item/5/mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/5/shapes = [] -item/5/navigation_mesh_transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) -item/5/navigation_layers = 1 - [sub_resource type="ViewportTexture" id="ViewportTexture_r414k"] viewport_path = NodePath("SubViewport") @@ -148,13 +83,12 @@ tile_map_data = PackedByteArray("AAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAACAAAAAAAAAAA tile_set = SubResource("TileSet_m7d8e") [node name="TileMapLayer2" type="TileMapLayer" parent="."] -position = Vector2(0, -2) tile_map_data = PackedByteArray("AAADAAMAAQAAAAAAAAAEAAMAAQAAAAAAAAADAAIAAgAAAAAAAAAEAAIAAgAAAAAAAAADAAQAAgAAAAAAAAAEAAQAAgAAAAAAAAADAAUAAQAAAAAAAAAEAAUAAQAAAAAAAAAFAAMAAwAAAAAAAAAFAAQAAgAAAAAAAAACAAMAAwAAAAAAAAACAAQAAgAAAAAAAAACAAUAAQAAAAAAAAAFAAUAAQAAAAAAAAADAP3/AQAAAAAAAAAEAP3/AQAAAAAAAAADAPz/AgAAAAAAAAAEAPz/AgAAAAAAAAADAPn/AgAAAAAAAAAEAPn/AgAAAAAAAAADAPr/AQAAAAAAAAAEAPr/AQAAAAAAAAABAP3/AQAAAAAAAAABAPz/AQAAAAAAAAABAPv/AgAAAAAAAAAAAPv/AgAAAAAAAAAAAPz/AQAAAAAAAAAAAP3/AQAAAAAAAAAOAPz/AQAAAAAAAAAOAPv/AQAAAAAAAAAPAPv/BAAAAAAAAAAPAPz/BgAAAAAAAAAOAPr/AgAAAAAAAAAQAPr/AgAAAAAAAAAQAPv/AQAAAAAAAAAQAPz/AQAAAAAAAAA=") tile_set = SubResource("TileSet_m7d8e") [node name="GridMap" type="GridMap" parent="."] visible = false -mesh_library = SubResource("MeshLibrary_ajtuf") +mesh_library = ExtResource("8_h2p3u") cell_size = Vector3(1, 1, 1) cell_center_y = false data = { @@ -176,6 +110,11 @@ visible = false projection = 1 size = 15.0 +[node name="Camera3D2" type="Camera3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 0.707107, 0.707107, 0, -0.707107, 0.707107, 4, 7, 12.205) +projection = 1 +size = 12.0 + [node name="SubViewport" type="SubViewport" parent="."] size = Vector2i(1024, 1024) @@ -184,6 +123,5 @@ tile_map_data = PackedByteArray("AAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAACAAAAAAAAAAA tile_set = SubResource("TileSet_m7d8e") [node name="TileMapLayer4" type="TileMapLayer" parent="SubViewport"] -position = Vector2(0, -2) tile_map_data = PackedByteArray("AAADAAMAAQAAAAAAAAAEAAMAAQAAAAAAAAADAAIAAgAAAAAAAAAEAAIAAgAAAAAAAAADAAQAAgAAAAAAAAAEAAQAAgAAAAAAAAADAAUAAQAAAAAAAAAEAAUAAQAAAAAAAAAFAAMAAwAAAAAAAAAFAAQAAgAAAAAAAAACAAMAAwAAAAAAAAACAAQAAgAAAAAAAAACAAUAAQAAAAAAAAAFAAUAAQAAAAAAAAADAP3/AQAAAAAAAAAEAP3/AQAAAAAAAAADAPz/AgAAAAAAAAAEAPz/AgAAAAAAAAADAPn/AgAAAAAAAAAEAPn/AgAAAAAAAAADAPr/AQAAAAAAAAAEAPr/AQAAAAAAAAABAP3/AQAAAAAAAAABAPz/AQAAAAAAAAABAPv/AgAAAAAAAAAAAPv/AgAAAAAAAAAAAPz/AQAAAAAAAAAAAP3/AQAAAAAAAAAOAPz/AQAAAAAAAAAOAPv/AQAAAAAAAAAPAPv/BAAAAAAAAAAPAPz/BgAAAAAAAAAOAPr/AgAAAAAAAAAQAPr/AgAAAAAAAAAQAPv/AQAAAAAAAAAQAPz/AQAAAAAAAAA=") tile_set = SubResource("TileSet_m7d8e")