AblativeAbsolute/rimworld-animations
1
0
Fork 0
mirror of https://gitgud.io/c0ffeeeeeeee/rimworld-animations.git synced 2024-08-15 00:43:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

portrait fixes

Browse source
This commit is contained in:
c0ffee 2021-07-23 15:26:38 -07:00
parent 6ee3bce484
commit f8b68b644d
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
1.3/Assemblies/Rimworld-Animations.dll
View file

Binary file not shown.

13
Source/Patches/HarmonyPatch_AlienRace.cs
View file

@ -16,11 +16,11 @@ namespace Rimworld_Animations {
public static void RenderHeadAddonInAnimation(Mesh mesh, Vector3 loc, Quaternion quat, Material mat, bool drawNow, Graphic graphic, AlienPartGenerator.BodyAddon bodyAddon, Vector3 v, float num, Vector3 headOffset, Pawn pawn) public static void RenderHeadAddonInAnimation(Mesh mesh, Vector3 loc, Quaternion quat, Material mat, bool drawNow, Graphic graphic, AlienPartGenerator.BodyAddon bodyAddon, Vector3 v, float num, Vector3 headOffset, Pawn pawn, PawnRenderFlags renderFlags)
{ {
CompBodyAnimator pawnAnimator = pawn.TryGetComp<CompBodyAnimator>(); CompBodyAnimator pawnAnimator = pawn.TryGetComp<CompBodyAnimator>();
if (pawnAnimator.isAnimating && (bodyAddon.drawnInBed || bodyAddon.alignWithHead)) if (!renderFlags.FlagSet(PawnRenderFlags.Portrait) && pawnAnimator.isAnimating && (bodyAddon.drawnInBed || bodyAddon.alignWithHead))
{ {
Quaternion headQuatInAnimation = Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up); Quaternion headQuatInAnimation = Quaternion.AngleAxis(pawnAnimator.headAngle, Vector3.up);
@ -39,6 +39,7 @@ namespace Rimworld_Animations {
GenDraw.DrawMeshNowOrLater(mesh, loc, quat, mat, drawNow); GenDraw.DrawMeshNowOrLater(mesh, loc, quat, mat, drawNow);
} }
} }
/*
public static Rot4 AdjustRotationValueForHeadAddon(Rot4 rotation, AlienPartGenerator.BodyAddon bodyAddon, Pawn pawn) public static Rot4 AdjustRotationValueForHeadAddon(Rot4 rotation, AlienPartGenerator.BodyAddon bodyAddon, Pawn pawn)
{ {
CompBodyAnimator anim = pawn.TryGetComp<CompBodyAnimator>(); CompBodyAnimator anim = pawn.TryGetComp<CompBodyAnimator>();
@ -53,7 +54,7 @@ namespace Rimworld_Animations {
} }
} }*/
public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions) public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions)
@ -74,10 +75,12 @@ namespace Rimworld_Animations {
yield return new CodeInstruction(OpCodes.Ldloc, (object)6); //num yield return new CodeInstruction(OpCodes.Ldloc, (object)6); //num
yield return new CodeInstruction(OpCodes.Ldarg, (object)2); //headOffset 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)3); //pawn
yield return new CodeInstruction(OpCodes.Ldarg, (object)0); //renderflags
yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(HarmonyPatch_AlienRace), "RenderHeadAddonInAnimation")); yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(HarmonyPatch_AlienRace), "RenderHeadAddonInAnimation"));
} }
/*
else if(ins[i].opcode == OpCodes.Ldarg_S && ins[i].OperandIs((object)5)) //rotation else if(ins[i].opcode == OpCodes.Ldarg_S && ins[i].OperandIs((object)5)) //rotation
{ {
yield return ins[i]; yield return ins[i];
@ -85,7 +88,7 @@ namespace Rimworld_Animations {
yield return new CodeInstruction(OpCodes.Ldarg, (object)3); //pawn yield return new CodeInstruction(OpCodes.Ldarg, (object)3); //pawn
yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(HarmonyPatch_AlienRace), "AdjustRotationValueForHeadAddon")); yield return new CodeInstruction(OpCodes.Call, AccessTools.DeclaredMethod(typeof(HarmonyPatch_AlienRace), "AdjustRotationValueForHeadAddon"));
} }*/
else else
{ {
@ -227,7 +230,7 @@ namespace Rimworld_Animations {
CompBodyAnimator anim = pawn.TryGetComp<CompBodyAnimator>(); CompBodyAnimator anim = pawn.TryGetComp<CompBodyAnimator>();
if (anim.isAnimating) if (!renderFlags.FlagSet(PawnRenderFlags.Portrait) && anim.isAnimating)
{ {
//headOffset = anim.getPawnHeadOffset(); //headOffset = anim.getPawnHeadOffset();
quat = Quaternion.AngleAxis(anim.bodyAngle, Vector3.up); quat = Quaternion.AngleAxis(anim.bodyAngle, Vector3.up);