From 15ecdfa91006a52c2291c822b9af34fda224bfb9 Mon Sep 17 00:00:00 2001 From: Sara Date: Sat, 20 Jun 2026 22:14:26 +0200 Subject: [PATCH] feat: started work on undercity appartments --- project/levels/appartments.tscn | 84 ++++++++----- project/levels/appartments_under_ground.tscn | 120 +++++++++++++++++++ project/levels/world.tscn | 26 ++-- project/project.godot | 4 +- 4 files changed, 192 insertions(+), 42 deletions(-) create mode 100644 project/levels/appartments_under_ground.tscn diff --git a/project/levels/appartments.tscn b/project/levels/appartments.tscn index 964c37bd..c6492d3c 100644 --- a/project/levels/appartments.tscn +++ b/project/levels/appartments.tscn @@ -21,6 +21,31 @@ [ext_resource type="Texture2D" uid="uid://34f1swwafqoa" path="res://assets/materials/kaleidoscope_mosaic_emission.png" id="17_ln0xt"] [ext_resource type="Texture2D" uid="uid://b0yi45ldkax5s" path="res://assets/materials/kaleidoscope_mosaic_heightmap.png" id="18_mtb5n"] [ext_resource type="Texture2D" uid="uid://dwskfat6ut10d" path="res://assets/materials/kaleidoscope_mosaic_normal.png" id="19_vsqsw"] +[ext_resource type="PackedScene" uid="uid://dgpnywswyjguf" path="res://objects/enemy_orb.tscn" id="22_vsqsw"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wqmfy"] +albedo_texture = ExtResource("16_xk1ky") +metallic = 1.0 +roughness = 0.19 +emission_enabled = true +emission_energy_multiplier = 0.52 +emission_texture = ExtResource("17_ln0xt") +normal_enabled = true +normal_texture = ExtResource("19_vsqsw") +heightmap_enabled = true +heightmap_scale = 25.0 +heightmap_deep_parallax = true +heightmap_min_layers = 8 +heightmap_max_layers = 32 +heightmap_texture = ExtResource("18_mtb5n") + +[sub_resource type="CylinderMesh" id="CylinderMesh_i8ckm"] +top_radius = 0.0 +bottom_radius = 10.527 +height = 69.6084 +radial_segments = 8 +rings = 1 +cap_top = false [sub_resource type="BoxShape3D" id="BoxShape3D_exgcw"] size = Vector3(40, 35, 104) @@ -43,34 +68,15 @@ size = Vector3(20, 29, 17) [sub_resource type="BoxOccluder3D" id="BoxOccluder3D_4lpv0"] size = Vector3(7, 29, 25.086472) +[sub_resource type="BoxOccluder3D" id="BoxOccluder3D_wxvib"] +size = Vector3(1.6498733, 14, 25.086472) + [sub_resource type="BoxOccluder3D" id="BoxOccluder3D_ib7da"] size = Vector3(7, 29, 8.73432) [sub_resource type="BoxOccluder3D" id="BoxOccluder3D_we58e"] size = Vector3(34, 29, 17) -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wqmfy"] -albedo_texture = ExtResource("16_xk1ky") -metallic = 1.0 -roughness = 0.19 -emission_enabled = true -emission_energy_multiplier = 0.52 -emission_texture = ExtResource("17_ln0xt") -normal_enabled = true -normal_texture = ExtResource("19_vsqsw") -heightmap_enabled = true -heightmap_scale = 25.0 -heightmap_deep_parallax = true -heightmap_min_layers = 8 -heightmap_max_layers = 32 -heightmap_texture = ExtResource("18_mtb5n") - -[sub_resource type="CylinderMesh" id="CylinderMesh_i8ckm"] -top_radius = 0.0 -bottom_radius = 10.527 -height = 69.6084 -cap_top = false - [sub_resource type="BoxOccluder3D" id="BoxOccluder3D_vsqsw"] size = Vector3(10.369815, 8.912704, 12.642946) @@ -85,6 +91,12 @@ size = Vector3(9.69065, 16.597681, 5.36638) [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=251730206] environment = ExtResource("14_nrvdc") +[node name="MeshInstance3D2" type="MeshInstance3D" parent="." unique_id=1788437109] +transform = Transform3D(2.3611264e-08, 0, 1.98, -1.7309709e-07, -1.98, 0, 1.98, -1.7309709e-07, -2.3611264e-08, -43.893333, 42.48227, 115.03662) +material_override = SubResource("StandardMaterial3D_wqmfy") +mesh = SubResource("CylinderMesh_i8ckm") +skeleton = NodePath("../..") + [node name="AreaLoader" type="AreaLoader" parent="." unique_id=1810440921 node_paths=PackedStringArray("area")] area = NodePath("../Area") @@ -118,6 +130,10 @@ occluder = SubResource("BoxOccluder3D_y8lkt") transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 8.567383, 2.1426353, -2.1790857) occluder = SubResource("BoxOccluder3D_4lpv0") +[node name="OccluderInstance3D11" type="OccluderInstance3D" parent="Area" unique_id=1718250865] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -6.432617, 9.62839, -0.17908502) +occluder = SubResource("BoxOccluder3D_wxvib") + [node name="OccluderInstance3D6" type="OccluderInstance3D" parent="Area" unique_id=1850203955] transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -15.270697, 2.1426353, -2.1790857) occluder = SubResource("BoxOccluder3D_ib7da") @@ -6982,12 +6998,6 @@ transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -6, [node name="stone_doorway5" parent="Area" unique_id=160140963 instance=ExtResource("11_y8lkt")] transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -16, -6, 73) -[node name="MeshInstance3D2" type="MeshInstance3D" parent="Area" unique_id=1788437109] -transform = Transform3D(1.98, 0, 0, 0, -1.98, 1.7309709e-07, 0, -1.7309709e-07, -1.98, -43.893333, 42.48227, 115.03662) -material_override = SubResource("StandardMaterial3D_wqmfy") -mesh = SubResource("CylinderMesh_i8ckm") -skeleton = NodePath("../../..") - [node name="city_wall_1m3" parent="Area" unique_id=153757676 instance=ExtResource("13_mtb5n")] transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, -10, 5, 60) @@ -7223,3 +7233,21 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.487239, 6.70586, -4.359888 operation = 2 size = Vector3(6.836914, 13.40271, 5.720192) material = ExtResource("1_qu4xn") + +[node name="EnemyOrb" parent="." unique_id=856275320 instance=ExtResource("22_vsqsw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4, 24) + +[node name="EnemyOrb2" parent="." unique_id=1473421742 instance=ExtResource("22_vsqsw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -3, 34) + +[node name="EnemyOrb3" parent="." unique_id=74511132 instance=ExtResource("22_vsqsw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, -2, 44.264927) + +[node name="EnemyOrb4" parent="." unique_id=1988710488 instance=ExtResource("22_vsqsw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -3, 52.264927) + +[node name="EnemyOrb5" parent="." unique_id=1752462303 instance=ExtResource("22_vsqsw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28, -4, 66.26492) + +[node name="EnemyOrb6" parent="." unique_id=798199000 instance=ExtResource("22_vsqsw")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -37, -3.2705529, 68.26492) diff --git a/project/levels/appartments_under_ground.tscn b/project/levels/appartments_under_ground.tscn new file mode 100644 index 00000000..7e4aa829 --- /dev/null +++ b/project/levels/appartments_under_ground.tscn @@ -0,0 +1,120 @@ +[gd_scene format=3 uid="uid://dn2b7abjjel6j"] + +[ext_resource type="Material" uid="uid://q6ixu2q8qaw1" path="res://assets/environment/triplanar_materials/bricks.tres" id="1_hyss3"] +[ext_resource type="Material" uid="uid://c6uf0ckexrkxk" path="res://assets/environment/triplanar_materials/gray_concrete.tres" id="2_2c4k1"] +[ext_resource type="Material" uid="uid://diprpexdcxpja" path="res://assets/environment/triplanar_materials/tiles.tres" id="3_sxlls"] +[ext_resource type="PackedScene" uid="uid://do0q3dvf2y8if" path="res://assets/environment/walls/window_frame.blend" id="4_grooo"] +[ext_resource type="PackedScene" uid="uid://4418x3hwthdc" path="res://assets/environment/walls/city_wall_base.blend" id="5_dqeqk"] + +[sub_resource type="BoxShape3D" id="BoxShape3D_exgcw"] +size = Vector3(10, 41, 10) + +[sub_resource type="BoxShape3D" id="BoxShape3D_2c4k1"] +size = Vector3(29, 7, 10) + +[node name="AppartmentsUnderGround" type="Node3D" unique_id=1656265773] + +[node name="Area" type="Node3D" parent="." unique_id=821786742] + +[node name="CSGCombiner3D" type="CSGCombiner3D" parent="Area" unique_id=356944886] +layers = 5 +use_collision = true + +[node name="CSGBox3D" type="CSGBox3D" parent="Area/CSGCombiner3D" unique_id=2147070688] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.3873563, 0) +size = Vector3(12.666016, 35.61731, 12.28125) +material = ExtResource("1_hyss3") + +[node name="CSGBox3D2" type="CSGBox3D" parent="Area/CSGCombiner3D" unique_id=356389791] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -5.146725, 0) +operation = 2 +size = Vector3(11, 38.022766, 10) +material = ExtResource("2_2c4k1") + +[node name="CSGBox3D3" type="CSGBox3D" parent="Area/CSGCombiner3D" unique_id=198262996] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -29.658108, 0) +size = Vector3(12, 1, 12) +material = ExtResource("3_sxlls") + +[node name="window_frame" parent="Area" unique_id=226621753 instance=ExtResource("4_grooo")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 6, -24, -5) + +[node name="window_frame2" parent="Area" unique_id=198104588 instance=ExtResource("4_grooo")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 6, -24, -3) + +[node name="window_frame3" parent="Area" unique_id=1778086349 instance=ExtResource("4_grooo")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 6, -24, 3) + +[node name="window_frame4" parent="Area" unique_id=991193163 instance=ExtResource("4_grooo")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 6, -24, 5) + +[node name="city_wall_base" parent="Area" unique_id=1823372432 instance=ExtResource("5_dqeqk")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 6, -24, -1) + +[node name="city_wall_base2" parent="Area" unique_id=1356203604 instance=ExtResource("5_dqeqk")] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 6, -24, 1) + +[node name="window_frame5" parent="Area" unique_id=372451463 instance=ExtResource("4_grooo")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -6, -24, -5.0000005) + +[node name="window_frame6" parent="Area" unique_id=1396379676 instance=ExtResource("4_grooo")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -6, -24, -3.0000005) + +[node name="window_frame7" parent="Area" unique_id=1087244952 instance=ExtResource("4_grooo")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -6, -24, 2.9999995) + +[node name="window_frame8" parent="Area" unique_id=663305857 instance=ExtResource("4_grooo")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -6, -24, 4.9999995) + +[node name="city_wall_base3" parent="Area" unique_id=1945979472 instance=ExtResource("5_dqeqk")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -6, -24, -1.0000005) + +[node name="city_wall_base4" parent="Area" unique_id=1257259467 instance=ExtResource("5_dqeqk")] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -6, -24, 0.99999946) + +[node name="window_frame9" parent="Area" unique_id=1201347784 instance=ExtResource("4_grooo")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, -24, -6.0000005) + +[node name="window_frame10" parent="Area" unique_id=1541010099 instance=ExtResource("4_grooo")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, -24, -6.0000005) + +[node name="window_frame11" parent="Area" unique_id=1595142513 instance=ExtResource("4_grooo")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, -24, -6.0000005) + +[node name="window_frame12" parent="Area" unique_id=360625100 instance=ExtResource("4_grooo")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, -24, -6.0000005) + +[node name="city_wall_base5" parent="Area" unique_id=42182012 instance=ExtResource("5_dqeqk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -24, -6.0000005) + +[node name="city_wall_base6" parent="Area" unique_id=393602731 instance=ExtResource("5_dqeqk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, -24, -6.0000005) + +[node name="window_frame13" parent="Area" unique_id=1498057755 instance=ExtResource("4_grooo")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -5, -24, 6) + +[node name="window_frame14" parent="Area" unique_id=1378481903 instance=ExtResource("4_grooo")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -3, -24, 6) + +[node name="window_frame15" parent="Area" unique_id=910105726 instance=ExtResource("4_grooo")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 3, -24, 5.999999) + +[node name="window_frame16" parent="Area" unique_id=837678815 instance=ExtResource("4_grooo")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 5, -24, 5.999999) + +[node name="city_wall_base7" parent="Area" unique_id=1538275479 instance=ExtResource("5_dqeqk")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -1, -24, 5.9999995) + +[node name="city_wall_base8" parent="Area" unique_id=1026692077 instance=ExtResource("5_dqeqk")] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 1, -24, 5.9999995) + +[node name="AreaLoader" type="AreaLoader" parent="." unique_id=1144416817 node_paths=PackedStringArray("area")] +area = NodePath("../Area") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="AreaLoader" unique_id=2104132068] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -8, 0) +shape = SubResource("BoxShape3D_exgcw") + +[node name="CollisionShape3D2" type="CollisionShape3D" parent="AreaLoader" unique_id=647467166] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.5, -25, 0) +shape = SubResource("BoxShape3D_2c4k1") diff --git a/project/levels/world.tscn b/project/levels/world.tscn index 4c381730..634f8e9a 100644 --- a/project/levels/world.tscn +++ b/project/levels/world.tscn @@ -9,6 +9,7 @@ [ext_resource type="Texture2D" uid="uid://b0yi45ldkax5s" path="res://assets/materials/kaleidoscope_mosaic_heightmap.png" id="7_lmpr0"] [ext_resource type="Texture2D" uid="uid://dwskfat6ut10d" path="res://assets/materials/kaleidoscope_mosaic_normal.png" id="8_re8x6"] [ext_resource type="PackedScene" uid="uid://dd4jygipdkpbs" path="res://levels/appartments.tscn" id="9_687qm"] +[ext_resource type="PackedScene" uid="uid://dn2b7abjjel6j" path="res://levels/appartments_under_ground.tscn" id="10_lmpr0"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_wqmfy"] albedo_texture = ExtResource("5_legw5") @@ -30,6 +31,8 @@ heightmap_texture = ExtResource("7_lmpr0") top_radius = 0.0 bottom_radius = 10.527 height = 109.2168 +radial_segments = 8 +rings = 1 [node name="World" type="Node3D" unique_id=1490306849] @@ -38,22 +41,10 @@ height = 109.2168 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="." unique_id=103904385] transform = Transform3D(0.7631885, -0.5412827, -0.35292548, 4.7748173e-08, -0.5461754, 0.8376708, -0.646176, -0.6393007, -0.41683477, 0, 0, 0) light_color = Color(0.16742355, 0.19254684, 0.26175305, 1) -shadow_enabled = true [node name="Player" parent="." unique_id=591139793 instance=ExtResource("4_w32yo")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -47.99643, -6.5538864, 10.622761) -[node name="Core" parent="." unique_id=1034984951 instance=ExtResource("2_tsgde")] - -[node name="Station" parent="." unique_id=1977494771 instance=ExtResource("1_2mgkc")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -45.627396, -8.061678, 11.177508) - -[node name="Node3D" type="Node3D" parent="." unique_id=717988272] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.893333, -0.017716527, 8.963372) - -[node name="Appartments" parent="." unique_id=2084435541 instance=ExtResource("9_687qm")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.893333, -0.017716527, 8.963372) - [node name="MeshInstance3D" type="MeshInstance3D" parent="." unique_id=2045560215] transform = Transform3D(1, 0, 0, 0, -1, 8.742278e-08, 0, -8.742278e-08, -1, 0, 34.67711, -2.725292e-06) material_override = SubResource("StandardMaterial3D_wqmfy") @@ -68,3 +59,14 @@ mesh = SubResource("CylinderMesh_i8ckm") transform = Transform3D(1.98, 0, 0, 0, -1.98, 1.7309709e-07, 0, -1.7309709e-07, -1.98, 266, 76.25224, -5.396078e-06) material_override = SubResource("StandardMaterial3D_wqmfy") mesh = SubResource("CylinderMesh_i8ckm") + +[node name="Core" parent="." unique_id=1034984951 instance=ExtResource("2_tsgde")] + +[node name="Station" parent="." unique_id=1977494771 instance=ExtResource("1_2mgkc")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -45.627396, -8.061678, 11.177508) + +[node name="Appartments" parent="." unique_id=2084435541 instance=ExtResource("9_687qm")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.893333, -0.017716527, 8.963372) + +[node name="AppartmentsUnderGround" parent="." unique_id=821786742 instance=ExtResource("10_lmpr0")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.0700092, -6.020659, 123.80248) diff --git a/project/project.godot b/project/project.godot index 47e29e59..94b8c637 100644 --- a/project/project.godot +++ b/project/project.godot @@ -21,8 +21,8 @@ config/icon="res://icon.svg" [display] -window/size/viewport_width=2880 -window/size/viewport_height=1620 +window/size/viewport_width=2304 +window/size/viewport_height=1296 window/size/mode=3 window/stretch/mode="viewport"