From e9e71d8ff2e53382503c130da83bf018ec191296 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Thu, 19 Jun 2025 19:51:56 +0200 Subject: [PATCH] Made brushes solid --- 3D/MapModels/actor_capacitor_mini.glb | Bin 19816 -> 19816 bytes 3D/MapScenes/TestLevel2.tscn | 727 +++---- 3D/Maps/Factory2.map | 565 +++--- 3D/Maps/autosave/Factory2.6.map | 1649 ++++++++++++++++ 3D/Maps/autosave/Factory2.7.map | 1719 +++++++++++++++++ 3D/Maps/autosave/Factory2.8.map | 1699 ++++++++++++++++ 3D/Scenes/Props/Capacitor_Mini_3D.tscn | 1 - .../point/actors/Actor_Capacitor_Mini.tres | 4 +- .../solid/Brush/worldspawn_custom.tres | 37 + .../EntityScripts/Solid/worldspawn.gd | 6 + .../EntityScripts/Solid/worldspawn.gd.uid | 1 + 3D/TrenchBroom/fgd_main.tres | 4 +- 3D/TrenchBroom/map_settings.tres | 2 +- IsoTest/IsoMapTest2.tscn | 2 +- 14 files changed, 5802 insertions(+), 614 deletions(-) create mode 100644 3D/Maps/autosave/Factory2.6.map create mode 100644 3D/Maps/autosave/Factory2.7.map create mode 100644 3D/Maps/autosave/Factory2.8.map create mode 100644 3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_custom.tres create mode 100644 3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd create mode 100644 3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd.uid diff --git a/3D/MapModels/actor_capacitor_mini.glb b/3D/MapModels/actor_capacitor_mini.glb index 0f6c3eff312b16c48707fa60215e7a5a7607f5d1..9c9aeceb7ca67b932823abdbfe3e25d412f22580 100644 GIT binary patch delta 71 zcmV-N0J#6?ngQsV0kFsg3N$b=F*!LiG%z@`(gkb-3NbJ+Gc-6kG&wYrNC`ues0loi d5eX9wEG;lDG&46fEHExGU6bSqnX`Zj=t2g*6*m9? delta 72 zcmV-O0Js0>ngQsV0kFsg3Ntl1G&eRdI5{=5(gkb-3NSY}IXO2nFgG@nNC`ue5eX9t eEG;lDH7qbLFkO?22|SbM37G>RARx1V3g|) void: + add_to_group("Solid", true) diff --git a/3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd.uid b/3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd.uid new file mode 100644 index 00000000..2113b5b5 --- /dev/null +++ b/3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd.uid @@ -0,0 +1 @@ +uid://oq2ep51w11u5 diff --git a/3D/TrenchBroom/fgd_main.tres b/3D/TrenchBroom/fgd_main.tres index 7bed70d1..5525ce7b 100644 --- a/3D/TrenchBroom/fgd_main.tres +++ b/3D/TrenchBroom/fgd_main.tres @@ -3,8 +3,8 @@ [ext_resource type="Resource" uid="uid://nayxb8n7see2" path="res://addons/func_godot/fgd/phong_base.tres" id="1_24lxq"] [ext_resource type="Resource" uid="uid://onsfttdpojex" path="res://3D/TrenchBroom/fgd_base.tres" id="1_dlwdq"] [ext_resource type="Resource" uid="uid://dgkdkac8ppgnq" path="res://3D/TrenchBroom/fgd_solid.tres" id="2_bci5m"] -[ext_resource type="Resource" uid="uid://bdji3873bg32h" path="res://addons/func_godot/fgd/worldspawn.tres" id="2_dlwdq"] [ext_resource type="Resource" uid="uid://b700sa4be6dfa" path="res://3D/TrenchBroom/fgd_point.tres" id="3_0gbih"] +[ext_resource type="Resource" uid="uid://b2cwp7m1sekps" path="res://3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_custom.tres" id="5_6tkjn"] [ext_resource type="Script" uid="uid://cknmd0lgmorx2" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="7_m2ebq"] [resource] @@ -13,4 +13,4 @@ export_file = false target_map_editor = 1 fgd_name = "FuncGodot" base_fgd_files = Array[Resource]([ExtResource("1_dlwdq"), ExtResource("2_bci5m"), ExtResource("3_0gbih")]) -entity_definitions = Array[Resource]([ExtResource("1_24lxq"), ExtResource("2_dlwdq")]) +entity_definitions = Array[Resource]([ExtResource("1_24lxq"), ExtResource("5_6tkjn")]) diff --git a/3D/TrenchBroom/map_settings.tres b/3D/TrenchBroom/map_settings.tres index de3c88be..bb2fa58a 100644 --- a/3D/TrenchBroom/map_settings.tres +++ b/3D/TrenchBroom/map_settings.tres @@ -28,4 +28,4 @@ height_map_pattern = "%s_height.%s" orm_map_pattern = "%s_orm.%s" save_generated_materials = true uv_unwrap_texel_size = 2.0 -use_trenchbroom_groups_hierarchy = false +use_trenchbroom_groups_hierarchy = true diff --git a/IsoTest/IsoMapTest2.tscn b/IsoTest/IsoMapTest2.tscn index bc3c1d6f..90976c06 100644 --- a/IsoTest/IsoMapTest2.tscn +++ b/IsoTest/IsoMapTest2.tscn @@ -483,7 +483,7 @@ hframes = 4 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.84862, 0, -4.8932) [node name="StartPosition" type="Marker3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19.8843, 1.57535, 3.5485) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 56.5542, 1.57535, -10.2971) [node name="CameraTarget" type="Marker3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 21.0389, 2.33215, 3.16925)