Fixed entity definitions

3D/Maps/Fusion.map

@@ -1121,6 +1121,42 @@
 ( 72 416 24 ) ( 73 416 24 ) ( 72 416 25 ) Floors/Floor234 [ -1 0 0 8 ] [ 0 0 -1 -16 ] 0 1 1
 ( 0 408 16 ) ( 0 408 17 ) ( 0 409 16 ) __TB_empty [ 0 -1 0 -8 ] [ 0 0 -1 0 ] 0 1 1
 }
+// brush 124
+{
+( 176 32 16 ) ( 176 33 16 ) ( 176 32 17 ) special/clip [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 176 32 16 ) ( 176 32 17 ) ( 177 32 16 ) special/clip [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 176 32 16 ) ( 177 32 16 ) ( 176 33 16 ) special/clip [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
+( 208 64 48 ) ( 208 65 48 ) ( 209 64 48 ) special/clip [ 1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
+( 208 64 32 ) ( 209 64 32 ) ( 208 64 33 ) special/clip [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
+( 208 64 32 ) ( 208 64 33 ) ( 208 65 32 ) special/clip [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
+}
+// brush 125
+{
+( 176 80 16 ) ( 176 81 16 ) ( 176 80 17 ) special/skip [ 0 -1 0 16 ] [ 0 0 -1 0 ] 90 1 1
+( 176 80 16 ) ( 176 80 17 ) ( 177 80 16 ) special/skip [ 1 0 0 0 ] [ 0 0 -1 0 ] 90 1 1
+( 176 80 16 ) ( 177 80 16 ) ( 176 81 16 ) special/skip [ -1 0 0 0 ] [ 0 -1 0 16 ] 90 1 1
+( 208 112 48 ) ( 208 113 48 ) ( 209 112 48 ) special/skip [ 1 0 0 0 ] [ 0 -1 0 16 ] 0 1 1
+( 208 112 32 ) ( 209 112 32 ) ( 208 112 33 ) special/skip [ -1 0 0 0 ] [ 0 0 -1 0 ] 90 1 1
+( 208 112 32 ) ( 208 112 33 ) ( 208 113 32 ) special/skip [ 0 1 0 -16 ] [ 0 0 -1 0 ] 90 1 1
+}
+// brush 126
+{
+( 112 64 16 ) ( 112 65 16 ) ( 112 64 17 ) Manual/Glass_001 [ 0 -1 0 0 ] [ 0 0 -1 0 ] 90 1 1
+( 112 64 16 ) ( 112 64 17 ) ( 113 64 16 ) Manual/Glass_001 [ 1 0 0 0 ] [ 0 0 -1 0 ] 90 1 1
+( 112 64 16 ) ( 113 64 16 ) ( 112 65 16 ) Manual/Glass_001 [ -1 0 0 0 ] [ 0 -1 0 0 ] 90 1 1
+( 144 96 48 ) ( 144 97 48 ) ( 145 96 48 ) Manual/Glass_001 [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
+( 144 96 32 ) ( 145 96 32 ) ( 144 96 33 ) Manual/Glass_001 [ -1 0 0 0 ] [ 0 0 -1 0 ] 90 1 1
+( 144 96 32 ) ( 144 96 33 ) ( 144 97 32 ) Manual/Glass_001 [ 0 1 0 0 ] [ 0 0 -1 0 ] 90 1 1
+}
+// brush 127
+{
+( 64 80 16 ) ( 64 81 16 ) ( 64 80 17 ) Manual/Glass_002 [ 0 -1 0 0 ] [ 0 0 -1 0 ] 180 1 1
+( 64 80 16 ) ( 64 80 17 ) ( 65 80 16 ) Manual/Glass_002 [ 1 0 0 0 ] [ 0 0 -1 0 ] 180 1 1
+( 64 80 16 ) ( 65 80 16 ) ( 64 81 16 ) Manual/Glass_002 [ -1 0 0 0 ] [ 0 -1 0 0 ] 180 1 1
+( 96 112 48 ) ( 96 113 48 ) ( 97 112 48 ) Manual/Glass_002 [ 1 0 0 0 ] [ 0 -1 0 0 ] 90 1 1
+( 96 112 32 ) ( 97 112 32 ) ( 96 112 33 ) Manual/Glass_002 [ -1 0 0 0 ] [ 0 0 -1 0 ] 180 1 1
+( 96 112 32 ) ( 96 112 33 ) ( 96 113 32 ) Manual/Glass_002 [ 0 1 0 0 ] [ 0 0 -1 0 ] 180 1 1
+}
 }
 // entity 1
 {

3D/TrenchBroom/EntityDefinitions/base/func_base.tres

@@ -7,9 +7,9 @@
 script = ExtResource("1_grnar")
 classname = "Func"
 base_classes = Array[Resource]([ExtResource("1_ftv6l")])
-class_properties = {
+class_properties = Dictionary[String, Variant]({
 "_phong": false
-}
+})
-class_property_descriptions = {
+class_property_descriptions = Dictionary[String, Variant]({
 "_phong": "Set to 1 to give the brush entity smooth shading."
-}
+})

3D/TrenchBroom/EntityDefinitions/point/actors/Actor_Capacitor_Mini.tres

@@ -8,6 +8,7 @@
 
 [resource]
 script = ExtResource("3_864ca")
+target_map_editor = 1
 rotation_offset = Vector3(0, 180, 0)
 scene_file = ExtResource("2_frb07")
 apply_scale_on_map_build = false
@@ -15,6 +16,6 @@ classname = "actor_capacitor_mini"
 description = "Mini Capacitor"
 base_classes = Array[Resource]([ExtResource("1_frb07"), ExtResource("2_61nv4")])
 meta_properties = Dictionary[String, Variant]({
-"size": AABB(-8, -8, -8, 8, 8, 8),
+"model": "{\"path\": \"3D/MapModels/actor_capacitor_mini.glb\", \"scale\": 16.0 }",
-"studio": "\"3D/MapModels/actor_capacitor_mini.glb\""
+"size": AABB(-8, -8, -8, 8, 8, 8)
 })

3D/TrenchBroom/EntityDefinitions/point/actors/actor_alarmbox.tres

@@ -7,6 +7,7 @@
 
 [resource]
 script = ExtResource("4_n6irp")
+target_map_editor = 1
 rotation_offset = Vector3(0, 180, 0)
 scene_file = ExtResource("2_400u4")
 apply_scale_on_map_build = false
@@ -14,6 +15,6 @@ classname = "actor_alarmbox"
 description = "Alarm Box"
 base_classes = Array[Resource]([ExtResource("1_lfdgw")])
 meta_properties = Dictionary[String, Variant]({
-"size": AABB(-4, -4, -4, 4, 4, 4),
+"model": "{\"path\": \"3D/MapModels/actor_alarmbox.glb\", \"scale\": 16.0 }",
-"studio": "\"3D/MapModels/actor_alarmbox.glb\""
+"size": AABB(-4, -4, -4, 4, 4, 4)
 })

3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_bullet_permeable.tres

@@ -1,6 +1,8 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=2 format=3 uid="uid://cs5ourxglor8e"]
+[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=4 format=3 uid="uid://cs5ourxglor8e"]
 
+[ext_resource type="Resource" uid="uid://bcdsueg5pysfq" path="res://addons/func_godot/fgd/cull_interior_faces.tres" id="1_1d7m3"]
 [ext_resource type="Script" uid="uid://5cow84q03m6a" path="res://addons/func_godot/src/fgd/func_godot_fgd_solid_class.gd" id="1_77qe7"]
+[ext_resource type="Resource" uid="uid://doo4ly322b4jc" path="res://addons/func_godot/fgd/vertex_merge_distance_base.tres" id="2_0k1ie"]
 
 [resource]
 script = ExtResource("1_77qe7")
@@ -10,7 +12,8 @@ collision_mask = 0
 classname = "solid_bullet_permeable"
 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.
 Is permeable to bullets"
-meta_properties = {
+base_classes = Array[Resource]([ExtResource("1_1d7m3"), ExtResource("2_0k1ie")])
+meta_properties = Dictionary[String, Variant]({
 "color": Color(0.8, 0.8, 0.8, 1)
-}
+})
 node_class = "StaticBody3D"

3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_custom.tres

@@ -1,6 +1,8 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=3 format=3 uid="uid://b2cwp7m1sekps"]
+[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=5 format=3 uid="uid://b2cwp7m1sekps"]
 
 [ext_resource type="Script" uid="uid://5cow84q03m6a" path="res://addons/func_godot/src/fgd/func_godot_fgd_solid_class.gd" id="1_x7jaa"]
+[ext_resource type="Resource" uid="uid://bcdsueg5pysfq" path="res://addons/func_godot/fgd/cull_interior_faces.tres" id="2_klroj"]
+[ext_resource type="Resource" uid="uid://bl4hy04wp3v6a" path="res://3D/TrenchBroom/EntityDefinitions/vertex_merge_distance_base_cirno.tres" id="2_w3vbg"]
 [ext_resource type="Script" uid="uid://oq2ep51w11u5" path="res://3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd" id="2_ypffe"]
 
 [resource]
@@ -12,7 +14,8 @@ collision_mask = 0
 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."
-meta_properties = {
+base_classes = Array[Resource]([ExtResource("2_klroj"), ExtResource("2_w3vbg")])
+meta_properties = Dictionary[String, Variant]({
 "color": Color(0.8, 0.8, 0.8, 1)
-}
+})
 node_class = "StaticBody3D"

3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_shadow.tres

@@ -1,6 +1,8 @@
-[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=3 format=3 uid="uid://bl3lxmse670pv"]
+[gd_resource type="Resource" script_class="FuncGodotFGDSolidClass" load_steps=5 format=3 uid="uid://bl3lxmse670pv"]
 
 [ext_resource type="Script" uid="uid://5cow84q03m6a" path="res://addons/func_godot/src/fgd/func_godot_fgd_solid_class.gd" id="1_7n2vi"]
+[ext_resource type="Resource" uid="uid://doo4ly322b4jc" path="res://addons/func_godot/fgd/vertex_merge_distance_base.tres" id="1_gdesh"]
+[ext_resource type="Resource" uid="uid://bcdsueg5pysfq" path="res://addons/func_godot/fgd/cull_interior_faces.tres" id="2_h8me0"]
 [ext_resource type="Script" uid="uid://oq2ep51w11u5" path="res://3D/TrenchBroom/EntityScripts/Solid/worldspawn.gd" id="2_s7wnd"]
 
 [resource]
@@ -12,7 +14,8 @@ collision_mask = 0
 script_class = ExtResource("2_s7wnd")
 classname = "solid_shadow"
 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."
-meta_properties = {
+base_classes = Array[Resource]([ExtResource("1_gdesh"), ExtResource("2_h8me0")])
+meta_properties = Dictionary[String, Variant]({
 "color": Color(0.227738, 0.227738, 0.227738, 1)
-}
+})
 node_class = "StaticBody3D"

3D/TrenchBroom/EntityDefinitions/solid/funcs/func_shroud.tres

@@ -18,13 +18,13 @@ script_class = ExtResource("4_ug7xt")
 classname = "func_shroud"
 description = "Geometry that can be made disappear."
 base_classes = Array[Resource]([ExtResource("1_ug7xt"), ExtResource("2_euhoe")])
-class_properties = {
+class_properties = Dictionary[String, Variant]({
 "one_time": true
-}
+})
-class_property_descriptions = {
+class_property_descriptions = Dictionary[String, Variant]({
 "one_time": "Trigger only one time?"
-}
+})
-meta_properties = {
+meta_properties = Dictionary[String, Variant]({
 "color": Color(0.9647059, 0.87211144, 0, 1)
-}
+})
 node_class = "StaticBody3D"

3D/TrenchBroom/EntityDefinitions/vertex_merge_distance_base_cirno.tres

@@ -0,0 +1,15 @@
+[gd_resource type="Resource" script_class="FuncGodotFGDBaseClass" load_steps=2 format=3 uid="uid://bl4hy04wp3v6a"]
+
+[ext_resource type="Script" uid="uid://ck575aqs1sbrb" path="res://addons/func_godot/src/fgd/func_godot_fgd_base_class.gd" id="1_qupqd"]
+
+[resource]
+script = ExtResource("1_qupqd")
+classname = "VertexMergeDistance"
+description = "Adjustable value to snap vertices to on map build. This can reduce instances of seams between polygons."
+class_properties = Dictionary[String, Variant]({
+"_vertex_merge_distance": 0.03125
+})
+class_property_descriptions = Dictionary[String, Variant]({
+"_vertex_merge_distance": "Adjustable value to snap vertices to on map build. This can reduce instances of seams between polygons."
+})
+metadata/_custom_type_script = "uid://ck575aqs1sbrb"

3D/TrenchBroom/Tags/glass_tag.tres

@@ -1,9 +1,8 @@
 [gd_resource type="Resource" script_class="TrenchBroomTag" load_steps=2 format=3 uid="uid://bdmexobfdwk12"]
 
-[ext_resource type="Script" uid="uid://cvwfhwn3pgig1" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_mlp8k"]
+[ext_resource type="Script" uid="uid://b66qdknwqpfup" path="res://addons/func_godot/src/trenchbroom/trenchbroom_tag.gd" id="1_mlp8k"]
 
 [resource]
 script = ExtResource("1_mlp8k")
 tag_name = "Glass"
 tag_pattern = "Glass_*"
-metadata/_custom_type_script = "uid://cvwfhwn3pgig1"

3D/TrenchBroom/fgd_main.tres

@@ -7,11 +7,11 @@
 [ext_resource type="Resource" uid="uid://orkweel5r31c" path="res://3D/TrenchBroom/fgd_enemies.tres" id="4_bci5m"]
 [ext_resource type="Resource" uid="uid://m6ei61ol3htg" path="res://3D/TrenchBroom/fgd_items.tres" id="5_0gbih"]
 [ext_resource type="Resource" uid="uid://b2cwp7m1sekps" path="res://3D/TrenchBroom/EntityDefinitions/solid/Brush/worldspawn_custom.tres" id="5_6tkjn"]
-[ext_resource type="Resource" uid="uid://doo4ly322b4jc" path="res://addons/func_godot/fgd/vertex_merge_distance_base.tres" id="6_24lxq"]
 [ext_resource type="Script" uid="uid://drlmgulwbjwqu" path="res://addons/func_godot/src/fgd/func_godot_fgd_file.gd" id="7_m2ebq"]
 [ext_resource type="Resource" uid="uid://bcdsueg5pysfq" path="res://addons/func_godot/fgd/cull_interior_faces.tres" id="9_0gbih"]
+[ext_resource type="Resource" uid="uid://bl4hy04wp3v6a" path="res://3D/TrenchBroom/EntityDefinitions/vertex_merge_distance_base_cirno.tres" id="9_7icdq"]
 
 [resource]
 script = ExtResource("7_m2ebq")
 base_fgd_files = Array[Resource]([ExtResource("1_dlwdq"), ExtResource("2_bci5m"), ExtResource("3_0gbih"), ExtResource("4_bci5m"), ExtResource("5_0gbih")])
-entity_definitions = Array[Resource]([ExtResource("1_24lxq"), ExtResource("5_6tkjn"), ExtResource("6_24lxq"), ExtResource("9_0gbih")])
+entity_definitions = Array[Resource]([ExtResource("1_24lxq"), ExtResource("5_6tkjn"), ExtResource("9_0gbih"), ExtResource("9_7icdq")])

3D/TrenchBroom/map_settings.tres

@@ -10,3 +10,6 @@ script = ExtResource("3_u7jfk")
 inverse_scale_factor = 16.0
 entity_fgd = ExtResource("2_timv6")
 entity_name_property = "globalname"
+clip_texture = "special/clip"
+skip_texture = "special/skip"
+origin_texture = "special/origin"

IsoTest/IsoMapTest2.tscn

@@ -69,6 +69,7 @@ transform = Transform3D(0.7071067, -0.41562688, 0.57206136, 0, 0.80901694, 0.587
 projection = 1
 size = 8.0
 script = ExtResource("1_g4gcm")
+SnapCamera = false
 MaxAimOffsetDistance = 16.0
 CameraOffset = Vector3(8, 8, 8)
 TargetPath = NodePath("../CameraTarget")

addons/func_godot/fgd/func_detail.tres

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" uid="uid://5cow84q03m6a" path="res://addons/func_godot/src/fgd/func_godot_fgd_solid_class.gd" id="1_0fsmp"]
 [ext_resource type="Resource" uid="uid://nayxb8n7see2" path="res://addons/func_godot/fgd/phong_base.tres" id="1_c3bns"]
-[ext_resource type="Resource" uid="uid://doo4ly322b4jc" path="res://addons/func_godot/fgd/vertex_merge_distance_base.tres" id="2_c03gr"]
+[ext_resource type="Resource" uid="uid://bl4hy04wp3v6a" path="res://3D/TrenchBroom/EntityDefinitions/vertex_merge_distance_base_cirno.tres" id="3_irv3c"]
 [ext_resource type="Resource" uid="uid://bcdsueg5pysfq" path="res://addons/func_godot/fgd/cull_interior_faces.tres" id="3_wuxhx"]
 
 [resource]
@@ -11,7 +11,7 @@ collision_shape_type = 2
 collision_mask = 0
 classname = "func_detail"
 description = "Static collidable geometry. Builds a StaticBody3D with a MeshInstance3D and a single concave CollisionShape3D. Does not occlude other VisualInstance3D nodes."
-base_classes = Array[Resource]([ExtResource("1_c3bns"), ExtResource("2_c03gr"), ExtResource("3_wuxhx")])
+base_classes = Array[Resource]([ExtResource("1_c3bns"), ExtResource("3_wuxhx"), ExtResource("3_irv3c")])
 meta_properties = Dictionary[String, Variant]({
 "color": Color(0.8, 0.8, 0.8, 1)
 })

addons/func_godot/game_config/trenchbroom/tb_face_tag_clip.tres

@@ -5,4 +5,4 @@
 [resource]
 script = ExtResource("1_7td58")
 tag_name = "Clip"
-tag_pattern = "clip"
+tag_pattern = "clip*"

textures/special/skip.tres

@@ -0,0 +1,8 @@
+[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://bbh117okppt1n"]
+
+[ext_resource type="Texture2D" uid="uid://p8xebjdv35f0" path="res://textures/special/skip.png" id="1_cvdij"]
+
+[resource]
+albedo_texture = ExtResource("1_cvdij")
+metallic_specular = 0.0
+texture_filter = 2