From 5db803bb31ad1ca328f263aaa1575fe21bb2cd99 Mon Sep 17 00:00:00 2001 From: Minimata Date: Fri, 13 Jun 2025 15:53:58 +0200 Subject: [PATCH] ld: start of city map and component greyboxing --- maps/Components/large_square_tower.tscn | 34 +++++++++ maps/Components/small_square_tower.tscn | 36 ++++++++++ main.tscn => maps/GYMs/main.tscn | 0 maps/GYMs/metrics.tscn | 55 ++++++++++++++ maps/city.tscn | 96 +++++++++++++++++++++++++ player_controller/PlayerController.tscn | 2 +- systems/dash/dash_system.tscn | 2 +- 7 files changed, 223 insertions(+), 2 deletions(-) create mode 100644 maps/Components/large_square_tower.tscn create mode 100644 maps/Components/small_square_tower.tscn rename main.tscn => maps/GYMs/main.tscn (100%) create mode 100644 maps/GYMs/metrics.tscn create mode 100644 maps/city.tscn diff --git a/maps/Components/large_square_tower.tscn b/maps/Components/large_square_tower.tscn new file mode 100644 index 0000000..d9b798b --- /dev/null +++ b/maps/Components/large_square_tower.tscn @@ -0,0 +1,34 @@ +[gd_scene load_steps=2 format=3 uid="uid://br76ixljh42i8"] + +[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/greybox/m_greybox.tres" id="1_sgma5"] + +[node name="LargeSquareTower" type="CSGCombiner3D"] + +[node name="CSGBox3D" type="CSGBox3D" parent="."] +use_collision = true +size = Vector3(10, 9, 10) +material = ExtResource("1_sgma5") + +[node name="CSGBox3D2" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 5, 0) +use_collision = true +size = Vector3(0.5, 1, 10) +material = ExtResource("1_sgma5") + +[node name="CSGBox3D3" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 5, 0) +use_collision = true +size = Vector3(0.5, 1, 10) +material = ExtResource("1_sgma5") + +[node name="CSGBox3D4" type="CSGBox3D" parent="."] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 5, 5) +use_collision = true +size = Vector3(0.5, 1, 10.5) +material = ExtResource("1_sgma5") + +[node name="CSGBox3D5" type="CSGBox3D" parent="."] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 5, -5) +use_collision = true +size = Vector3(0.5, 1, 10.5) +material = ExtResource("1_sgma5") diff --git a/maps/Components/small_square_tower.tscn b/maps/Components/small_square_tower.tscn new file mode 100644 index 0000000..30d6795 --- /dev/null +++ b/maps/Components/small_square_tower.tscn @@ -0,0 +1,36 @@ +[gd_scene load_steps=2 format=3 uid="uid://fxj0a6p5h6lm"] + +[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/greybox/m_greybox.tres" id="1_uvljb"] + +[node name="SmallSquareTower" type="CSGCombiner3D"] +transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 0, 0, 0) + +[node name="CSGBox3D" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -6.75, 0) +use_collision = true +size = Vector3(5, 16.5, 5) +material = ExtResource("1_uvljb") + +[node name="CSGBox3D2" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 2, 0) +use_collision = true +size = Vector3(0.5, 1, 5.5) +material = ExtResource("1_uvljb") + +[node name="CSGBox3D3" type="CSGBox3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 2, 0) +use_collision = true +size = Vector3(0.5, 1, 5.5) +material = ExtResource("1_uvljb") + +[node name="CSGBox3D4" type="CSGBox3D" parent="."] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 2, 2.5) +use_collision = true +size = Vector3(0.5, 1, 5) +material = ExtResource("1_uvljb") + +[node name="CSGBox3D5" type="CSGBox3D" parent="."] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 2, -2.5) +use_collision = true +size = Vector3(0.5, 1, 5) +material = ExtResource("1_uvljb") diff --git a/main.tscn b/maps/GYMs/main.tscn similarity index 100% rename from main.tscn rename to maps/GYMs/main.tscn diff --git a/maps/GYMs/metrics.tscn b/maps/GYMs/metrics.tscn new file mode 100644 index 0000000..2f80f24 --- /dev/null +++ b/maps/GYMs/metrics.tscn @@ -0,0 +1,55 @@ +[gd_scene load_steps=7 format=3 uid="uid://pk8ypa04qy6x"] + +[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_1s2y7"] +[ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_epx65"] +[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/greybox/m_greybox.tres" id="3_vvhq3"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"] +sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1) +ground_horizon_color = Color(0.662243, 0.671743, 0.686743, 1) + +[sub_resource type="Sky" id="Sky_h2yge"] +sky_material = SubResource("ProceduralSkyMaterial_0xm2m") + +[sub_resource type="Environment" id="Environment_1bvp3"] +background_mode = 2 +sky = SubResource("Sky_h2yge") +ambient_light_source = 2 +ambient_light_color = Color(0.576076, 0.459788, 0.652401, 1) +reflected_light_source = 2 +tonemap_mode = 4 +tonemap_exposure = 1.32 +ssao_enabled = true +ssao_radius = 3.61 +ssil_enabled = true +ssil_radius = 8.4 +sdfgi_use_occlusion = true +glow_enabled = true + +[node name="Main" type="Node3D"] + +[node name="Player" parent="." instance=ExtResource("1_1s2y7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7981, 1.6118, 39.3006) + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_1bvp3") + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(-0.772218, 0.611111, 0.173844, 0.0446935, -0.220691, 0.974319, 0.633783, 0.760157, 0.143109, 0, 0, 0) +shadow_enabled = true + +[node name="DebugLayer" type="CanvasLayer" parent="."] + +[node name="GuideDebugger" parent="DebugLayer" instance=ExtResource("2_epx65")] +visible = false + +[node name="Greybox" type="CSGCombiner3D" parent="."] +use_collision = true +collision_layer = 3 +collision_mask = 5 + +[node name="CSGBox3D" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09619, -0.472656, -46.3293) +use_collision = true +size = Vector3(100, 1, 190.741) +material = ExtResource("3_vvhq3") diff --git a/maps/city.tscn b/maps/city.tscn new file mode 100644 index 0000000..92a99e9 --- /dev/null +++ b/maps/city.tscn @@ -0,0 +1,96 @@ +[gd_scene load_steps=9 format=3 uid="uid://dmkw8cmalm5k"] + +[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"] +[ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_uet8a"] +[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/greybox/m_greybox.tres" id="3_cieeo"] +[ext_resource type="PackedScene" uid="uid://br76ixljh42i8" path="res://maps/Components/large_square_tower.tscn" id="4_omvc4"] +[ext_resource type="PackedScene" uid="uid://fxj0a6p5h6lm" path="res://maps/Components/small_square_tower.tscn" id="5_ruo5i"] + +[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"] +sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1) +ground_horizon_color = Color(0.662243, 0.671743, 0.686743, 1) + +[sub_resource type="Sky" id="Sky_h2yge"] +sky_material = SubResource("ProceduralSkyMaterial_0xm2m") + +[sub_resource type="Environment" id="Environment_1bvp3"] +background_mode = 2 +sky = SubResource("Sky_h2yge") +ambient_light_source = 2 +ambient_light_color = Color(0.576076, 0.459788, 0.652401, 1) +reflected_light_source = 2 +tonemap_mode = 4 +tonemap_exposure = 1.32 +ssao_enabled = true +ssao_radius = 3.61 +ssil_enabled = true +ssil_radius = 8.4 +sdfgi_use_occlusion = true +glow_enabled = true + +[node name="Main" type="Node3D"] + +[node name="Player" parent="." instance=ExtResource("1_2vsi6")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7981, 101, 0.300598) + +[node name="WorldEnvironment" type="WorldEnvironment" parent="."] +environment = SubResource("Environment_1bvp3") + +[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] +transform = Transform3D(-0.772218, 0.611111, 0.173844, 0.0446935, -0.220691, 0.974319, 0.633783, 0.760157, 0.143109, 0, 0, 0) +shadow_enabled = true + +[node name="DebugLayer" type="CanvasLayer" parent="."] + +[node name="GuideDebugger" parent="DebugLayer" instance=ExtResource("2_uet8a")] +visible = false + +[node name="Greybox" type="CSGCombiner3D" parent="."] +use_collision = true +collision_layer = 3 +collision_mask = 5 + +[node name="CSGBox3D7" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 92, 10.5) +use_collision = true +size = Vector3(0.5, 1, 16) +material = ExtResource("3_cieeo") + +[node name="CSGBox3D8" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0, 92, -10.5) +use_collision = true +size = Vector3(0.5, 1, 16) +material = ExtResource("3_cieeo") + +[node name="CSGBox3D9" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 10.5, 92, 0) +use_collision = true +size = Vector3(0.5, 1, 16) +material = ExtResource("3_cieeo") + +[node name="CSGBox3D10" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(-1, 0, 1.50996e-07, 0, 1, 0, -1.50996e-07, 0, -1, -10.5, 92, 0) +use_collision = true +size = Vector3(0.5, 1, 16) +material = ExtResource("3_cieeo") + +[node name="LargeSquareTower" parent="Greybox" instance=ExtResource("4_omvc4")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 96, 0) + +[node name="SmallSquareTower" parent="Greybox" instance=ExtResource("5_ruo5i")] +transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 10.5, 91.5, 10.5) + +[node name="SmallSquareTower2" parent="Greybox" instance=ExtResource("5_ruo5i")] +transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -10.5, 91.5, 10.5) + +[node name="SmallSquareTower3" parent="Greybox" instance=ExtResource("5_ruo5i")] +transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -10.5, 91.5, -10.5) + +[node name="SmallSquareTower4" parent="Greybox" instance=ExtResource("5_ruo5i")] +transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 10.5, 91.5, -10.5) + +[node name="CSGBox3D6" type="CSGBox3D" parent="Greybox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 45.75, 0) +use_collision = true +size = Vector3(21, 91.5, 21) +material = ExtResource("3_cieeo") diff --git a/player_controller/PlayerController.tscn b/player_controller/PlayerController.tscn index c3657c9..f2da6b5 100644 --- a/player_controller/PlayerController.tscn +++ b/player_controller/PlayerController.tscn @@ -84,7 +84,7 @@ target_position = Vector3(0, -0.55, 0) target_position = Vector3(0, -0.75, 0) [node name="MantleSystem" parent="." instance=ExtResource("8_qu4wy")] -MantleEndLocationDistanceFromWall = 1.0 +MantleEndLocationDistanceFromWall = 0.3 MantleHeightCastStart = 2.0 [node name="Bobbing" type="Node3D" parent="."] diff --git a/systems/dash/dash_system.tscn b/systems/dash/dash_system.tscn index ee03cc1..0375ada 100644 --- a/systems/dash/dash_system.tscn +++ b/systems/dash/dash_system.tscn @@ -26,5 +26,5 @@ mesh = SubResource("SphereMesh_qu4wy") surface_material_override/0 = SubResource("StandardMaterial3D_v31n3") [node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")] -MantleEndLocationDistanceFromWall = 1.0 +MantleEndLocationDistanceFromWall = 0.3 MantleHeightCastStart = 2.0