Made brushes solid

This commit is contained in:
MaddoScientisto 2025-06-19 19:51:56 +02:00
commit e9e71d8ff2
14 changed files with 5775 additions and 587 deletions

File diff suppressed because one or more lines are too long

View file

@ -5,6 +5,194 @@
"mapversion" "220"
"wad" ""
"classname" "worldspawn"
}
// entity 1
{
"classname" "actor_capacitor"
"origin" "124 -232 28"
}
// entity 2
{
"classname" "actor_capacitor"
"origin" "120 -152 28"
}
// entity 3
{
"classname" "actor_barrel_1"
"origin" "72 -136 24"
}
// entity 4
{
"classname" "actor_barrel_1"
"origin" "72 -136 40"
}
// entity 5
{
"classname" "actor_barrel_1"
"origin" "56 -136 24"
}
// entity 6
{
"classname" "actor_box_green"
"origin" "40 -152 20"
}
// entity 7
{
"classname" "actor_box_red"
"origin" "40 -152 28"
}
// entity 8
{
"classname" "actor_box_red"
"origin" "40 -168 20"
}
// entity 9
{
"classname" "actor_box_yellow"
"origin" "40 -168 28"
}
// entity 10
{
"classname" "actor_box_wood"
"origin" "44 -184 20"
}
// entity 11
{
"classname" "actor_box_wood"
"origin" "36 -184 20"
}
// entity 12
{
"classname" "actor_box_wood"
"origin" "36 -184 28"
}
// entity 13
{
"classname" "actor_ac_unit"
"origin" "36 -216 24"
"angle" "180"
}
// entity 14
{
"classname" "actor_table"
"origin" "40 -244 20"
}
// entity 15
{
"classname" "actor_terminal"
"origin" "36 -244 28"
}
// entity 16
{
"classname" "actor_box_wood"
"origin" "196 -88 20"
"angle" "300"
}
// entity 17
{
"classname" "actor_box_wood"
"origin" "180 -80 20"
"angle" "270"
}
// entity 18
{
"classname" "actor_box_wood"
"origin" "180 -96 20"
}
// entity 19
{
"classname" "actor_box_wood"
"origin" "172 -96 28"
}
// entity 20
{
"classname" "actor_box_wood"
"origin" "172 -112 20"
}
// entity 21
{
"classname" "actor_box_wood"
"origin" "188 -112 20"
}
// entity 22
{
"classname" "actor_box_wood"
"origin" "188 -128 20"
}
// entity 23
{
"classname" "actor_box_wood"
"origin" "172 -128 20"
}
// entity 24
{
"classname" "actor_box_red"
"origin" "256 -108 20"
}
// entity 25
{
"classname" "actor_tank"
"origin" "248 -296 24"
}
// entity 26
{
"classname" "actor_tank"
"origin" "248 64 -16"
"angle" "0"
}
// entity 27
{
"classname" "actor_barrel_1"
"origin" "200 72 -16"
}
// entity 28
{
"classname" "actor_barrel_1"
"origin" "200 56 -16"
}
// entity 29
{
"classname" "actor_elevator_1"
"origin" "184 -8 -26"
}
// entity 30
{
"classname" "actor_box_red"
"origin" "280 -144 20"
}
// entity 31
{
"classname" "actor_box_red"
"origin" "280 -144 28"
}
// entity 32
{
"classname" "actor_box_red"
"origin" "280 -144 36"
}
// entity 33
{
"classname" "actor_box_wood"
"origin" "280 -180 20"
"angle" "90"
}
// entity 34
{
"classname" "actor_box_wood"
"origin" "284 -192 20"
}
// entity 35
{
"classname" "actor_box_wood"
"origin" "276 -192 28"
}
// entity 36
{
"classname" "func_group"
"_tb_type" "_tb_layer"
"_tb_name" "Solid"
"_tb_id" "3"
"_tb_layer_sort_index" "0"
// brush 0
{
( 32 -256 16 ) ( 32 -256 17 ) ( 32 -257 16 ) __TB_empty [ 0 -1 0 0 ] [ 0 0 1 0 ] 180 1 -1
@ -1158,455 +1346,323 @@
( -296 64 -56 ) ( -296 63 -56 ) ( -296 64 -55 ) Manual/Black [ 0 -1 0 0 ] [ 0 0 1 0 ] 180 1 -1
}
}
// entity 1
// entity 37
{
"classname" "light_omni"
"origin" "200 -248 24"
"_tb_layer" "3"
}
// entity 2
{
"classname" "actor_barrel_1"
"origin" "200 56 -16"
}
// entity 3
{
"classname" "actor_barrel_1"
"origin" "200 72 -16"
}
// entity 4
{
"classname" "actor_barrel_1"
"origin" "72 -136 24"
}
// entity 5
{
"classname" "actor_barrel_1"
"origin" "56 -136 24"
}
// entity 6
{
"classname" "actor_barrel_1"
"origin" "72 -136 40"
}
// entity 7
{
"classname" "actor_tank"
"origin" "248 -296 24"
}
// entity 8
{
"classname" "actor_tank"
"origin" "248 64 -16"
"angle" "0"
}
// entity 9
{
"classname" "actor_box_wood"
"origin" "188 -112 20"
}
// entity 10
{
"classname" "actor_box_wood"
"origin" "188 -128 20"
}
// entity 11
{
"classname" "actor_box_wood"
"origin" "172 -112 20"
}
// entity 12
{
"classname" "actor_box_wood"
"origin" "172 -128 20"
}
// entity 13
// entity 38
{
"classname" "actor_box_wood"
"origin" "172 -96 20"
"_tb_layer" "3"
}
// entity 14
{
"classname" "actor_box_wood"
"origin" "180 -96 20"
}
// entity 15
{
"classname" "actor_box_wood"
"origin" "172 -96 28"
}
// entity 16
{
"classname" "actor_box_wood"
"origin" "180 -80 20"
"angle" "270"
}
// entity 17
{
"classname" "actor_box_wood"
"origin" "196 -88 20"
"angle" "300"
}
// entity 18
// entity 39
{
"classname" "actor_box_blue"
"origin" "-80 -88 28"
"_tb_layer" "3"
}
// entity 19
// entity 40
{
"classname" "actor_box_red"
"origin" "-80 -88 20"
"_tb_layer" "3"
}
// entity 20
// entity 41
{
"classname" "actor_terminal"
"origin" "-60 -148 28"
"angle" "90"
"_tb_layer" "3"
}
// entity 21
// entity 42
{
"classname" "actor_ac_unit"
"origin" "-28 -156 24"
"angle" "270"
"_tb_layer" "3"
}
// entity 22
// entity 43
{
"classname" "actor_table"
"origin" "-56 -148 20"
"angle" "90"
}
// entity 23
{
"classname" "actor_box_wood"
"origin" "-68 -104 20"
}
// entity 24
{
"classname" "actor_table"
"origin" "-8 -92 20"
}
// entity 25
{
"classname" "actor_box_wood"
"origin" "-84 -152 20"
}
// entity 26
{
"classname" "actor_box_wood"
"origin" "-76 -152 20"
}
// entity 27
{
"classname" "actor_box_wood"
"origin" "-80 -104 20"
}
// entity 28
{
"classname" "actor_tank"
"origin" "168 -544 64"
}
// entity 29
{
"classname" "actor_tank"
"origin" "168 -576 64"
}
// entity 30
{
"classname" "actor_box_wood"
"origin" "160 -600 60"
}
// entity 31
{
"classname" "actor_box_wood"
"origin" "160 -616 60"
}
// entity 32
{
"classname" "actor_box_red"
"origin" "164 -632 60"
}
// entity 33
{
"classname" "actor_box_blue"
"origin" "164 -632 68"
}
// entity 34
{
"classname" "actor_box_wood"
"origin" "276 -192 20"
}
// entity 35
{
"classname" "actor_box_wood"
"origin" "276 -192 28"
}
// entity 36
{
"classname" "actor_box_wood"
"origin" "284 -192 20"
}
// entity 37
{
"classname" "actor_box_red"
"origin" "280 -144 20"
}
// entity 38
{
"classname" "actor_box_red"
"origin" "280 -144 28"
}
// entity 39
{
"classname" "actor_box_red"
"origin" "280 -144 36"
}
// entity 40
{
"classname" "actor_box_wood"
"origin" "280 -180 20"
"angle" "90"
}
// entity 41
{
"classname" "actor_elevator_1"
"origin" "184 -8 -26"
}
// entity 42
{
"classname" "actor_box_red"
"origin" "256 -108 20"
}
// entity 43
{
"classname" "actor_elevator_1"
"origin" "216 -376 14"
"_tb_layer" "3"
}
// entity 44
{
"classname" "actor_capacitor"
"origin" "124 -232 28"
"classname" "actor_box_wood"
"origin" "-68 -104 20"
"_tb_layer" "3"
}
// entity 45
{
"classname" "actor_capacitor"
"origin" "120 -152 28"
"classname" "actor_table"
"origin" "-8 -92 20"
"_tb_layer" "3"
}
// entity 46
{
"classname" "actor_box_red"
"origin" "40 -152 28"
"classname" "actor_box_wood"
"origin" "-84 -152 20"
"_tb_layer" "3"
}
// entity 47
{
"classname" "actor_box_red"
"origin" "40 -168 20"
"classname" "actor_box_wood"
"origin" "-76 -152 20"
"_tb_layer" "3"
}
// entity 48
{
"classname" "actor_box_green"
"origin" "40 -152 20"
"classname" "actor_box_wood"
"origin" "-80 -104 20"
"_tb_layer" "3"
}
// entity 49
{
"classname" "actor_box_yellow"
"origin" "40 -168 28"
"classname" "actor_tank"
"origin" "168 -544 64"
"_tb_layer" "3"
}
// entity 50
{
"classname" "actor_box_wood"
"origin" "36 -184 20"
"classname" "actor_tank"
"origin" "168 -576 64"
"_tb_layer" "3"
}
// entity 51
{
"classname" "actor_box_wood"
"origin" "36 -184 28"
"origin" "160 -600 60"
"_tb_layer" "3"
}
// entity 52
{
"classname" "actor_box_wood"
"origin" "44 -184 20"
"origin" "160 -616 60"
"_tb_layer" "3"
}
// entity 53
{
"classname" "actor_table"
"origin" "40 -244 20"
"classname" "actor_box_red"
"origin" "164 -632 60"
"_tb_layer" "3"
}
// entity 54
{
"classname" "actor_terminal"
"origin" "36 -244 28"
"classname" "actor_box_blue"
"origin" "164 -632 68"
"_tb_layer" "3"
}
// entity 55
{
"classname" "actor_ac_unit"
"origin" "36 -216 24"
"angle" "180"
"classname" "actor_box_wood"
"origin" "276 -192 20"
"_tb_layer" "3"
}
// entity 56
{
"classname" "actor_tube_straight"
"origin" "-128 -48 -16"
"angle" "270"
"classname" "actor_elevator_1"
"origin" "216 -376 14"
"_tb_layer" "3"
}
// entity 57
{
"classname" "actor_tube_straight"
"origin" "-112 -48 -16"
"origin" "-128 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 58
{
"classname" "actor_tube_straight"
"origin" "-96 -48 -16"
"origin" "-112 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 59
{
"classname" "actor_tube_straight"
"origin" "-80 -48 -16"
"origin" "-96 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 60
{
"classname" "actor_tube_straight"
"origin" "-64 -48 -16"
"origin" "-80 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 61
{
"classname" "actor_tube_straight"
"origin" "-48 -48 -16"
"origin" "-64 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 62
{
"classname" "actor_tube_straight"
"origin" "-32 -48 -16"
"origin" "-48 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 63
{
"classname" "actor_tube_straight"
"origin" "-16 -48 -16"
"origin" "-32 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 64
{
"classname" "actor_tube_straight"
"origin" "0 -48 -16"
"origin" "-16 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 65
{
"classname" "actor_tube_straight"
"origin" "16 -48 -16"
"origin" "0 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 66
{
"classname" "actor_tube_straight"
"origin" "32 -48 -16"
"origin" "16 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 67
{
"classname" "actor_tube_straight"
"origin" "48 -48 -16"
"origin" "32 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 68
{
"classname" "actor_tube_straight"
"origin" "64 -48 -16"
"origin" "48 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 69
{
"classname" "actor_tube_straight"
"origin" "80 -48 -16"
"origin" "64 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 70
{
"classname" "actor_tube_straight"
"origin" "96 -48 -16"
"origin" "80 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 71
{
"classname" "actor_tube_straight"
"origin" "112 -48 -16"
"origin" "96 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 72
{
"classname" "actor_tube_straight"
"origin" "128 -48 -16"
"origin" "112 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 73
{
"classname" "actor_tube_straight"
"origin" "128 -48 -16"
"angle" "270"
"_tb_layer" "3"
}
// entity 74
{
"classname" "actor_tube_corner"
"origin" "144 -48 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 74
// entity 75
{
"classname" "actor_tank"
"origin" "-232 -32 -16"
"angle" "90"
}
// entity 75
{
"classname" "actor_tube_straight"
"origin" "-208 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 76
{
"classname" "actor_tube_straight"
"origin" "-192 -32 -16"
"origin" "-208 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 77
{
"classname" "actor_tube_straight"
"origin" "-176 -32 -16"
"origin" "-192 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 78
{
"classname" "actor_tube_straight"
"origin" "-160 -32 -16"
"origin" "-176 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 79
{
"classname" "actor_barrel_1"
"origin" "-240 -8 -16"
"classname" "actor_tube_straight"
"origin" "-160 -32 -16"
"angle" "90"
"_tb_layer" "3"
}
// entity 80
{
"classname" "actor_box_red"
"origin" "-264 -24 -20"
"classname" "actor_barrel_1"
"origin" "-240 -8 -16"
"_tb_layer" "3"
}
// entity 81
{
"classname" "actor_box_red"
"origin" "-264 -24 -12"
"origin" "-264 -24 -20"
"_tb_layer" "3"
}
// entity 82
{
"classname" "actor_box_green"
"origin" "-264 -8 -20"
"classname" "actor_box_red"
"origin" "-264 -24 -12"
"_tb_layer" "3"
}
// entity 83
{
"classname" "actor_box_green"
"origin" "-264 -8 -20"
"_tb_layer" "3"
}
// entity 84
{
"classname" "func_group"
"_tb_type" "_tb_group"
"_tb_name" "Wall_Panel_Blue_Small"
"_tb_id" "1"
"_tb_linked_group_id" "{1dff9b20-378e-4bf5-aa91-b49e48c1379a}"
"_tb_transformation" "-8.269460797427576e-16 -1 0 -480.0000000000001 1 -8.269460797427576e-16 0 47.99999999999983 0 0 1 -40 0 0 0 1"
"_tb_layer" "3"
// brush 0
{
( -264 -48 8 ) ( -264 -47 8 ) ( -264 -48 9 ) special/clip [ -8.269460797427576e-16 1 0 0 ] [ 0 0 -1 -8 ] 90 1 1
@ -1617,13 +1673,14 @@
( -248 -64 0 ) ( -248 -64 1 ) ( -248 -63 0 ) special/clip [ -8.269460797427576e-16 1 0 0 ] [ 0 0 -1 -8 ] 270 1 1
}
}
// entity 84
// entity 85
{
"classname" "func_group"
"_tb_type" "_tb_group"
"_tb_name" "Wall_Panel_Blue_Small"
"_tb_id" "2"
"_tb_linked_group_id" "{1dff9b20-378e-4bf5-aa91-b49e48c1379a}"
"_tb_layer" "3"
// brush 0
{
( -112 -232 40 ) ( -112 -231 40 ) ( -112 -232 41 ) special/clip [ 0 1 0 24 ] [ 0 0 -1 0 ] 0 1 1
@ -1634,3 +1691,9 @@
( -104 -208 48 ) ( -104 -208 49 ) ( -104 -207 48 ) Manual/Blue_Panel_Wall_Thin [ 0 1 0 8 ] [ 0 0 -1 -16 ] 0 1 1
}
}
// entity 86
{
"classname" "actor_capacitor_mini"
"origin" "-248 104 -16"
"_tb_layer" "3"
}

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -14,4 +14,3 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00549316, -0.0550391, -0.00
shape = SubResource("CylinderShape3D_dkwt8")
[node name="blockbench_export" parent="." instance=ExtResource("1_dkwt8")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.5, 0)

View file

@ -22,8 +22,8 @@ class_properties = {}
class_property_descriptions = {}
auto_apply_to_matching_node_properties = false
meta_properties = {
"size": AABB(-8, -8, -8, 8, 8, -8),
"studio": "\"3D/MapModels/actor_vendingmachine.glb\""
"size": AABB(-8, -8, -8, 8, 8, 8),
"studio": "\"3D\\MapModels/actor_capacitor_mini.glb\""
}
node_class = ""
name_property = ""

View file

@ -0,0 +1,37 @@
[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=3 format=3 uid="uid://b2cwp7m1sekps"]
[ext_resource type="Script" uid="uid://msq50x6rk4po" path="res://addons/func_godot/src/fgd/func_godot_fgd_solid_class.gd" id="1_x7jaa"]
[ext_resource type="Script" uid="uid://oq2ep51w11u5" path="res://3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd" id="2_ypffe"]
[resource]
script = ExtResource("1_x7jaa")
spawn_type = 0
origin_type = 4
build_visuals = true
use_in_baked_light = true
shadow_casting_setting = 1
build_occlusion = true
render_layers = 1
collision_shape_type = 1
collision_layer = 1
collision_mask = 0
collision_priority = 1.0
collision_shape_margin = 0.04
add_textures_metadata = false
add_vertex_metadata = false
add_face_position_metadata = false
add_face_normal_metadata = false
add_collision_shape_face_range_metadata = false
script_class = ExtResource("2_ypffe")
classname = "worldspawn"
description = "Default static world geometry. Builds a StaticBody3D with a single MeshInstance3D and a single convex CollisionShape3D shape. Also builds Occluder3D to aid in render culling of other VisualInstance3D nodes."
func_godot_internal = false
base_classes = Array[Resource]([])
class_properties = {}
class_property_descriptions = {}
auto_apply_to_matching_node_properties = false
meta_properties = {
"color": Color(0.8, 0.8, 0.8, 1)
}
node_class = "StaticBody3D"
name_property = ""

View file

@ -0,0 +1,6 @@
@tool
class_name WorldSpawn
extends StaticBody3D
func _init() -> void:
add_to_group("Solid", true)

View file

@ -0,0 +1 @@
uid://oq2ep51w11u5

View file

@ -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")])

View file

@ -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

View file

@ -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)