fix(skeleton): hide beard and skinned helmet pieces correctly
The hair/beard hide called into m_hairItemInstances/m_beardItemInstances (plural), fields that don't exist on VisEquipment - every other race uses the real singular m_hairItemInstance/m_beardItemInstance, so the beard was never actually hidden. Fixed the field names and made the helper handle both a GameObject and a List<GameObject> defensively. Helmet hiding only scaled the wrapper to zero, which does nothing for a skinned-mesh piece bound to the player's own bones - it ignores its wrapper's transform. Added SkeletonVisuals.SetEquipmentPieceHidden, which scales to zero and disables every child renderer, and used it everywhere the helmet is hidden (local player, remote players, main-menu preview). Also added an F8 debug dump of the hair/beard/helmet instance state (active, renderer enabled, scale) for diagnosing any future visibility regressions in-game. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
parent
ce87e987c9
commit
2f890f95f7
4 changed files with 154 additions and 54 deletions
|
|
@ -333,8 +333,8 @@ namespace RacesOfValheim
|
||||||
anim.cullingMode = AnimatorCullingMode.AlwaysAnimate;
|
anim.cullingMode = AnimatorCullingMode.AlwaysAnimate;
|
||||||
}
|
}
|
||||||
|
|
||||||
HideItemInstances(__instance, "m_hairItemInstances");
|
HideItemInstances(__instance, "m_hairItemInstance");
|
||||||
HideItemInstances(__instance, "m_beardItemInstances");
|
HideItemInstances(__instance, "m_beardItemInstance");
|
||||||
SetHelmetVisible(__instance, false);
|
SetHelmetVisible(__instance, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -357,8 +357,8 @@ namespace RacesOfValheim
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ShowItemInstances(__instance, "m_hairItemInstances");
|
ShowItemInstances(__instance, "m_hairItemInstance");
|
||||||
ShowItemInstances(__instance, "m_beardItemInstances");
|
ShowItemInstances(__instance, "m_beardItemInstance");
|
||||||
SetHelmetVisible(__instance, true);
|
SetHelmetVisible(__instance, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -373,70 +373,61 @@ namespace RacesOfValheim
|
||||||
/// first frame after a race change, all of which reach this postfix and none of which
|
/// first frame after a race change, all of which reach this postfix and none of which
|
||||||
/// reach SkeletonRace.
|
/// reach SkeletonRace.
|
||||||
///
|
///
|
||||||
/// Scaled rather than deactivated, because Valheim re-enables the instance whenever it
|
/// Delegates to SkeletonVisuals.SetEquipmentPieceHidden, which scales the wrapper to
|
||||||
/// refreshes visuals - the approach the Dvergar's hood already proved out.
|
/// zero and disables its renderers - scale alone leaves a skinned piece (bound to the
|
||||||
|
/// player's own bones rather than its own transform) still drawing, which is what a
|
||||||
|
/// helmet with a skinned cloth or chain part looked like.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static void SetHelmetVisible(VisEquipment visEq, bool visible)
|
private static void SetHelmetVisible(VisEquipment visEq, bool visible)
|
||||||
{
|
{
|
||||||
GameObject helmet = Traverse.Create(visEq).Field<GameObject>("m_helmetItemInstance").Value;
|
GameObject helmet = Traverse.Create(visEq).Field<GameObject>("m_helmetItemInstance").Value;
|
||||||
if (helmet == null) return;
|
SkeletonVisuals.SetEquipmentPieceHidden(helmet, !visible);
|
||||||
|
|
||||||
Vector3 wanted = visible ? Vector3.one : Vector3.zero;
|
|
||||||
|
|
||||||
// Only ever undo our own hiding: another race may legitimately be scaling this.
|
|
||||||
if (!visible && helmet.transform.localScale != Vector3.zero)
|
|
||||||
{
|
|
||||||
helmet.transform.localScale = wanted;
|
|
||||||
}
|
|
||||||
else if (visible && helmet.transform.localScale == Vector3.zero)
|
|
||||||
{
|
|
||||||
helmet.transform.localScale = wanted;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void HideItemInstances(VisEquipment visEq, string fieldName)
|
private static void HideItemInstances(VisEquipment visEq, string fieldName)
|
||||||
|
{
|
||||||
|
SetItemInstanceActive(visEq, fieldName, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void ShowItemInstances(VisEquipment visEq, string fieldName)
|
||||||
|
{
|
||||||
|
SetItemInstanceActive(visEq, fieldName, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Hair and beard live in VisEquipment as a single GameObject (m_hairItemInstance /
|
||||||
|
/// m_beardItemInstance), the same as the helmet - not a list. A previous version of
|
||||||
|
/// this looked for "m_hairItemInstances" / "m_beardItemInstances" (plural), which do
|
||||||
|
/// not exist on VisEquipment, so the reflection lookup silently found nothing and the
|
||||||
|
/// beard never got the SetActive(false) this was supposed to give it. Handling both
|
||||||
|
/// shapes here matches the defensive pattern the Furling race already uses.
|
||||||
|
/// </summary>
|
||||||
|
private static void SetItemInstanceActive(VisEquipment visEq, string fieldName, bool active)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var field = typeof(VisEquipment).GetField(fieldName, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
|
var field = typeof(VisEquipment).GetField(fieldName, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
|
||||||
if (field != null)
|
if (field == null) return;
|
||||||
|
|
||||||
|
object value = field.GetValue(visEq);
|
||||||
|
if (value is GameObject go)
|
||||||
{
|
{
|
||||||
var list = field.GetValue(visEq) as System.Collections.Generic.List<GameObject>;
|
if (go != null) go.SetActive(active);
|
||||||
if (list != null)
|
}
|
||||||
|
else if (value is System.Collections.Generic.List<GameObject> list)
|
||||||
|
{
|
||||||
|
foreach (GameObject item in list)
|
||||||
{
|
{
|
||||||
foreach (GameObject go in list)
|
if (item != null) item.SetActive(active);
|
||||||
{
|
|
||||||
if (go != null) go.SetActive(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (System.Exception e)
|
catch (System.Exception e)
|
||||||
{
|
{
|
||||||
Jotunn.Logger.LogWarning($"Failed to hide {fieldName}: {e.Message}");
|
Jotunn.Logger.LogWarning($"Failed to set {fieldName} active={active}: {e.Message}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void ShowItemInstances(VisEquipment visEq, string fieldName)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var field = typeof(VisEquipment).GetField(fieldName, System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
|
|
||||||
if (field != null)
|
|
||||||
{
|
|
||||||
var list = field.GetValue(visEq) as System.Collections.Generic.List<GameObject>;
|
|
||||||
if (list != null)
|
|
||||||
{
|
|
||||||
foreach (GameObject go in list)
|
|
||||||
{
|
|
||||||
if (go != null) go.SetActive(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (System.Exception e) { }
|
|
||||||
}
|
|
||||||
|
|
||||||
// Bones worth reporting on. Not remapped - the player rig has a real 'Jaw' bone and the
|
// Bones worth reporting on. Not remapped - the player rig has a real 'Jaw' bone and the
|
||||||
// name match lands on it correctly, which is exactly why the plain and poison skeletons
|
// name match lands on it correctly, which is exactly why the plain and poison skeletons
|
||||||
// always looked right. An earlier attempt pinned this group to the head instead and
|
// always looked right. An earlier attempt pinned this group to the head instead and
|
||||||
|
|
|
||||||
|
|
@ -170,6 +170,87 @@ namespace RacesOfValheim
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// F8 debug: fires a ray from the camera and logs whatever it hits. Cosmetic pieces
|
||||||
|
/// (hair, beard, helmet) carry no collider, so this mostly confirms terrain/creature hits
|
||||||
|
/// - LogHeadCosmeticsState below is what actually answers "what is that floating chunk."
|
||||||
|
/// Kept anyway because it is the general-purpose "what am I looking at" tool for any other
|
||||||
|
/// bone or prefab placement question that comes up later.
|
||||||
|
/// </summary>
|
||||||
|
private void LogRaycastHit()
|
||||||
|
{
|
||||||
|
Camera cam = Camera.main;
|
||||||
|
if (cam == null)
|
||||||
|
{
|
||||||
|
Jotunn.Logger.LogInfo("[F8] No camera found for raycast.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ray ray = new Ray(cam.transform.position, cam.transform.forward);
|
||||||
|
if (Physics.Raycast(ray, out RaycastHit hit, 50f))
|
||||||
|
{
|
||||||
|
Jotunn.Logger.LogInfo("--- F8 RAYCAST HIT ---");
|
||||||
|
Jotunn.Logger.LogInfo($"Collider: '{hit.collider.gameObject.name}' at {hit.point:F2}, distance={hit.distance:F2}");
|
||||||
|
Jotunn.Logger.LogInfo($"Full path: {GetFullPath(hit.collider.transform)}");
|
||||||
|
Renderer renderer = hit.collider.GetComponentInParent<Renderer>();
|
||||||
|
if (renderer != null)
|
||||||
|
{
|
||||||
|
Jotunn.Logger.LogInfo($"Nearest renderer: '{renderer.gameObject.name}' ({renderer.GetType().Name}), enabled={renderer.enabled}, scale={renderer.transform.lossyScale:F3}");
|
||||||
|
}
|
||||||
|
Jotunn.Logger.LogInfo("----------------------");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Jotunn.Logger.LogInfo("[F8] Raycast hit nothing within 50m (cosmetic pieces usually have no collider anyway).");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetFullPath(Transform t)
|
||||||
|
{
|
||||||
|
string path = t.name;
|
||||||
|
for (Transform parent = t.parent; parent != null; parent = parent.parent)
|
||||||
|
{
|
||||||
|
path = parent.name + "/" + path;
|
||||||
|
}
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// F8 debug: dumps the exact state of the three item slots this race hides (hair, beard,
|
||||||
|
/// helmet) - active flag, renderer enabled flag and scale for every renderer underneath.
|
||||||
|
/// This is the direct answer to "what is still visible and why": a chunk that survives
|
||||||
|
/// hiding will show up here as active=true, or as a renderer with enabled=true even while
|
||||||
|
/// its wrapper is scaled to zero (the skinned-mesh case scale alone cannot hide).
|
||||||
|
/// </summary>
|
||||||
|
private void LogHeadCosmeticsState()
|
||||||
|
{
|
||||||
|
if (Player.m_localPlayer == null) return;
|
||||||
|
VisEquipment vis = Player.m_localPlayer.GetComponent<VisEquipment>();
|
||||||
|
if (vis == null) return;
|
||||||
|
|
||||||
|
Jotunn.Logger.LogInfo("--- F8 SKELETON HEAD COSMETICS ---");
|
||||||
|
DumpItemInstanceField(vis, "m_hairItemInstance");
|
||||||
|
DumpItemInstanceField(vis, "m_beardItemInstance");
|
||||||
|
DumpItemInstanceField(vis, "m_helmetItemInstance");
|
||||||
|
Jotunn.Logger.LogInfo("----------------------------------");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void DumpItemInstanceField(VisEquipment vis, string fieldName)
|
||||||
|
{
|
||||||
|
GameObject go = HarmonyLib.Traverse.Create(vis).Field<GameObject>(fieldName).Value;
|
||||||
|
if (go == null)
|
||||||
|
{
|
||||||
|
Jotunn.Logger.LogInfo($"[F8] {fieldName}: null (nothing equipped/instantiated).");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Jotunn.Logger.LogInfo($"[F8] {fieldName}: '{go.name}' active={go.activeSelf} scale={go.transform.localScale:F3}");
|
||||||
|
foreach (Renderer r in go.GetComponentsInChildren<Renderer>(true))
|
||||||
|
{
|
||||||
|
Jotunn.Logger.LogInfo($"[F8] renderer '{r.gameObject.name}' ({r.GetType().Name}) enabled={r.enabled}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
if (Input.GetKeyDown(KeyCode.F8))
|
if (Input.GetKeyDown(KeyCode.F8))
|
||||||
|
|
@ -180,6 +261,9 @@ namespace RacesOfValheim
|
||||||
DumpTransformHierarchy(Hud.instance.transform, "");
|
DumpTransformHierarchy(Hud.instance.transform, "");
|
||||||
Jotunn.Logger.LogInfo("--------------------------");
|
Jotunn.Logger.LogInfo("--------------------------");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LogRaycastHit();
|
||||||
|
LogHeadCosmeticsState();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Player.m_localPlayer == null) return;
|
if (Player.m_localPlayer == null) return;
|
||||||
|
|
@ -245,10 +329,7 @@ namespace RacesOfValheim
|
||||||
{
|
{
|
||||||
// Hide Helmets (Valheim uses singular GameObject for helmet)
|
// Hide Helmets (Valheim uses singular GameObject for helmet)
|
||||||
var helmetObj = HarmonyLib.Traverse.Create(currentVis).Field<GameObject>("m_helmetItemInstance").Value;
|
var helmetObj = HarmonyLib.Traverse.Create(currentVis).Field<GameObject>("m_helmetItemInstance").Value;
|
||||||
if (helmetObj != null && helmetObj.transform.localScale != Vector3.zero)
|
SkeletonVisuals.SetEquipmentPieceHidden(helmetObj, true);
|
||||||
{
|
|
||||||
helmetObj.transform.localScale = Vector3.zero;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Scale Body Armor (Chest, Legs, Shoulder) by 5%
|
// Scale Body Armor (Chest, Legs, Shoulder) by 5%
|
||||||
string[] armorFields = { "m_chestItemInstances", "m_legItemInstances", "m_shoulderItemInstances" };
|
string[] armorFields = { "m_chestItemInstances", "m_legItemInstances", "m_shoulderItemInstances" };
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,37 @@ namespace RacesOfValheim
|
||||||
|
|
||||||
public static bool IsSkeletonPlayer(Player player) => GetPlayerRace(player) == RaceId;
|
public static bool IsSkeletonPlayer(Player player) => GetPlayerRace(player) == RaceId;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Fully hides (or restores) one equipped item instance - a helmet, typically.
|
||||||
|
///
|
||||||
|
/// Scale-to-zero alone leaves skinned pieces behind: a SkinnedMeshRenderer bound to the
|
||||||
|
/// player's own bones (some helmets carry a cloth or chain piece skinned that way) is
|
||||||
|
/// deformed by those bone matrices, not by its GameObject's transform, so zeroing the
|
||||||
|
/// wrapper's localScale does nothing to it - exactly the "part of the helmet is still
|
||||||
|
/// there" artifact reported on the Skeleton. Disabling every Renderer underneath has no
|
||||||
|
/// such exception; combined with the scale it hides both plain and skinned pieces, and
|
||||||
|
/// is reasserted the same way (Valheim's own visual refresh re-enables the instance and
|
||||||
|
/// resets its scale, so both must be redone every time visuals rebuild).
|
||||||
|
/// </summary>
|
||||||
|
public static void SetEquipmentPieceHidden(GameObject instance, bool hidden)
|
||||||
|
{
|
||||||
|
if (instance == null) return;
|
||||||
|
|
||||||
|
Vector3 wantedScale = hidden ? Vector3.zero : Vector3.one;
|
||||||
|
if (instance.transform.localScale != wantedScale)
|
||||||
|
{
|
||||||
|
instance.transform.localScale = wantedScale;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (Renderer renderer in instance.GetComponentsInChildren<Renderer>(true))
|
||||||
|
{
|
||||||
|
if (renderer.enabled == hidden)
|
||||||
|
{
|
||||||
|
renderer.enabled = !hidden;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The tier a given player's body should be built for. The ZDO carries it so remote
|
/// The tier a given player's body should be built for. The ZDO carries it so remote
|
||||||
/// players render at their own standing; without one - the menu preview - fall back to
|
/// players render at their own standing; without one - the menu preview - fall back to
|
||||||
|
|
|
||||||
|
|
@ -128,10 +128,7 @@ namespace RacesOfValheim
|
||||||
|
|
||||||
// Hide Helmet
|
// Hide Helmet
|
||||||
var helmetObj = HarmonyLib.Traverse.Create(vis).Field<GameObject>("m_helmetItemInstance").Value;
|
var helmetObj = HarmonyLib.Traverse.Create(vis).Field<GameObject>("m_helmetItemInstance").Value;
|
||||||
if (helmetObj != null && helmetObj.transform.localScale != Vector3.zero)
|
SkeletonVisuals.SetEquipmentPieceHidden(helmetObj, true);
|
||||||
{
|
|
||||||
helmetObj.transform.localScale = Vector3.zero;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Scale Body Armor
|
// Scale Body Armor
|
||||||
string[] armorFields = { "m_chestItemInstances", "m_legItemInstances", "m_shoulderItemInstances" };
|
string[] armorFields = { "m_chestItemInstances", "m_legItemInstances", "m_shoulderItemInstances" };
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue