Upgraded func_godot to 2025.8.2

addons/func_godot/src/map/func_godot_map.gd.uid

@@ -1 +1 @@
-uid://kno58homctew
+uid://cwu5cf7a0awcd

addons/func_godot/src/map/func_godot_map_settings.gd

@@ -1,24 +1,49 @@
-@icon("res://addons/func_godot/icons/icon_godot_ranger.svg")
 @tool
+@icon("res://addons/func_godot/icons/icon_godot_ranger.svg")
+class_name FuncGodotMapSettings extends Resource
 ## Reusable map settings configuration for [FuncGodotMap] nodes.
-class_name FuncGodotMapSettings
-extends Resource
 
-## Ratio between map editor units and Godot units. FuncGodot will divide brush coordinates by this number when building. This does not affect entity properties unless scripted to do so.
+#region BUILD
+@export_category("Build Settings")
+## Set automatically when [member inverse_scale_factor] is changed. Used primarily during the build process.
 var scale_factor: float = 0.03125
+
+## Ratio between map editor units and Godot units. FuncGodot will divide brush coordinates by this number and save the results to [member scale_factor].
+## This does not affect entity properties unless scripted to do so.
 @export var inverse_scale_factor: float = 32.0 :
 	set(value):
+		if value == 0.0:
+			printerr("Error: Cannot set Inverse Scale Factor to Zero")
+			return
 		inverse_scale_factor = value
 		scale_factor = 1.0 / value
 
 ## [FuncGodotFGDFile] that translates map file classnames into Godot nodes and packed scenes.
 @export var entity_fgd: FuncGodotFGDFile = preload("res://addons/func_godot/fgd/func_godot_fgd.tres")
 
-## Default class property to use in naming generated nodes. This setting is overridden by `name_property` in [FuncGodotFGDEntityClass].
+## Default class property to use in naming generated nodes. This setting is overridden by [member FuncGodotFGDEntityClass.name_property].
 ## Naming occurs before adding to the [SceneTree] and applying properties.
 ## Nodes will be named `"entity_" + name_property`. An entity's name should be unique, otherwise you may run into unexpected behavior.
 @export var entity_name_property: String = ""
 
+## Class property that determines whether the [FuncGodotFGDSolidClass] entity performs mesh smoothing operations.
+@export var entity_smoothing_property: String = "_phong"
+
+## Class property that contains the angular threshold that determines when a [FuncGodotFGDSolidClass] entity's mesh vertices are smoothed.
+@export var entity_smoothing_angle_property: String = "_phong_angle"
+
+## If true, will organize [SceneTree] using TrenchBroom Layers and Groups or Hammer Visgroups. Groups will be generated as [Node3D] nodes. 
+## All non-entity structural brushes will be moved out of their groups and merged into the `Worldspawn` entity.
+## Any Layers toggled to be omitted from export in TrenchBroom and their child entities and groups will not be built.
+@export var use_groups_hierarchy: bool = false
+
+## Class property that contains the snapping epsilon for generated vertices of [FuncGodotFGDSolidClass] entities. 
+## Utilizing this property can help reduce instances of seams between polygons.
+@export var vertex_merge_distance_property: String = "_vertex_merge_distance"
+
+#endregion
+
+#region TEXTURES
 @export_category("Textures")
 
 ## Base directory for textures. When building materials, FuncGodot will search this directory for texture files with matching names to the textures assigned to map brush faces.
@@ -27,20 +52,38 @@ var scale_factor: float = 0.03125
 ## File extensions to search for texture data.
 @export var texture_file_extensions: Array[String] = ["png", "jpg", "jpeg", "bmp", "tga", "webp"]
 
-## Optional path for the clip texture, relative to [member base_texture_dir]. Brush faces textured with the clip texture will have those faces removed from the generated [MeshInstance3D] but not the generated [CollisionShape3D].
-@export var clip_texture: String = "special/clip"
+## Optional path for the clip texture, relative to [member base_texture_dir]. 
+## Brush faces textured with the clip texture will have those faces removed from the generated [Mesh] but not the generated [Shape3D].
+@export var clip_texture: String = "special/clip":
+	set(tex):
+		clip_texture = tex.to_lower()
 
-## Optional path for the skip texture, relative to [member base_texture_dir]. Brush faces textured with the skip texture will have those faces removed from the generated [MeshInstance3D]. If the [FuncGodotFGDSolidClass] `collision_shape_type` is set to concave then it will also remove collision from those faces in the generated [CollisionShape3D].
-@export var skip_texture: String = "special/skip"
+## Optional path for the skip texture, relative to [member base_texture_dir]. 
+## Brush faces textured with the skip texture will have those faces removed from the generated [Mesh]. 
+## If [member FuncGodotFGDSolidClass.collision_shape_type] is set to concave then it will also remove collision from those faces in the generated [Shape3D].
+@export var skip_texture: String = "special/skip":
+	set(tex):
+		skip_texture = tex.to_lower()
 
-## Optional path for the origin texture, relative to [member base_texture_dir]. Brush faces textured with the origin texture will have those faces removed from the generated [MeshInstance3D]. The bounds of these faces will be used to calculate the origin point of the entity.
-@export var origin_texture: String = "special/origin"
+## Optional path for the origin texture, relative to [member base_texture_dir]. 
+## Brush faces textured with the origin texture will have those faces removed from the generated [Mesh] and [Shape3D]. 
+## The bounds of these faces will be used to calculate the origin point of the entity.
+@export var origin_texture: String = "special/origin":
+	set(tex):
+		origin_texture = tex.to_lower()
 
-## Optional [QuakeWADFile] resources to apply textures from. See the [Quake Wiki](https://quakewiki.org/wiki/Texture_Wad) for more information on Quake Texture WADs.
-@export var texture_wads: Array[Resource] = []
+## Optional [QuakeWadFile] resources to apply textures from. See the [Quake Wiki](https://quakewiki.org/wiki/Texture_Wad) for more information on Quake Texture WADs.
+@export var texture_wads: Array[QuakeWadFile] = []
 
+#endregion
+
+#region MATERIALS
 @export_category("Materials")
 
+## Base directory for loading and saving materials. When building materials, FuncGodot will search this directory for material resources 
+## with matching names to the textures assigned to map brush faces. If not found, will fall back to [member base_texture_dir].
+@export_dir var base_material_dir: String = ""
+
 ## File extension to search for [Material] definitions
 @export var material_file_extension: String = "tres"
 
@@ -67,19 +110,16 @@ var scale_factor: float = 0.03125
 ## Automatic PBR material generation ORM map pattern
 @export var orm_map_pattern: String = "%s_orm.%s"
 
-## Save automatically generated materials to disk, allowing reuse across [FuncGodotMap] nodes. [i]NOTE: Materials do not use the Default Material settings after saving.[/i]
+## Save automatically generated materials to disk, allowing reuse across [FuncGodotMap] nodes. 
+## [i]NOTE: Materials do not use the [member default_material] settings after saving.[/i]
 @export var save_generated_materials: bool = true
 
+#endregion
+
 @export_category("UV Unwrap")
 
 ## Texel size for UV2 unwrapping.
-## Actual texel size is uv_unwrap_texel_size / inverse_scale_factor. A ratio of 1/16 is usually a good place to start with (if inverse_scale_factor is 32, start with a uv_unwrap_texel_size of 2).
+## Actual texel size is uv_unwrap_texel_size / [member inverse_scale_factor]. A ratio of 1/16 is usually a good place to start with 
+## (if inverse_scale_factor is 32, start with a uv_unwrap_texel_size of 2).
 ## Larger values will produce less detailed lightmaps. To conserve memory and filesize, use the largest value that still looks good.
 @export var uv_unwrap_texel_size: float = 2.0
-
-@export_category("TrenchBroom")
-
-## If true, will organize Scene Tree using Trenchbroom Layers and Groups. Layers and Groups will be generated as [Node3D] nodes. 
-## All structural brushes will be moved out of the Layers and Groups and merged into the Worldspawn entity.
-## Any Layers toggled to be omitted from export in TrenchBroom will not be built.
-@export var use_trenchbroom_groups_hierarchy: bool = false

addons/func_godot/src/map/func_godot_map_settings.gd.uid

@@ -1 +1 @@
-uid://bctwech0sq0kh
+uid://38q6k0ctahjn