fix(visuals): measure the skull's facing from the bind pose, for all three clawed races
The eye frame was read from the head bone's pose ON THE FRAME THE EYES WERE BUILT, snapped to the nearest axis, then cached for the life of the eyes. Catch the head a few degrees into a turn and the snap picks the neighbouring axis, and the pair stays wrong until something rebuilds it. Each race met this separately and each added the same guard - do not build while attached, mid-attack or asleep - which caught the loud cases and left the quiet one: a race change rebuilds while the rig is still settling, which is none of those three. That is why resetting into a race could break the placement while logging out and back in silently fixed it. The logout was never a fix, only a rebuild at a calmer moment, and no fourth guard condition would have closed it - the read itself had to stop depending on when it happens. sharedMesh.bindposes[headBone] is the rig as authored: no animation in it, no timing, the same answer on frame one and frame ten thousand. A rebuild is now deterministic and a bad moment cannot exist. Falls back to the live read, warning once, on a rig that carries no bind pose. Lives in one shared RigBindPose rather than in three copies. The three eye implementations are separate files by design - they differ in what they hang and how it is coloured - but this is the one piece of maths where a divergence would be a bug in whichever copy got fixed second, and it had already been fixed twice. The three now-dead private SnapToAxis copies go with it. Also updates the Aswid eye defaults to the values dialled in on screen: forward 0.013, height 0.004, yaw 22.068.
This commit is contained in:
parent
7668a0a996
commit
3f09c7cf3f
5 changed files with 141 additions and 72 deletions
|
|
@ -267,10 +267,10 @@ namespace RacesOfValheim
|
|||
new ConfigDescription("Scales both sockets. 1 is the size the source creature wears them at.",
|
||||
new AcceptableValueRange<float>(0.01f, 50f), new ConfigurationManagerAttributes { Order = 80 }));
|
||||
|
||||
EyeForwardOffset = config.Bind(eyes, "Eye Forward Offset", 0.01f,
|
||||
EyeForwardOffset = config.Bind(eyes, "Eye Forward Offset", 0.013f,
|
||||
new ConfigDescription("Moves both eyes out of (or into) the face, in metres. Positive is forward, out of the skull.",
|
||||
new AcceptableValueRange<float>(-0.5f, 0.5f), new ConfigurationManagerAttributes { Order = 70 }));
|
||||
EyeHeightOffset = config.Bind(eyes, "Eye Height Offset", 0f,
|
||||
EyeHeightOffset = config.Bind(eyes, "Eye Height Offset", 0.004f,
|
||||
new ConfigDescription("Moves both eyes up or down the face, in metres. Positive is up.",
|
||||
new AcceptableValueRange<float>(-0.5f, 0.5f), new ConfigurationManagerAttributes { Order = 69 }));
|
||||
EyeSeparationOffset = config.Bind(eyes, "Eye Separation Offset", 0.007f,
|
||||
|
|
@ -280,7 +280,7 @@ namespace RacesOfValheim
|
|||
EyeRotationX = config.Bind(eyes, "Eye Rotation X", 0f,
|
||||
new ConfigDescription("Turns both eyes on the spot. Only matters if the borrowed socket is flat enough to be seen edge-on.",
|
||||
new AcceptableValueRange<float>(-180f, 180f), new ConfigurationManagerAttributes { Order = 60 }));
|
||||
EyeRotationY = config.Bind(eyes, "Eye Rotation Y", 24.664f,
|
||||
EyeRotationY = config.Bind(eyes, "Eye Rotation Y", 22.068f,
|
||||
new ConfigDescription("As above, around the second axis - but MIRRORED: the left eye turns the opposite way, so the pair toes in or out together instead of both pointing off the same shoulder.",
|
||||
new AcceptableValueRange<float>(-180f, 180f), new ConfigurationManagerAttributes { Order = 59 }));
|
||||
EyeRotationZ = config.Bind(eyes, "Eye Rotation Z", -180f,
|
||||
|
|
|
|||
|
|
@ -382,20 +382,17 @@ namespace RacesOfValheim
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Rounds a direction to the nearest of the six axis directions. Whichever component is
|
||||
/// largest wins, sign included.
|
||||
/// Which way the skull faces, from the bind pose rather than from this frame's animation.
|
||||
/// See RigBindPose for why that distinction is the whole bug - shared with the Dvergar and
|
||||
/// the Sverm, which hit it too.
|
||||
/// </summary>
|
||||
private static Vector3 SnapToAxis(Vector3 direction)
|
||||
private static void MeasureFrame(Player player, Transform headBone, EyeFrame frame)
|
||||
{
|
||||
float x = Mathf.Abs(direction.x);
|
||||
float y = Mathf.Abs(direction.y);
|
||||
float z = Mathf.Abs(direction.z);
|
||||
|
||||
if (x >= y && x >= z) return new Vector3(Mathf.Sign(direction.x), 0f, 0f);
|
||||
if (y >= z) return new Vector3(0f, Mathf.Sign(direction.y), 0f);
|
||||
return new Vector3(0f, 0f, Mathf.Sign(direction.z));
|
||||
RigBindPose.MeasureHeadFrame(player, headBone, "Aswid",
|
||||
out frame.LocalForward, out frame.LocalUp, out frame.LocalRight);
|
||||
}
|
||||
|
||||
|
||||
private static Transform BuildEyes(Player player, Transform headBone)
|
||||
{
|
||||
string modelName = AswidConfig.EyeSourceModel.Value;
|
||||
|
|
@ -420,22 +417,11 @@ namespace RacesOfValheim
|
|||
holder.transform.localRotation = Quaternion.identity;
|
||||
holder.transform.localScale = Vector3.one;
|
||||
|
||||
// Ask the rig which way it faces, once, and round the answer to the skull's own axes -
|
||||
// see DvergarVisuals.BuildEyes for why the raw, unrounded measurement puts the eyes at
|
||||
// the jaw instead of the eye line.
|
||||
//
|
||||
// player.transform, NOT headBone.root. headBone comes off VisEquipment.m_bodyModel's
|
||||
// own bone array, and walking .root from there does not reliably land back on the
|
||||
// player - the eyes came out wrong on every single build, not just an unlucky one, which
|
||||
// is what a bad-timing read (the guard above already handles that) would look like.
|
||||
// A CONSISTENTLY wrong answer means a consistently wrong reference, not a bad moment to
|
||||
// ask it in. DvergarVisuals.BuildEyes already reads player.transform directly for
|
||||
// exactly this reason; this now matches it.
|
||||
Transform root = player.transform;
|
||||
// Which way the skull faces, taken from the BIND POSE rather than from the pose the
|
||||
// head happens to hold on this frame. See MeasureFrame - this is the whole reason a
|
||||
// rebuild is no longer a lottery.
|
||||
EyeFrame frame = holder.AddComponent<EyeFrame>();
|
||||
frame.LocalForward = SnapToAxis(headBone.InverseTransformDirection(root.forward));
|
||||
frame.LocalUp = SnapToAxis(headBone.InverseTransformDirection(root.up));
|
||||
frame.LocalRight = Vector3.Cross(frame.LocalUp, frame.LocalForward).normalized;
|
||||
MeasureFrame(player, headBone, frame);
|
||||
frame.SourceModel = modelName;
|
||||
frame.FlatShader = AswidConfig.EyeFlatColorShader.Value;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue