Skip to content

Use JOMl again #88

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

Draft
ZigyTheBird wants to merge 1 commit into
base: more_parents
Choose a base branch
from
Draft

Use JOMl again #88

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
1 change: 1 addition & 0 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies {
implementation api("org.slf4j:slf4j-api:2.0.17")
implementation api("it.unimi.dsi:fastutil:8.5.18")
implementation api("io.netty:netty-buffer:4.2.7.Final")
implementation api("org.joml:joml:1.10.8")

// Testing
testImplementation("org.junit.jupiter:junit-jupiter-api:6.0.1")
Expand Down
42 changes: 21 additions & 21 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
@@ -1,9 +1,9 @@
package com.zigythebird.playeranimcore.easing;

import com.zigythebird.playeranimcore.animation.keyframe.AnimationPoint;
import com.zigythebird.playeranimcore.math.ModVector2d;
import it.unimi.dsi.fastutil.floats.Float2FloatFunction;
import org.jetbrains.annotations.Nullable;
import org.joml.Vector2f;
import team.unnamed.mocha.MochaEngine;
import team.unnamed.mocha.parser.ast.Expression;
import team.unnamed.mocha.runtime.standard.MochaMath;
Expand Down Expand Up @@ -44,25 +44,25 @@ public float apply(MochaEngine<?> env, AnimationPoint animationPoint, @Nullable
float time_handle_after = Math.clamp(leftTime, -gapTime, 0);

CubicBezierCurve curve = new CubicBezierCurve(
new ModVector2d(0, animationPoint.animationStartValue()),
new ModVector2d(time_handle_before, animationPoint.animationStartValue() + rightValue),
new ModVector2d(time_handle_after + gapTime, animationPoint.animationEndValue() + leftValue),
new ModVector2d(gapTime, animationPoint.animationEndValue()));
new Vector2f(0, animationPoint.animationStartValue()),
new Vector2f(time_handle_before, animationPoint.animationStartValue() + rightValue),
new Vector2f(time_handle_after + gapTime, animationPoint.animationEndValue() + leftValue),
new Vector2f(gapTime, animationPoint.animationEndValue()));
float time = gapTime * lerpValue;

List<ModVector2d> points = curve.getPoints(200);
ModVector2d closest = new ModVector2d();
List<Vector2f> points = curve.getPoints(200);
Vector2f closest = new Vector2f();
float closest_diff = Float.POSITIVE_INFINITY;
for (ModVector2d point : points) {
for (Vector2f point : points) {
float diff = Math.abs(point.x - time);
if (diff < closest_diff) {
closest_diff = diff;
closest.set(point);
}
}
ModVector2d second_closest = new ModVector2d();
Vector2f second_closest = new Vector2f();
closest_diff = Float.POSITIVE_INFINITY;
for (ModVector2d point : points) {
for (Vector2f point : points) {
if (point == closest) continue;
float diff = Math.abs(point.x - time);
if (diff < closest_diff) {
Expand Down Expand Up @@ -90,25 +90,25 @@ boolean isEasingBefore() {
}

class CubicBezierCurve {
private ModVector2d v0;
private ModVector2d v1;
private ModVector2d v2;
private ModVector2d v3;
private Vector2f v0;
private Vector2f v1;
private Vector2f v2;
private Vector2f v3;

public CubicBezierCurve(ModVector2d v0, ModVector2d v1, ModVector2d v2, ModVector2d v3) {
public CubicBezierCurve(Vector2f v0, Vector2f v1, Vector2f v2, Vector2f v3) {
this.v0 = v0;
this.v1 = v1;
this.v2 = v2;
this.v3 = v3;
}

public ModVector2d getPoint(float t) {
return getPoint(t, new ModVector2d());
public Vector2f getPoint(float t) {
return getPoint(t, new Vector2f());
}

public ModVector2d getPoint(float t, ModVector2d target) {
public Vector2f getPoint(float t, Vector2f target) {
if (target == null) {
target = new ModVector2d();
target = new Vector2f();
}

float u = 1 - t;
Expand All @@ -123,8 +123,8 @@ public ModVector2d getPoint(float t, ModVector2d target) {
return target;
}

public List<ModVector2d> getPoints(int divisions) {
List<ModVector2d> points = new ArrayList<>();
public List<Vector2f> getPoints(int divisions) {
List<Vector2f> points = new ArrayList<>();

for (int i = 0; i <= divisions; i++) {
points.add(getPoint((float) i / divisions));
Expand Down
Loading