diff --git a/assets/plugins/plugin-9patch-0.0.3.jar b/assets/plugins/plugin-9patch-0.0.3.jar index aeb249ae..3fac6b36 100644 Binary files a/assets/plugins/plugin-9patch-0.0.3.jar and b/assets/plugins/plugin-9patch-0.0.3.jar differ 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; }