Skip to content

Commit

Permalink
When Mario transitions from an action WITH an animation to one WITHOU…
Browse files Browse the repository at this point in the history 
…T an animation, he'll now animate for one extra tick just to smooth the transition.
  • Loading branch information
@floral-qua-floral
floral-qua-floral committed Jan 14, 2025
1 parent 2c84a54 commit 6577fc2
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 71 deletions.
1 change: 1 addition & 0 deletions mod/src/client/java/com/fqf/mario_qua_mario/mariodata/MarioAnimationData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public class MarioAnimationData {
public boolean animatedLastFrame;
public int animationTicks;
public boolean animationMirrored;
public boolean trailingFrame;

public static float lerpRadians(float delta, float start, float end) {
return MathHelper.RADIANS_PER_DEGREE * MathHelper.lerpAngleDegrees(delta, MathHelper.DEGREES_PER_RADIAN * start, MathHelper.DEGREES_PER_RADIAN * end);
Expand Down
193 changes: 122 additions & 71 deletions mod/src/client/java/com/fqf/mario_qua_mario/mixin/client/PlayerEntityModelMixin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,21 @@ private void undoPreviousFrameAnimations(T livingEntity, float f, float g, float
AbstractClientPlayerEntity mario = (AbstractClientPlayerEntity) livingEntity;
MarioPlayerData data = mario.mqm$getMarioData();
MarioAnimationData animData = mario.mqm$getAnimationData();
if(!data.isEnabled() || !animData.animatedLastFrame) return;

animData.animatedLastFrame = false;
if(data.resetAnimation) {
setupArrangement(this.head, animData.prevTickArrangements.HEAD);
setupArrangement(this.body, animData.prevTickArrangements.BODY);
setupArrangement(this.rightArm, animData.prevTickArrangements.RIGHT_ARM);
setupArrangement(this.leftArm, animData.prevTickArrangements.LEFT_ARM);
setupArrangement(this.rightLeg, animData.prevTickArrangements.RIGHT_LEG);
setupArrangement(this.leftLeg, animData.prevTickArrangements.LEFT_LEG);
setupArrangement(this.cloak, animData.prevTickArrangements.CAPE);
if(!data.isEnabled()) return;

if(animData.animatedLastFrame) {
animData.animatedLastFrame = false;
if (data.resetAnimation) {
setupArrangement(this.head, animData.prevTickArrangements.HEAD);
setupArrangement(this.body, animData.prevTickArrangements.BODY);
setupArrangement(this.rightArm, animData.prevTickArrangements.RIGHT_ARM);
setupArrangement(this.leftArm, animData.prevTickArrangements.LEFT_ARM);
setupArrangement(this.rightLeg, animData.prevTickArrangements.RIGHT_LEG);
setupArrangement(this.leftLeg, animData.prevTickArrangements.LEFT_LEG);
setupArrangement(this.cloak, animData.prevTickArrangements.CAPE);
}
this.undoLastFrame(animData, -1);
}
this.undoLastFrame(animData, -1);
}

@Inject(method = "setAngles(Lnet/minecraft/entity/LivingEntity;FFFFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/model/BipedEntityModel;setAngles(Lnet/minecraft/entity/LivingEntity;FFFFF)V", shift = At.Shift.AFTER))
Expand All @@ -72,75 +74,124 @@ private void setAnglesHook(T livingEntity, float f, float g, float h, float i, f
MarioAnimationData animData = mario.mqm$getAnimationData();
PlayermodelAnimation animation = data.getAction().ANIMATION;

if(!data.isEnabled() || animation == null) return;

if(data.tickAnimation) {
data.tickAnimation = false;

animData.prevTickArrangements = animData.thisTickArrangements;
animData.thisTickArrangements = new ArrangementSet();
if(!data.isEnabled()) return;

if(animation == null) {
boolean apply = false;
if(data.resetAnimation) {
data.resetAnimation = false;
animData.prevTickArrangements.EVERYTHING.setPos(0, 0, 0);
animData.prevTickArrangements.EVERYTHING.setAngles(0, 0, 0);
// this.undoLastFrame(animData, 1);
// this.undoLastFrame(animData, -1);
animData.animationTicks = 0;

animData.animationMirrored = animation.mirroringEvaluator() != null &&
animation.mirroringEvaluator().shouldMirror(data,
isArmBusy(this.rightArmPose, this.leftArmPose), isArmBusy(this.leftArmPose, this.rightArmPose),
this.head.yaw - this.body.yaw);
animData.trailingFrame = data.prevAnimation != null;

data.tickAnimation = false;
if(animData.trailingFrame) {
animData.thisTickArrangements.EVERYTHING.setPos(0, 0,0 );
animData.thisTickArrangements.EVERYTHING.setAngles(0, 0,0 );
animData.prevTickArrangements.EVERYTHING.setPos(
animData.prevFrameAnimationDeltas.EVERYTHING.x,
animData.prevFrameAnimationDeltas.EVERYTHING.y,
animData.prevFrameAnimationDeltas.EVERYTHING.z
);
animData.prevTickArrangements.EVERYTHING.setAngles(
animData.prevFrameAnimationDeltas.EVERYTHING.pitch,
animData.prevFrameAnimationDeltas.EVERYTHING.yaw,
animData.prevFrameAnimationDeltas.EVERYTHING.roll
);
}
}

float progress = animation.progressCalculator().calculateProgress(data, animData.animationTicks);
animData.animationTicks++;

boolean isMirrored = animData.animationMirrored;

if(animation.entireBodyAnimation() != null) {
animData.thisTickArrangements.EVERYTHING.setPos(0, 0, 0);
animData.thisTickArrangements.EVERYTHING.setAngles(0, 0, 0);
applyMutator(data, animData.thisTickArrangements.EVERYTHING, animation.entireBodyAnimation().mutator(), progress, isMirrored);
if(animData.trailingFrame) {
if(data.tickAnimation) {
animData.trailingFrame = false;
return;
}
else {
// This has to occur every frame to ensure that the lerp will catch up with the limbs' current position
setupArrangement(this.head, animData.thisTickArrangements.HEAD);
setupArrangement(this.body, animData.thisTickArrangements.BODY);
setupArrangement(this.rightArm, animData.thisTickArrangements.RIGHT_ARM);
setupArrangement(this.leftArm, animData.thisTickArrangements.LEFT_ARM);
setupArrangement(this.rightLeg, animData.thisTickArrangements.RIGHT_LEG);
setupArrangement(this.leftLeg, animData.thisTickArrangements.LEFT_LEG);
setupArrangement(this.cloak, animData.thisTickArrangements.CAPE);
}
}
else return;
}
else {
if (data.tickAnimation) {
data.tickAnimation = false;

animData.prevTickArrangements = animData.thisTickArrangements;
animData.thisTickArrangements = new ArrangementSet();

if (data.resetAnimation) {
data.resetAnimation = false;
animData.prevTickArrangements.EVERYTHING.setPos(0, 0, 0);
animData.prevTickArrangements.EVERYTHING.setAngles(0, 0, 0);
animData.animationTicks = 0;
if (data.prevAnimation == null) {
setupArrangement(this.head, animData.prevTickArrangements.HEAD);
setupArrangement(this.body, animData.prevTickArrangements.BODY);
setupArrangement(this.rightArm, animData.prevTickArrangements.RIGHT_ARM);
setupArrangement(this.leftArm, animData.prevTickArrangements.LEFT_ARM);
setupArrangement(this.rightLeg, animData.prevTickArrangements.RIGHT_LEG);
setupArrangement(this.leftLeg, animData.prevTickArrangements.LEFT_LEG);
setupArrangement(this.cloak, animData.prevTickArrangements.CAPE);
}

animData.animationMirrored = animation.mirroringEvaluator() != null &&
animation.mirroringEvaluator().shouldMirror(data,
isArmBusy(this.rightArmPose, this.leftArmPose), isArmBusy(this.leftArmPose, this.rightArmPose),
this.head.yaw - this.body.yaw);
}

float progress = animation.progressCalculator().calculateProgress(data, animData.animationTicks);
animData.animationTicks++;

boolean isMirrored = animData.animationMirrored;

if (animation.entireBodyAnimation() != null) {
animData.thisTickArrangements.EVERYTHING.setPos(0, 0, 0);
animData.thisTickArrangements.EVERYTHING.setAngles(0, 0, 0);
applyMutator(data, animData.thisTickArrangements.EVERYTHING, animation.entireBodyAnimation().mutator(), progress, isMirrored);
}

animatePart(data, this.head, animData.thisTickArrangements.HEAD, animation.headAnimation(), progress, isMirrored);
animatePart(data, this.body, animData.thisTickArrangements.BODY, animation.torsoAnimation(), progress, isMirrored);

intelligentlyAnimateArm(
data, animData,
this.rightArm,
animData.thisTickArrangements.RIGHT_ARM,
isMirrored ? animation.leftArmAnimation() : animation.rightArmAnimation(),
progress, isMirrored, true
);
intelligentlyAnimateArm(
data, animData,
this.leftArm,
animData.thisTickArrangements.LEFT_ARM,
isMirrored ? animation.rightArmAnimation() : animation.leftArmAnimation(),
progress, isMirrored, false);

animatePart(
data,
this.rightLeg,
animData.thisTickArrangements.RIGHT_LEG,
isMirrored ? animation.leftLegAnimation() : animation.rightLegAnimation(),
progress, isMirrored
);
animatePart(
data,
this.leftLeg,
animData.thisTickArrangements.LEFT_LEG,
isMirrored ? animation.rightLegAnimation() : animation.leftLegAnimation(),
progress, isMirrored
);
}

animatePart(data, this.head, animData.thisTickArrangements.HEAD, animation.headAnimation(), progress, isMirrored);
animatePart(data, this.body, animData.thisTickArrangements.BODY, animation.torsoAnimation(), progress, isMirrored);

intelligentlyAnimateArm(
data, animData,
this.rightArm,
animData.thisTickArrangements.RIGHT_ARM,
isMirrored ? animation.leftArmAnimation() : animation.rightArmAnimation(),
progress, isMirrored, true
);
intelligentlyAnimateArm(
data, animData,
this.leftArm,
animData.thisTickArrangements.LEFT_ARM,
isMirrored ? animation.rightArmAnimation() : animation.leftArmAnimation(),
progress, isMirrored, false);

animatePart(
data,
this.rightLeg,
animData.thisTickArrangements.RIGHT_LEG,
isMirrored ? animation.leftLegAnimation() : animation.rightLegAnimation(),
progress, isMirrored
);
animatePart(
data,
this.leftLeg,
animData.thisTickArrangements.LEFT_LEG,
isMirrored ? animation.rightLegAnimation() : animation.leftLegAnimation(),
progress, isMirrored
);
}

animData.animatedLastFrame = true;
float tickDelta = MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(true);
// MarioQuaMario.LOGGER.info("TickDelta={}", MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(true));

lerpBetweenArrangements(this.head, animData.prevTickArrangements.HEAD, animData.thisTickArrangements.HEAD, tickDelta, animData.prevFrameAnimationDeltas.HEAD);
lerpBetweenArrangements(this.body, animData.prevTickArrangements.BODY, animData.thisTickArrangements.BODY, tickDelta, animData.prevFrameAnimationDeltas.BODY);
Expand Down
3 changes: 3 additions & 0 deletions mod/src/main/java/com/fqf/mario_qua_mario/mariodata/MarioPlayerData.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.fqf.mario_qua_mario.mariodata;

import com.fqf.mario_qua_mario.MarioQuaMario;
import com.fqf.mario_qua_mario.definitions.states.actions.util.animation.PlayermodelAnimation;
import com.fqf.mario_qua_mario.registries.ParsedMarioState;
import com.fqf.mario_qua_mario.registries.RegistryManager;
import com.fqf.mario_qua_mario.registries.actions.AbstractParsedAction;
Expand Down Expand Up @@ -61,6 +62,7 @@ public void setEnabledInternal(boolean enabled) {

private AbstractParsedAction action;
public boolean resetAnimation;
public PlayermodelAnimation prevAnimation;
public boolean tickAnimation = true;
public AbstractParsedAction getAction() {
return this.action;
Expand All @@ -77,6 +79,7 @@ public boolean setAction(@Nullable AbstractParsedAction fromAction, AbstractPars
}
public void setActionTransitionless(AbstractParsedAction action) {
this.resetAnimation = true;
this.prevAnimation = this.action.ANIMATION;
this.setupCustomVars(this.action, action);
this.action = action;
}
Expand Down

0 comments on commit 6577fc2

Please sign in to comment.