From 803f8b1dbd7f3578a4ba912887e6443da7dd58c4 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 7 May 2021 18:37:55 -0700 Subject: [PATCH] HAR compatibility -scaling fix --- 1.2/Assemblies/Rimworld-Animations.dll | Bin 59392 -> 59392 bytes Source/Patches/HarmonyPatch_AlienRace.cs | 20 ++++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/1.2/Assemblies/Rimworld-Animations.dll b/1.2/Assemblies/Rimworld-Animations.dll index 18ebbf5f43cafb8297dd310a7151c9994674a10e..da4ab3d452b26128e9c399625cdd377b48185a13 100644 GIT binary patch delta 14229 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 b`^TvfBQugjt^?qzWgU^?5h4hB1^Y` delta 14101 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 bcg)j$pS{{{|Jx6uV7{(h{p>5&*30z2ZqiF# diff --git a/Source/Patches/HarmonyPatch_AlienRace.cs b/Source/Patches/HarmonyPatch_AlienRace.cs index 419ac97..cc06988 100644 --- a/Source/Patches/HarmonyPatch_AlienRace.cs +++ b/Source/Patches/HarmonyPatch_AlienRace.cs @@ -88,10 +88,13 @@ namespace Rimworld_Animations { float moffsetX = 0.42f; float moffsetZ = -0.22f; + + float layerOffset = offset?.layerOffset ?? ba.layerOffset; + float moffsetY = ba.inFrontOfBody ? 0.3f + ba.layerOffset : -0.3f - ba.layerOffset; float num = ba.angle; - if ((ba.drawnInBed || ba.alignWithHead ? pawnAnimator.headFacing : rotation) == Rot4.North) { + if (((ba.drawnInBed || ba.alignWithHead) ? pawnAnimator.headFacing : rotation) == Rot4.North) { moffsetX = 0f; if (ba.layerInvert) moffsetY = -moffsetY; @@ -100,10 +103,8 @@ namespace Rimworld_Animations { num = 0; } - moffsetX += bodyOffset.x + crownOffset.x; - moffsetZ += bodyOffset.y + crownOffset.y; - if ((ba.drawnInBed || ba.alignWithHead ? pawnAnimator.headFacing : rotation) == Rot4.East) { + if (((ba.drawnInBed || ba.alignWithHead) ? pawnAnimator.headFacing : rotation) == Rot4.East) { moffsetX = -moffsetX; num = -num; //Angle } @@ -113,6 +114,9 @@ namespace Rimworld_Animations { //Angle calculation to not pick the shortest, taken from Quaternion.Angle and modified //assume drawnInBed means headAddon + Graphic addonGraphic = alienComp.addonGraphics[i]; + addonGraphic.drawSize = (portrait && ba.drawSizePortrait != Vector2.zero ? ba.drawSizePortrait : ba.drawSize) * (ba.scaleWithPawnDrawsize ? alienComp.customDrawSize : Vector2.one) * 1.5f; + if (ba.drawnInBed || ba.alignWithHead && pawn.TryGetComp() != null && pawn.TryGetComp().isAnimating) { Quaternion headQuatInAnimation = Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up); @@ -120,8 +124,8 @@ namespace Rimworld_Animations { Vector3 headPositionInAnimation = pawnAnimator.getPawnHeadPosition() - pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing).RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: headQuatInAnimation)) * 2f * 57.29578f); - GenDraw.DrawMeshNowOrLater(mesh: alienComp.addonGraphics[index: i].MeshAt(rot: headRotInAnimation), loc: headPositionInAnimation + offsetVector.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: headQuatInAnimation)) * 2f * 57.29578f), - quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * headQuatInAnimation, mat: alienComp.addonGraphics[index: i].MatAt(rot: pawnAnimator.headFacing), drawNow: portrait); + GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: headRotInAnimation), loc: headPositionInAnimation + offsetVector.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: headQuatInAnimation)) * 2f * 57.29578f), + quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * headQuatInAnimation, mat: addonGraphic.MatAt(rot: pawnAnimator.headFacing), drawNow: portrait); } @@ -132,8 +136,8 @@ namespace Rimworld_Animations { addonRotation = Quaternion.AngleAxis(angle: pawnAnimator.genitalAngle, axis: Vector3.up); } - GenDraw.DrawMeshNowOrLater(mesh: alienComp.addonGraphics[index: i].MeshAt(rot: rotation), loc: vector + offsetVector.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: quat)) * 2f * 57.29578f), - quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: alienComp.addonGraphics[index: i].MatAt(rot: rotation), drawNow: portrait); + GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: rotation), loc: vector + offsetVector.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: quat)) * 2f * 57.29578f), + quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: rotation), drawNow: portrait); }