From 5a8fa249388f7d313d7bee08296f1a349eeb97a0 Mon Sep 17 00:00:00 2001 From: MiChinao Date: Wed, 11 Nov 2020 10:42:18 +0100 Subject: [PATCH] Update to libGDX 1.9.13-SNAPSHOT --- assets/plugins/plugin-9patch-0.0.3.jar | Bin 22238 -> 22240 bytes build.gradle | 10 +------- gradle.properties | 8 ++++++ hyperlap2d-common-api | 2 +- .../editor/plugin/ninepatch/EditingZone.java | 2 +- .../editor/plugin/ninepatch/MainPanel.java | 4 +-- .../plugin/tiled/tools/DeleteTileTool.java | 2 +- .../plugin/tiled/tools/DrawTileTool.java | 2 +- .../editor/view/HyperLap2DScreen.java | 2 +- .../editor/view/stage/SandboxMediator.java | 23 +++++++----------- .../view/stage/input/EntityClickListener.java | 2 +- .../view/stage/input/InputListener.java | 2 +- .../view/stage/input/SandboxInputAdapter.java | 4 +-- .../editor/view/stage/tools/PanTool.java | 2 +- .../view/stage/tools/SelectionTool.java | 4 +-- src/test/java/Box2dLightTest.java | 4 +-- 16 files changed, 34 insertions(+), 39 deletions(-) create mode 100644 gradle.properties diff --git a/assets/plugins/plugin-9patch-0.0.3.jar b/assets/plugins/plugin-9patch-0.0.3.jar index aeb249ae200ce522aecd0f21e45a98eb1352b8e1..3fac6b36c8233efc6cf30811e2932c158f8ab461 100644 GIT binary patch delta 4547 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 delta 4585 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 VqmY!RO~wLX0oWbSJW(ge{{Z$k;&}i7 diff --git a/build.gradle b/build.gradle index 06781269..f681be10 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } dependencies { - classpath 'com.badlogicgames.gdx:gdx-tools:1.9.11' + classpath "com.badlogicgames.gdx:gdx-tools:$gdxVersion" classpath 'com.novoda:bintray-release:0.9.2' } } @@ -25,14 +25,6 @@ repositories { ext { appName = 'HyperLap2D' - gdxVersion = '1.9.11' - gdxVersionBeta = '1.9.11' - box2dlightsVersion = '1.6-SNAPSHOT' - ashleyVersion = '1.7.3' - spineVersion = '3.8.55.1' - visuiVersion = '1.4.7-SNAPSHOT' - typingLabelVersion = '1.2.0' - shapedrawerVersion = '2.3.0' packMain = ["art/textures", "assets/style/", "uiskin"] packSplash = ["art/splash_textures", "assets/splash/", "splash"] diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..13370e96 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,8 @@ +gdxVersion = 1.9.13-SNAPSHOT +gdxVersionBeta = 1.9.13-SNAPSHOT +box2dlightsVersion = 1.6-SNAPSHOT +ashleyVersion = 1.7.3 +spineVersion = 3.8.55.1 +visuiVersion = 1.4.7-SNAPSHOT +typingLabelVersion = 1.2.0 +shapedrawerVersion = 2.3.0 \ No newline at end of file diff --git a/hyperlap2d-common-api b/hyperlap2d-common-api index 6af703a4..7813a24a 160000 --- a/hyperlap2d-common-api +++ b/hyperlap2d-common-api @@ -1 +1 @@ -Subproject commit 6af703a4bbb75c099f71f565abc4e2a220a5175e +Subproject commit 7813a24acff90aa0f0ced155cd82a719573e0228 diff --git a/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/EditingZone.java b/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/EditingZone.java index 40d008c3..2d134e48 100644 --- a/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/EditingZone.java +++ b/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/EditingZone.java @@ -233,7 +233,7 @@ public class EditingZone extends Actor { batch.setColor(Color.WHITE.r, Color.WHITE.g, Color.WHITE.b, Color.WHITE.a * parentAlpha); } - public void zoomBy(int amount) { + public void zoomBy(float amount) { float defaultSize = 1.0f - amount*0.12f; currZoom*=defaultSize; } diff --git a/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanel.java b/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanel.java index b7b8996e..79c6e208 100644 --- a/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanel.java +++ b/plugin-9patch/src/main/java/games/rednblack/editor/plugin/ninepatch/MainPanel.java @@ -99,8 +99,8 @@ public class MainPanel extends H2DDialog { public void setListeners(Stage stage) { stage.addListener(new InputListener() { @Override - public boolean scrolled(InputEvent event, float x, float y, int amount) { - editingZone.zoomBy(amount); + public boolean scrolled(InputEvent event, float x, float y, float amountX, float amountY) { + editingZone.zoomBy(amountX); return false; } }); diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DeleteTileTool.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DeleteTileTool.java index 5b4b6787..967004bb 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DeleteTileTool.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DeleteTileTool.java @@ -56,7 +56,7 @@ public class DeleteTileTool implements Tool { } @Override - public void stageMouseScrolled(int amount) { + public void stageMouseScrolled(float amountX, float amountY) { } diff --git a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java index 359a3011..5c1ce28c 100644 --- a/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java +++ b/plugin-tiled/src/main/java/games/rednblack/editor/plugin/tiled/tools/DrawTileTool.java @@ -67,7 +67,7 @@ public class DrawTileTool implements Tool { } @Override - public void stageMouseScrolled(int amount) { + public void stageMouseScrolled(float amountX, float amountY) { } diff --git a/src/main/java/games/rednblack/editor/view/HyperLap2DScreen.java b/src/main/java/games/rednblack/editor/view/HyperLap2DScreen.java index 13366617..4afedbab 100644 --- a/src/main/java/games/rednblack/editor/view/HyperLap2DScreen.java +++ b/src/main/java/games/rednblack/editor/view/HyperLap2DScreen.java @@ -238,7 +238,7 @@ public class HyperLap2DScreen implements Screen, InputProcessor { } @Override - public boolean scrolled(int amount) { + public boolean scrolled(float amountX, float amountY) { return false; } diff --git a/src/main/java/games/rednblack/editor/view/stage/SandboxMediator.java b/src/main/java/games/rednblack/editor/view/stage/SandboxMediator.java index ea963bd7..3273fd16 100644 --- a/src/main/java/games/rednblack/editor/view/stage/SandboxMediator.java +++ b/src/main/java/games/rednblack/editor/view/stage/SandboxMediator.java @@ -24,6 +24,7 @@ import com.badlogic.ashley.core.Family; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.math.Vector2; +import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.utils.Align; import com.badlogic.gdx.utils.SnapshotArray; import games.rednblack.editor.utils.KeyBindingsLayout; @@ -170,16 +171,10 @@ public class SandboxMediator extends Mediator { } public Vector2 getStageCoordinates() { - // TODO: remove this shit - Engine engine = getViewComponent().getEngine(); - Family rootFamily = Family.all(ViewPortComponent.class).get(); - Entity rootEntity = engine.getEntitiesFor(rootFamily).iterator().next(); + Vector3 vec = new Vector3(Gdx.input.getX(), Gdx.input.getY(), 1); + viewComponent.getCamera().unproject(vec); - ViewPortComponent viewPortComponent = ComponentRetriever.get(rootEntity, ViewPortComponent.class); - Vector2 vec = new Vector2(Gdx.input.getX(), Gdx.input.getY()); - viewPortComponent.viewPort.unproject(vec); - - return vec; + return new Vector2(vec.x, vec.y); } public class SandboxItemEventListener extends EntityClickListener { @@ -238,7 +233,7 @@ public class SandboxMediator extends Mediator { } @Override - public boolean scrolled(Entity entity, int amount) { + public boolean scrolled(Entity entity, float amountX, float amountY) { return false; } @@ -433,22 +428,22 @@ public class SandboxMediator extends Mediator { @Override - public boolean scrolled(Entity entity, int amount) { + public boolean scrolled(Entity entity, float amountX, float amountY) { Sandbox sandbox = Sandbox.getInstance(); // well, duh - if (amount == 0) return false; + if (amountX == 0) return false; // Control pressed as well if (isControlPressed()) { float zoomPercent = sandbox.getZoomPercent(); - zoomPercent-=amount*4f; + zoomPercent-= amountX *4f; if(zoomPercent < 5 ) zoomPercent = 5; sandbox.setZoomPercent(zoomPercent, true); } if (currentSelectedTool != null) { - currentSelectedTool.stageMouseScrolled(amount); + currentSelectedTool.stageMouseScrolled(amountX, amountY); } return false; diff --git a/src/main/java/games/rednblack/editor/view/stage/input/EntityClickListener.java b/src/main/java/games/rednblack/editor/view/stage/input/EntityClickListener.java index 62b7161d..3509ce56 100644 --- a/src/main/java/games/rednblack/editor/view/stage/input/EntityClickListener.java +++ b/src/main/java/games/rednblack/editor/view/stage/input/EntityClickListener.java @@ -216,7 +216,7 @@ public class EntityClickListener implements InputListener { } @Override - public boolean scrolled(Entity entity, int amount) { + public boolean scrolled(Entity entity, float amountX, float amountY) { // TODO Auto-generated method stub return false; } diff --git a/src/main/java/games/rednblack/editor/view/stage/input/InputListener.java b/src/main/java/games/rednblack/editor/view/stage/input/InputListener.java index 92d35428..ba7750b6 100644 --- a/src/main/java/games/rednblack/editor/view/stage/input/InputListener.java +++ b/src/main/java/games/rednblack/editor/view/stage/input/InputListener.java @@ -18,6 +18,6 @@ public interface InputListener { public boolean mouseMoved(Entity entity, float screenX, float screenY); - public boolean scrolled(Entity entity, int amount); + public boolean scrolled(Entity entity, float amountX, float amountY); } 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 d364d31c..fa2b98f2 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 @@ -185,7 +185,7 @@ public class SandboxInputAdapter implements InputProcessor { } @Override - public boolean scrolled(int amount) { + public boolean scrolled(float amountX, float amountY) { rootEntity = sandbox.getCurrentViewingEntity(); if(rootEntity == null){ @@ -194,7 +194,7 @@ public class SandboxInputAdapter implements InputProcessor { Array sandboxListeners = sandbox.getAllListeners(); for (int i = 0, s = sandboxListeners.size; i < s; i++) { - sandboxListeners.get(i).scrolled(null, amount); + sandboxListeners.get(i).scrolled(null, amountX, amountY); } //TODO scroll for other Entities don't know how deep tis should go all entities or only hit tested diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/PanTool.java b/src/main/java/games/rednblack/editor/view/stage/tools/PanTool.java index 1b0915ff..375ac7aa 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/PanTool.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/PanTool.java @@ -61,7 +61,7 @@ public class PanTool extends SimpleTool { } @Override - public void stageMouseScrolled(int amount) { + public void stageMouseScrolled(float amountX, float amountY) { } diff --git a/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java b/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java index ffeef85c..ab074bf1 100644 --- a/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java +++ b/src/main/java/games/rednblack/editor/view/stage/tools/SelectionTool.java @@ -276,13 +276,13 @@ public class SelectionTool extends SimpleTool { } @Override - public void stageMouseScrolled(int amount) { + public void stageMouseScrolled(float amountX, float amountY) { if (isItemDown) { for (Entity itemInstance : sandbox.getSelector().getCurrentSelection()) { transformComponent = ComponentRetriever.get(itemInstance, TransformComponent.class); float degreeAmount = 1; - if (amount < 0) degreeAmount = -1; + if (amountX < 0) degreeAmount = -1; // And if shift is pressed, the rotation amount is bigger if (isShiftPressed()) { degreeAmount = degreeAmount * 30; diff --git a/src/test/java/Box2dLightTest.java b/src/test/java/Box2dLightTest.java index 8ed12173..aba54249 100644 --- a/src/test/java/Box2dLightTest.java +++ b/src/test/java/Box2dLightTest.java @@ -519,8 +519,8 @@ public class Box2dLightTest extends InputAdapter implements ApplicationListener } @Override - public boolean scrolled(int amount) { - camera.rotate((float) amount * 3f, 0, 0, 1); + public boolean scrolled(float amountX, float amountY) { + camera.rotate((float) amountX * 3f, 0, 0, 1); return false; }