diff --git a/Client/origin-client/scenes/game/components/units/unit_mesh_builder.gd b/Client/origin-client/scenes/game/components/units/unit_mesh_builder.gd index beae544..2f510e0 100644 --- a/Client/origin-client/scenes/game/components/units/unit_mesh_builder.gd +++ b/Client/origin-client/scenes/game/components/units/unit_mesh_builder.gd @@ -37,6 +37,12 @@ var _unit_load_gen: Dictionary = {} # iid → int (incremented each model-load var _active_tweens: Array[Tween] = [] # shader tweens tracked for kill-on-rebuild const _MAX_POOL_PER_TYPE := 6 # overflow beyond this is freed immediately +const _MIN_AUTHORED_MODEL_DIM := 0.08 +const _TARGET_ARCH_MODEL_DIM := 0.55 +const _TARGET_UNIT_MODEL_DIM := 0.40 +const _MAX_AUTO_MODEL_SCALE := 100.0 +const _MAX_ARCH_MODEL_DIM := 1.35 +const _MAX_UNIT_MODEL_DIM := 1.00 var _unit_pool: Dictionary = {} # card_type (String) -> Array[StaticBody3D] var _pool_root: Node3D = null @@ -379,9 +385,11 @@ func add_unit_mesh(unit: Dictionary, team_color: Color, is_enemy: bool = false, if child == placeholder: child.queue_free() - # Apply uniform scale if configured. - var target_scale: Vector3 = Vector3.ONE * model_scale - if not is_equal_approx(model_scale, 1.0): + var raw_aabb: AABB = model_local_aabb(model_node) + var auto_scale: float = _auto_model_scale_for_aabb(raw_aabb, card_type) + var effective_scale: float = _clamp_effective_model_scale(raw_aabb, card_type, model_scale * auto_scale) + var target_scale: Vector3 = Vector3.ONE * effective_scale + if not is_equal_approx(effective_scale, 1.0): model_node.scale = target_scale # Facing config was already stored above; no need to repeat. @@ -399,9 +407,8 @@ func add_unit_mesh(unit: Dictionary, team_color: Color, is_enemy: bool = false, b.add_child(model_node) # Seat the model's AABB bottom (feet) on the tile surface. # body-local Y=0 is the tile top; feet target = -above_tile. - var m_aabb: AABB = model_local_aabb(model_node) - if m_aabb.size != Vector3.ZERO: - model_node.position.y = -above_tile - target_scale.y * m_aabb.position.y + if raw_aabb.size != Vector3.ZERO: + model_node.position.y = -above_tile - target_scale.y * raw_aabb.position.y unit_meshes[iid] = model_node if Time.get_ticks_msec() <= int(materialize_until.get(iid, 0)): if ascend_arrival: @@ -1128,16 +1135,19 @@ func do_model_retry(iid: String, model_url: String, attempt: int, etag: String = var def: Dictionary = ContentCache.get_definition(def_id) var model_scale: float = _parse_model_scale(def.get("modelScale", 1.0)) var model_tint: Color = _parse_model_tint(def.get("modelTintColor", "")) - var target_scale: Vector3 = Vector3.ONE * model_scale - if not is_equal_approx(model_scale, 1.0): + var raw_aabb: AABB = model_local_aabb(model_node) + var card_type: String = str(body.get_meta("card_type", "Spirit")) + var auto_scale: float = _auto_model_scale_for_aabb(raw_aabb, card_type) + var effective_scale: float = _clamp_effective_model_scale(raw_aabb, card_type, model_scale * auto_scale) + var target_scale: Vector3 = Vector3.ONE * effective_scale + if not is_equal_approx(effective_scale, 1.0): model_node.scale = target_scale model_node.rotation.y = idle_rotation(iid) apply_model_tint(model_node, model_tint) var above_tile: float = body.get_meta("above_tile", 0.28) body.add_child(model_node) - var m_aabb: AABB = model_local_aabb(model_node) - if m_aabb.size != Vector3.ZERO: - model_node.position.y = -above_tile - target_scale.y * m_aabb.position.y + if raw_aabb.size != Vector3.ZERO: + model_node.position.y = -above_tile - target_scale.y * raw_aabb.position.y unit_meshes[iid] = model_node var ap: AnimationPlayer = find_animation_player(model_node) anim_players[iid] = ap @@ -1164,6 +1174,22 @@ func _parse_model_scale(value: Variant) -> float: return parsed +func _auto_model_scale_for_aabb(aabb: AABB, card_type: String) -> float: + var max_dim: float = maxf(aabb.size.x, maxf(aabb.size.y, aabb.size.z)) + if max_dim <= 0.0 or max_dim >= _MIN_AUTHORED_MODEL_DIM: + return 1.0 + var target_dim: float = _TARGET_ARCH_MODEL_DIM if card_type == "ArchSpirit" else _TARGET_UNIT_MODEL_DIM + return clampf(target_dim / max_dim, 1.0, _MAX_AUTO_MODEL_SCALE) + + +func _clamp_effective_model_scale(aabb: AABB, card_type: String, scale: float) -> float: + var max_dim: float = maxf(aabb.size.x, maxf(aabb.size.y, aabb.size.z)) + if max_dim <= 0.0: + return scale + var max_allowed: float = _MAX_ARCH_MODEL_DIM if card_type == "ArchSpirit" else _MAX_UNIT_MODEL_DIM + return minf(scale, max_allowed / max_dim) + + func _parse_model_tint(value: Variant) -> Color: var text: String = str(value).strip_edges() if text.is_empty() or text.to_lower() == "null": @@ -1426,20 +1452,32 @@ func idle_rotation(iid: String) -> float: func model_local_aabb(root: Node3D) -> AABB: var result: AABB = AABB() var first: bool = true - var stack: Array = [root] + var stack: Array = [{ + "node": root, + "transform": Transform3D.IDENTITY + }] while not stack.is_empty(): - var n: Variant = stack.pop_back() + var item: Dictionary = stack.pop_back() as Dictionary + var n: Node3D = item.get("node") as Node3D + if n == null: + continue + var xf: Transform3D = item.get("transform", Transform3D.IDENTITY) if n is MeshInstance3D: var mi: MeshInstance3D = n as MeshInstance3D if mi.mesh != null: - var local_aabb: AABB = mi.get_transform() * mi.mesh.get_aabb() + var local_aabb: AABB = xf * mi.mesh.get_aabb() if first: result = local_aabb first = false else: result = result.merge(local_aabb) for child: Variant in n.get_children(): - stack.append(child) + if child is Node3D: + var child_node: Node3D = child as Node3D + stack.append({ + "node": child_node, + "transform": xf * child_node.transform + }) return result # ── Internal helpers ──────────────────────────────────────────────────────────