Skip to content

Bezier fixes #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZigyTheBird wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bezier fixes #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions core/src/main/java/com/zigythebird/playeranimcore/easing/BezierEasing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,19 @@ public float apply(MochaEngine<?> env, AnimationPoint animationPoint, @Nullable
if (easingArgs.isEmpty())
return MochaMath.lerp(animationPoint.animationStartValue(), animationPoint.animationEndValue(), buildTransformer(easingValue).apply(lerpValue));

float rightValue = isEasingBefore() ? 0 : env.eval(easingArgs.getFirst());
float rightTime = isEasingBefore() ? 0.1f : env.eval(easingArgs.get(1));
float rightValue;
float rightTime;
float leftValue = isEasingBefore() ? env.eval(easingArgs.getFirst()) : 0;
float leftTime = isEasingBefore() ? env.eval(easingArgs.get(1)) : -0.1f;

if (easingArgs.size() > 3) {
rightValue = env.eval(easingArgs.get(2));
rightTime = env.eval(easingArgs.get(3));
}

leftValue = (float) Math.toRadians(leftValue);
rightValue = (float) Math.toRadians(rightValue);
else {
rightValue = isEasingBefore() ? 0 : env.eval(easingArgs.getFirst());
rightTime = isEasingBefore() ? 0.1f : env.eval(easingArgs.get(1));
}

float gapTime = animationPoint.transitionLength()/20;

Expand Down
19 changes: 17 additions & 2 deletions core/src/main/java/com/zigythebird/playeranimcore/loading/AnimationLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@
import team.unnamed.mocha.parser.ast.Expression;
import team.unnamed.mocha.parser.ast.FloatExpression;
import team.unnamed.mocha.parser.ast.IdentifierExpression;
import team.unnamed.mocha.runtime.IsConstantExpression;

import java.lang.reflect.Type;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import static com.zigythebird.playeranimcore.molang.MolangLoader.MOCHA_ENGINE;

public class AnimationLoader implements JsonDeserializer<Animation> {
@Override
public Animation deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
Expand Down Expand Up @@ -274,7 +277,7 @@ private static KeyframeStack buildKeyframeStack(List<FloatObjectPair<JsonElement
prevEntry = entry;
}

return new KeyframeStack(addArgsForKeyframes(xFrames), addArgsForKeyframes(yFrames), addArgsForKeyframes(zFrames));
return new KeyframeStack(addArgsForKeyframes(xFrames, type), addArgsForKeyframes(yFrames, type), addArgsForKeyframes(zFrames, type));
}

private static EasingType getEasingForAxis(JsonObject entryObj, Axis axis, EasingType easingType) {
Expand All @@ -291,7 +294,7 @@ private static List<List<Expression>> getEasingArgsForAxis(JsonObject entryObj,
easingArg;
}

private static List<Keyframe> addArgsForKeyframes(List<Keyframe> frames) {
private static List<Keyframe> addArgsForKeyframes(List<Keyframe> frames, TransformType type) {
if (frames.getFirst().startValue().getFirst() instanceof AccessExpression accessExpression
&& "disabled".equals(accessExpression.property()) && accessExpression.object() instanceof IdentifierExpression identifierExpression
&& "pal".equals(identifierExpression.name()))
Expand Down Expand Up @@ -319,6 +322,10 @@ private static List<Keyframe> addArgsForKeyframes(List<Keyframe> frames) {
else if (frame.easingType() == EasingType.BEZIER) {
List<Expression> rightValue = frame.easingArgs().get(2);
List<Expression> rightTime = frame.easingArgs().get(3);
if (type == TransformType.ROTATION) {
rightValue = toRadiansForBezier(rightValue);
frame.easingArgs().set(0, toRadiansForBezier(frame.easingArgs().getFirst()));
}
frame.easingArgs().remove(2);
frame.easingArgs().remove(2);
if (frames.size() > i + 1) {
Expand All @@ -335,6 +342,14 @@ else if (frame.easingType() == EasingType.BEZIER) {
return frames;
}

private static List<Expression> toRadiansForBezier(List<Expression> expressions) {
if (expressions.size() == 1 && IsConstantExpression.test(expressions.getFirst())) {
return Collections.singletonList(FloatExpression.of(Math.toRadians(MOCHA_ENGINE.eval(expressions))));
}
PlayerAnimLib.LOGGER.warn("Invalid easing arguments for bezier: {}\nFor rotations bezier args can only be floats.", expressions);
return expressions;
}

public static float calculateAnimationLength(Map<String, BoneAnimation> boneAnimations) {
float length = 0;

Expand Down