From 0de9346eac88c80c5ecd794d0453496cd8ddbbe4 Mon Sep 17 00:00:00 2001 From: c0ffee Date: Fri, 19 Apr 2024 21:38:04 -0700 Subject: [PATCH] fixes for addon rotations more robust pawnrendertree animating node selection --- 1.5/Assemblies/Rimworld-Animations.dll | Bin 26112 -> 26112 bytes 1.5/Defs/AnimationDefs/TestAnimation2.xml | 28 +- 1.5/Defs/XMLFile1.xml | 11 + .../HarmonyPatch_PawnRenderNode.cs | 2 +- .../HarmonyPatch_PawnRenderTree.cs | 35 +- .../Patch_HumanoidAlienRaces.csproj | 4 +- .../Source/HarmonyPatch_AlienRace.cs | 354 ------------------ Rimworld-Animations.csproj | 2 +- 8 files changed, 47 insertions(+), 389 deletions(-) create mode 100644 1.5/Defs/XMLFile1.xml delete mode 100644 Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs diff --git a/1.5/Assemblies/Rimworld-Animations.dll b/1.5/Assemblies/Rimworld-Animations.dll index 45220c0e413d717e25afdc4851f4e20e45b8b684..bc82647e246bba8f5bc4adb07f5f363425e94ecf 100644 GIT binary patch delta 7636 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 S{X>(La delta 7681 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 ubY8k5Xzxw`k1XG TestAnimation2 - 50 + 120 False False @@ -20,20 +20,20 @@
  • (0, -1, 0) - 20 - 0 + 30 + 15 North
  • (-1, -1, 0) - 30 + 60 0 North
  • (0, -1, 0) - 40 - 0 + 90 + -15 North
    • @@ -50,19 +50,19 @@ North
  • - 6 - 0 - North + 15 + 30 + East
  • - 12 + 30 0 - North + South
  • - 18 - 0 - North + 45 + -30 + West
    • diff --git a/1.5/Defs/XMLFile1.xml b/1.5/Defs/XMLFile1.xml new file mode 100644 index 0000000..2ddecfa --- /dev/null +++ b/1.5/Defs/XMLFile1.xml @@ -0,0 +1,11 @@ + + + + Root + + Hand + PawnRenderNode + P + + + diff --git a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNode.cs b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNode.cs index cf45a65..1e423a7 100644 --- a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNode.cs +++ b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderNode.cs @@ -9,7 +9,7 @@ using Verse; namespace Rimworld_Animations { - //Head Rotation Code + //Head Rotation Code - Textures [HarmonyPatch(typeof(PawnRenderNode), "AppendRequests")] public static class HarmonyPatch_PawnRenderNode { diff --git a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderTree.cs b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderTree.cs index b932135..6dc336f 100644 --- a/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderTree.cs +++ b/1.5/Source/Patches/RimworldPatches/HarmonyPatch_PawnRenderTree.cs @@ -9,32 +9,35 @@ using Verse; namespace Rimworld_Animations { + [HarmonyPatch(typeof(PawnRenderTree), "TryGetMatrix")] public class HarmonyPatch_PawnRenderTree { - public static void Prefix(PawnRenderTree __instance, PawnRenderNode node, ref PawnDrawParms parms) + public static void Prefix(PawnRenderTree __instance, Dictionary ___nodesByTag, PawnRenderNode node, ref PawnDrawParms parms) { - //Note: Maybe need to change this to check all ancestors if it's the head node - //in case of deeper nodes in the PawnRenderTree - //This code only checks for node and parent, if either are head - - // Change facing for all head and apparelhead nodes - // So that the offset is based on body rotation, not head rotation - - //fixes misaligned hairs and headaddons - if ((node.Props.tagDef == PawnRenderNodeTagDefOf.Head || node.Props.tagDef == PawnRenderNodeTagDefOf.ApparelHead - || node?.parent?.Props?.tagDef == PawnRenderNodeTagDefOf.Head || node?.parent?.Props?.tagDef == PawnRenderNodeTagDefOf.ApparelHead) - && node.tree.rootNode.AnimationWorker is AnimationWorker_KeyframesExtended rootNodeAnimationWorker) + //find lowest parent that is animating, or nothing if not animating + PawnRenderNode animatingNode = node; + while (animatingNode != null + && !(animatingNode.AnimationWorker is AnimationWorker_KeyframesExtended)) { - - // this is only for the Vector3 position to work right - parms.facing = rootNodeAnimationWorker.facingAtTick(node.tree.AnimationTick); + animatingNode = animatingNode.parent; + } + + //if animating parent node found, + if (animatingNode?.AnimationWorker is AnimationWorker_KeyframesExtended animatingNodeAnimationWorker) + { + //change parm to facing to animate correctly + parms.facing = animatingNodeAnimationWorker.facingAtTick(__instance.AnimationTick); } } + } + + //recaching + //done here because changing parms causes recaching anyway, so might as well do it here [HarmonyPatch(typeof(PawnRenderTree), "AdjustParms")] public class HarmonyPatch_PawnRenderTree2 { @@ -57,7 +60,7 @@ namespace Rimworld_Animations { if (node.AnimationWorker is AnimationWorker_KeyframesExtended animWorkerExtended) { - //recache during facing turn + //recache during flicker on/off if (animWorkerExtended.shouldRecache(animationTick)) { node.requestRecache = true; diff --git a/Patch_HumanoidAlienRaces/Patch_HumanoidAlienRaces.csproj b/Patch_HumanoidAlienRaces/Patch_HumanoidAlienRaces.csproj index 797d0a4..4661863 100644 --- a/Patch_HumanoidAlienRaces/Patch_HumanoidAlienRaces.csproj +++ b/Patch_HumanoidAlienRaces/Patch_HumanoidAlienRaces.csproj @@ -37,8 +37,7 @@ False - ..\..\..\..\..\workshop\content\294100\839005762\1.4\Assemblies\AlienRace.dll - False + ..\..\..\..\..\workshop\content\294100\839005762\1.5\Assemblies\AlienRace.dll ..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll @@ -72,6 +71,5 @@ - \ No newline at end of file diff --git a/Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs b/Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs deleted file mode 100644 index f06e987..0000000 --- a/Patch_HumanoidAlienRaces/Source/HarmonyPatch_AlienRace.cs +++ /dev/null @@ -1,354 +0,0 @@ -using HarmonyLib; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Reflection.Emit; -using System.Text; -using System.Threading.Tasks; -using UnityEngine; -using Verse; -using AlienRace; - -namespace Rimworld_Animations { - - - [StaticConstructorOnStartup] - public static class HarmonyPatch_AlienRace - { - static HarmonyPatch_AlienRace() - { - (new Harmony("rjwanim")).Patch(AccessTools.Method(AccessTools.TypeByName("AlienRace.HarmonyPatches"), "DrawAddons"), - prefix: new HarmonyMethod(AccessTools.Method(typeof(HarmonyPatch_AlienRace), "Prefix_AnimateHeadAddons"))); - } - - /* todo: replace jank prefix with this - public static void Prefix_DrawAddonsFinalHook(ref Pawn pawn, ref AlienPartGenerator.BodyAddon addon, ref Rot4 rot, ref Graphic graphic, ref Vector3 offsetVector, ref float angle, ref Material mat) - { - CompBodyAnimator animator = pawn.TryGetComp(); - - if (animator == null || !animator.isAnimating) - { - return; - } - - if(addon.alignWithHead || addon.drawnInBed) - { - rot = animator.headFacing; - angle = animator.headAngle; - offsetVector += animator.deltaPos + animator.bodyAngle * animator.headBob; - - } - else - { - rot = animator.bodyFacing; - angle = animator.bodyAngle; - offsetVector += animator.deltaPos; - } - - } - */ - public static bool Prefix_AnimateHeadAddons(PawnRenderFlags renderFlags, Vector3 vector, Vector3 headOffset, Pawn pawn, Quaternion quat, Rot4 rotation) - { - - if (renderFlags.FlagSet(PawnRenderFlags.Portrait) || !CompBodyAnimator.IsAnimating(pawn)) return true; - if (!(pawn.def is ThingDef_AlienRace alienProps) || renderFlags.FlagSet(PawnRenderFlags.Invisible)) return false; - - List addons = alienProps.alienRace.generalSettings.alienPartGenerator.bodyAddons; - AlienPartGenerator.AlienComp comp = pawn.GetComp(); - CompBodyAnimator pawnAnimator = pawn.TryGetComp(); - - bool flag = renderFlags.FlagSet(PawnRenderFlags.Portrait); - bool flag2 = renderFlags.FlagSet(PawnRenderFlags.Invisible); - - for (int i = 0; i < addons.Count; i++) - { - AlienPartGenerator.BodyAddon ba = addons[index: i]; - - if (!ba.CanDrawAddon(pawn: pawn)) continue; - - bool forceDrawForBody = false; - if (alienProps.defName.Contains("Orassan") && ba.path.ToLower().Contains("tail")) - { - forceDrawForBody = true; - } - AlienPartGenerator.RotationOffset offset = ba.defaultOffsets.GetOffset((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing); - Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero; - AlienPartGenerator.RotationOffset offset2 = ba.offsets.GetOffset((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing); - Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, pawn.story.headType) : Vector3.zero); - vector2.y = (ba.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y)); - float num = ba.angle; - if (((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing) == Rot4.North) - { - if (ba.layerInvert) - { - vector2.y = 0f - vector2.y; - } - num = 0f; - } - if (((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead ? pawnAnimator.headFacing : pawnAnimator.bodyFacing) == Rot4.East) - { - num = 0f - num; - vector2.x = 0f - vector2.x; - } - Graphic addonGraphic = comp.addonGraphics[i]; - - addonGraphic.drawSize = ((flag && ba.drawSizePortrait != Vector2.zero) ? ba.drawSizePortrait : ba.drawSize) * (ba.scaleWithPawnDrawsize ? (ba.alignWithHead ? ((flag ? comp.customPortraitHeadDrawSize : comp.customHeadDrawSize) * (ModsConfig.BiotechActive ? (pawn.ageTracker.CurLifeStage.headSizeFactor ?? 1.5f) : 1.5f)) : ((flag ? comp.customPortraitDrawSize : comp.customDrawSize) * (ModsConfig.BiotechActive ? pawn.ageTracker.CurLifeStage.bodySizeFactor : 1f) * 1.5f)) : (Vector2.one * 1.5f)); - - if ((ba.drawnInBed && !forceDrawForBody) || ba.alignWithHead) - { - - Quaternion addonRotation = Quaternion.AngleAxis(pawnAnimator.headAngle < 0 ? 360 - (360 % pawnAnimator.headAngle) : pawnAnimator.headAngle, Vector3.up); - - GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: pawnAnimator.headFacing), loc: vector + (ba.alignWithHead ? headOffset : headOffset - addonRotation * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.headFacing)) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f), - quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: pawnAnimator.headFacing), renderFlags.FlagSet(PawnRenderFlags.DrawNow)); - - - } - - else - { - Quaternion addonRotation; - if (AnimationSettings.controlGenitalRotation && ba.path.ToLower().Contains("penis")) - { - addonRotation = Quaternion.AngleAxis(pawnAnimator.genitalAngle, Vector3.up); - } - else - { - addonRotation = Quaternion.AngleAxis(pawnAnimator.bodyAngle, Vector3.up); - } - - if (AnimationSettings.controlGenitalRotation && pawnAnimator.controlGenitalAngle && ba?.hediffGraphics != null && ba.hediffGraphics.Count != 0 && ba.hediffGraphics[0]?.path != null && (ba.hediffGraphics[0].path.Contains("Penis") || ba.hediffGraphics[0].path.Contains("penis"))) - { - GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: rotation), loc: vector + (ba.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f), - quat: Quaternion.AngleAxis(angle: pawnAnimator.genitalAngle, axis: Vector3.up), mat: addonGraphic.MatAt(rot: rotation), renderFlags.FlagSet(PawnRenderFlags.DrawNow)); - } - - else - { - GenDraw.DrawMeshNowOrLater(mesh: addonGraphic.MeshAt(rot: rotation), loc: vector + (ba.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(angle: Mathf.Acos(f: Quaternion.Dot(a: Quaternion.identity, b: addonRotation)) * 2f * 57.29578f), - quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * addonRotation, mat: addonGraphic.MatAt(rot: rotation), renderFlags.FlagSet(PawnRenderFlags.DrawNow)); - } - - } - - - } - - return false; - } - } - - - - /* - - [HarmonyPatch(typeof(AlienRace.HarmonyPatches), "DrawAddons")] - public static class HarmonyPatch_AlienRace { - - public static void RenderHeadAddonInAnimation(Mesh mesh, Vector3 loc, Quaternion quat, Material mat, bool drawNow, Graphic graphic, AlienPartGenerator.BodyAddon bodyAddon, Vector3 v, Vector3 headOffset, Pawn pawn, PawnRenderFlags renderFlags, Vector3 vector, Rot4 rotation) - { - - CompBodyAnimator pawnAnimator = pawn.TryGetComp(); - AlienPartGenerator.AlienComp comp = pawn.GetComp(); - - if (pawnAnimator != null && pawnAnimator.isAnimating) - { - - if((bodyAddon.drawnInBed || bodyAddon.alignWithHead)) - { - - AlienPartGenerator.RotationOffset offset = bodyAddon.defaultOffsets.GetOffset(rotation); - Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero; - AlienPartGenerator.RotationOffset offset2 = bodyAddon.offsets.GetOffset(rotation); - Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero); - vector2.y = (bodyAddon.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y)); - float num = bodyAddon.angle; - if (rotation == Rot4.North) - { - if (bodyAddon.layerInvert) - { - vector2.y = -vector2.y; - } - num = 0f; - } - if (rotation == Rot4.East) - { - num = -num; - vector2.x = -vector2.x; - } - - vector = vector + Quaternion.AngleAxis(pawnAnimator.bodyAngle, Vector3.up) * pawn.Drawer.renderer.BaseHeadOffsetAt(pawnAnimator.bodyFacing) - pawnAnimator.getPawnHeadOffset(); //convert vector into pseudo body pos for head - quat = Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up); - loc = vector + (bodyAddon.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(Mathf.Acos(Quaternion.Dot(Quaternion.identity, quat)) * 2f * 57.29578f); - mat = graphic.MatAt(rot: pawnAnimator.headFacing); - } - else - { - - AlienPartGenerator.RotationOffset offset = bodyAddon.defaultOffsets.GetOffset(rotation); - Vector3 a = (offset != null) ? offset.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero; - AlienPartGenerator.RotationOffset offset2 = bodyAddon.offsets.GetOffset(rotation); - Vector3 vector2 = a + ((offset2 != null) ? offset2.GetOffset(renderFlags.FlagSet(PawnRenderFlags.Portrait), pawn.story.bodyType, comp.crownType) : Vector3.zero); - vector2.y = (bodyAddon.inFrontOfBody ? (0.3f + vector2.y) : (-0.3f - vector2.y)); - float num = bodyAddon.angle; - if (rotation == Rot4.North) - { - if (bodyAddon.layerInvert) - { - vector2.y = -vector2.y; - } - num = 0f; - } - if (rotation == Rot4.East) - { - num = -num; - vector2.x = -vector2.x; - } - quat = Quaternion.AngleAxis(pawnAnimator.bodyAngle, Vector3.up); - loc = vector + (bodyAddon.alignWithHead ? headOffset : Vector3.zero) + vector2.RotatedBy(Mathf.Acos(Quaternion.Dot(Quaternion.identity, quat)) * 2f * 57.29578f); - - } - - } - GenDraw.DrawMeshNowOrLater(mesh, loc, quat, mat, drawNow); - - /* - if (pawnAnimator != null && !renderFlags.FlagSet(PawnRenderFlags.Portrait) && pawnAnimator.isAnimating && (bodyAddon.drawnInBed || bodyAddon.alignWithHead)) - { - - - if ((pawn.def as ThingDef_AlienRace).defName == "Alien_Orassan") - { - orassan = true; - - if(bodyAddon.path.Contains("closed")) - { - return; - } - - if (bodyAddon.bodyPart.Contains("ear")) - - { - orassan = true; - - orassanv = new Vector3(0, 0, 0.23f); - if (pawnAnimator.headFacing == Rot4.North) - { - orassanv.z -= 0.1f; - orassanv.y += 1f; - - if(bodyAddon.bodyPart.Contains("left")) - { - orassanv.x += 0.03f; - } else - { - orassanv.x -= 0.03f; - } - - } - else if (pawnAnimator.headFacing == Rot4.East) - { - orassanv.x -= 0.1f; - } - else if (pawnAnimator.headFacing == Rot4.West) - { - orassanv.x = 0.1f; - } - else - { - orassanv.z -= 0.1f; - orassanv.y += 1f; - - if (bodyAddon.bodyPart.Contains("right")) - { - orassanv.x += 0.05f; - } - else - { - orassanv.x -= 0.05f; - } - } - orassanv = orassanv.RotatedBy(pawnAnimator.headAngle); - } - } - - - - - - GenDraw.DrawMeshNowOrLater(mesh: graphic.MeshAt(rot: headRotInAnimation), loc: loc + orassanv + (bodyAddon.alignWithHead ? headOffset : Vector3.zero),// + v.RotatedBy(Mathf.Acos(Quaternion.Dot(Quaternion.identity, quat)) * 2f * 57.29578f), - quat: Quaternion.AngleAxis(angle: num, axis: Vector3.up) * headQuatInAnimation, mat: graphic.MatAt(rot: pawnAnimator.headFacing), drawNow: drawNow);; - } - - else - { - - } - - - } - - - public static IEnumerable Transpiler(IEnumerable instructions) - { - List ins = instructions.ToList(); - for (int i = 0; i < ins.Count; i++) - { - - Type[] type = new Type[] { typeof(Mesh), typeof(Vector3), typeof(Quaternion), typeof(Material), typeof(bool) }; - - - if (ins[i].OperandIs(AccessTools.Method(typeof(GenDraw), "DrawMeshNowOrLater", type))) - { - - yield return new CodeInstruction(OpCodes.Ldloc, (object)7); //graphic - yield return new CodeInstruction(OpCodes.Ldloc, (object)4); //bodyAddon - yield return new CodeInstruction(OpCodes.Ldloc, (object)5); //offsetVector/AddonOffset (v) - yield return new CodeInstruction(OpCodes.Ldarg, (object)2); //headOffset - yield return new CodeInstruction(OpCodes.Ldarg, (object)3); //pawn - yield return new CodeInstruction(OpCodes.Ldarg, (object)0); //renderflags - yield return new CodeInstruction(OpCodes.Ldarg, (object)1); //vector - yield return new CodeInstruction(OpCodes.Ldarg, (object)5); //rotation - - yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(HarmonyPatch_AlienRace), "RenderHeadAddonInAnimation")); - - } - - else - { - yield return ins[i]; - } - } - } - - public static bool Prefix(PawnRenderFlags renderFlags, ref Vector3 vector, ref Vector3 headOffset, Pawn pawn, ref Quaternion quat, ref Rot4 rotation) - { - if(pawn == null) - { - return true; - } - - CompBodyAnimator anim = pawn.TryGetComp(); - - if(anim == null) - { - return true; - } - - if (anim != null && !renderFlags.FlagSet(PawnRenderFlags.Portrait) && anim.isAnimating) - { - //quat = Quaternion.AngleAxis(anim.bodyAngle, Vector3.up); - } - - return true; - - } - } - - - */ - -} - - diff --git a/Rimworld-Animations.csproj b/Rimworld-Animations.csproj index 2317000..b6b9d15 100644 --- a/Rimworld-Animations.csproj +++ b/Rimworld-Animations.csproj @@ -119,6 +119,7 @@ + @@ -166,7 +167,6 @@ -