From bc3802d0bfeec3e8d34a4b4493a3fd04e3943f1a Mon Sep 17 00:00:00 2001 From: fgnm Date: Wed, 5 Jul 2023 21:41:36 +0200 Subject: [PATCH] Update libGDX and gradle --- gradle.properties | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- hyperlap2d-runtime-libgdx | 2 +- .../java/games/rednblack/editor/view/HyperLap2DScreen.java | 5 +++++ .../editor/view/stage/input/SandboxInputAdapter.java | 5 +++++ .../tools/transformStrategy/AbstractTransformStrategy.java | 3 +-- .../editor/view/ui/widget/actors/basic/PixelDashedLine.java | 3 +-- .../editor/view/ui/widget/actors/basic/PixelLine.java | 3 +-- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index b4299b40..84913c52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -gdxVersion = 1.11.0 -lwjgl3Version = 3.3.1 +gdxVersion = 1.12.0 +lwjgl3Version = 3.3.2 artemisVersion = 2.3.0 spineVersion = 4.1.0 visuiVersion = 1.5.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897..070cb702 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hyperlap2d-runtime-libgdx b/hyperlap2d-runtime-libgdx index f8b7ccef..327be045 160000 --- a/hyperlap2d-runtime-libgdx +++ b/hyperlap2d-runtime-libgdx @@ -1 +1 @@ -Subproject commit f8b7ccef879bbce410d58f43ec746dc7e4fe04e6 +Subproject commit 327be0455dd2f8f193d04f3ade7f6cf1ff19f67f diff --git a/src/main/java/games/rednblack/editor/view/HyperLap2DScreen.java b/src/main/java/games/rednblack/editor/view/HyperLap2DScreen.java index baa63c53..555f380a 100644 --- a/src/main/java/games/rednblack/editor/view/HyperLap2DScreen.java +++ b/src/main/java/games/rednblack/editor/view/HyperLap2DScreen.java @@ -270,6 +270,11 @@ public class HyperLap2DScreen implements Screen, InputProcessor { return false; } + @Override + public boolean touchCancelled(int screenX, int screenY, int pointer, int button) { + return false; + } + @Override public boolean touchDragged(int screenX, int screenY, int pointer) { return false; diff --git a/src/main/java/games/rednblack/editor/view/stage/input/SandboxInputAdapter.java b/src/main/java/games/rednblack/editor/view/stage/input/SandboxInputAdapter.java index 458a1b71..927a8531 100644 --- a/src/main/java/games/rednblack/editor/view/stage/input/SandboxInputAdapter.java +++ b/src/main/java/games/rednblack/editor/view/stage/input/SandboxInputAdapter.java @@ -148,6 +148,11 @@ public class SandboxInputAdapter implements InputProcessor { return true; } + @Override + public boolean touchCancelled(int screenX, int screenY, int pointer, int button) { + return false; + } + @Override public boolean touchDragged(int screenX, int screenY, int pointer) { rootEntity = sandbox.getCurrentViewingEntity(); diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/AbstractTransformStrategy.java b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/AbstractTransformStrategy.java index a0ef8330..7199197a 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/AbstractTransformStrategy.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/transformStrategy/AbstractTransformStrategy.java @@ -3,7 +3,6 @@ package games.rednblack.editor.view.stage.tools.transformStrategy; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.math.Vector2; import games.rednblack.editor.renderer.components.TransformComponent; -import games.rednblack.editor.renderer.utils.MathUtilsFix; import games.rednblack.editor.utils.RoundUtils; import games.rednblack.editor.view.ui.followers.NormalSelectionFollower; import games.rednblack.h2d.common.command.TransformCommandBuilder; @@ -23,7 +22,7 @@ public abstract class AbstractTransformStrategy implements ITransformStrategy { * @return array of three floats (new float[]{width/height, xComponent, yComponent};) */ float[] calculateSizeAndXyAmount(float mouseDeltaX, float mouseDeltaY, float rotation, float[] result) { - float mouseDragAngle = MathUtilsFix.atan2(mouseDeltaY, mouseDeltaX) * MathUtils.radDeg; + float mouseDragAngle = MathUtils.atan2(mouseDeltaY, mouseDeltaX) * MathUtils.radDeg; float deltaA = rotation - mouseDragAngle; float c = (float) Math.sqrt(mouseDeltaX * mouseDeltaX + mouseDeltaY * mouseDeltaY); float a = c * MathUtils.cosDeg(deltaA); diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/actors/basic/PixelDashedLine.java b/src/main/java/games/rednblack/editor/view/ui/widget/actors/basic/PixelDashedLine.java index ecc34e57..3b03e350 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/actors/basic/PixelDashedLine.java +++ b/src/main/java/games/rednblack/editor/view/ui/widget/actors/basic/PixelDashedLine.java @@ -5,7 +5,6 @@ import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.utils.TimeUtils; -import games.rednblack.editor.renderer.utils.MathUtilsFix; import space.earlygrey.shapedrawer.ShapeDrawer; /** @@ -103,7 +102,7 @@ public class PixelDashedLine extends Actor { } private float getAngle(float x, float y, float toX, float toY) { - float angle = MathUtils.radiansToDegrees * (MathUtilsFix.atan2(toX - x, toY - y)); + float angle = MathUtils.radiansToDegrees * (MathUtils.atan2(toX - x, toY - y)); if (angle < 0) { angle += 360; diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/actors/basic/PixelLine.java b/src/main/java/games/rednblack/editor/view/ui/widget/actors/basic/PixelLine.java index 8fa9ace9..eb82d47e 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/actors/basic/PixelLine.java +++ b/src/main/java/games/rednblack/editor/view/ui/widget/actors/basic/PixelLine.java @@ -21,7 +21,6 @@ package games.rednblack.editor.view.ui.widget.actors.basic; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.MathUtils; import com.badlogic.gdx.scenes.scene2d.ui.Image; -import games.rednblack.editor.renderer.utils.MathUtilsFix; public class PixelLine extends Image { @@ -56,7 +55,7 @@ public class PixelLine extends Image { } private float getAngle(float x, float y, float toX, float toY) { - float angle = MathUtils.radiansToDegrees * (MathUtilsFix.atan2(toX - x, toY - y)); + float angle = MathUtils.radiansToDegrees * (MathUtils.atan2(toX - x, toY - y)); if(angle < 0){ angle += 360;