diff --git a/CHANGES b/CHANGES index d95c8d75e5e..93ab1365650 100755 --- a/CHANGES +++ b/CHANGES @@ -24,6 +24,7 @@ - API Addition: Added a Lwjgl3ApplicationConfiguration#foregroundFPS option. - API Change: Utility classes are now final and have a private constructor to prevent instantiation. - API Change: ScrollPane now supports all combinations of scrollBarsOnTop and fadeScrollBars. +- API Change: InputProcessor scrolled method now receives scroll amount for X and Y. Changed type to float to support devices which report fractional scroll amounts. Updated InputEvent in scene2d accordingly: added scrollAmountX, scrollAmountY attributes and corresponding setters and getters. [1.9.11] - Update to MobiVM 2.3.8 diff --git a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidMouseHandler.java b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidMouseHandler.java index e404d93dea6..bc928e16587 100644 --- a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidMouseHandler.java +++ b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidMouseHandler.java @@ -35,7 +35,8 @@ public boolean onGenericMotion (MotionEvent event, DefaultAndroidInput input) { final int action = event.getAction() & MotionEvent.ACTION_MASK; int x = 0, y = 0; - int scrollAmount = 0; + int scrollAmountX = 0; + int scrollAmountY = 0; long timeStamp = System.nanoTime(); synchronized (input) { @@ -44,15 +45,16 @@ public boolean onGenericMotion (MotionEvent event, DefaultAndroidInput input) { x = (int)event.getX(); y = (int)event.getY(); if ((x != deltaX) || (y != deltaY)) { // Avoid garbage events - postTouchEvent(input, TouchEvent.TOUCH_MOVED, x, y, 0, timeStamp); + postTouchEvent(input, TouchEvent.TOUCH_MOVED, x, y, 0, 0, timeStamp); deltaX = x; deltaY = y; } break; case MotionEvent.ACTION_SCROLL: - scrollAmount = (int)-Math.signum(event.getAxisValue(MotionEvent.AXIS_VSCROLL)); - postTouchEvent(input, TouchEvent.TOUCH_SCROLLED, 0, 0, scrollAmount, timeStamp); + scrollAmountY = (int)-Math.signum(event.getAxisValue(MotionEvent.AXIS_VSCROLL)); + scrollAmountX = (int)-Math.signum(event.getAxisValue(MotionEvent.AXIS_HSCROLL)); + postTouchEvent(input, TouchEvent.TOUCH_SCROLLED, 0, 0, scrollAmountX, scrollAmountY, timeStamp); } } @@ -75,13 +77,14 @@ else if (action == MotionEvent.ACTION_SCROLL) Gdx.app.log("AndroidMouseHandler", "action " + actionStr); } - private void postTouchEvent (DefaultAndroidInput input, int type, int x, int y, int scrollAmount, long timeStamp) { + private void postTouchEvent (DefaultAndroidInput input, int type, int x, int y, int scrollAmountX, int scrollAmountY, long timeStamp) { TouchEvent event = input.usedTouchEvents.obtain(); event.timeStamp = timeStamp; event.x = x; event.y = y; event.type = type; - event.scrollAmount = scrollAmount; + event.scrollAmountX = scrollAmountX; + event.scrollAmountY = scrollAmountY; input.touchEvents.add(event); } diff --git a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/DefaultAndroidInput.java b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/DefaultAndroidInput.java index 4059ce6b428..fd21759b55d 100644 --- a/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/DefaultAndroidInput.java +++ b/backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/DefaultAndroidInput.java @@ -77,7 +77,8 @@ static class TouchEvent { int type; int x; int y; - int scrollAmount; + int scrollAmountX; + int scrollAmountY; int button; int pointer; } @@ -419,7 +420,7 @@ public void processEvents () { processor.mouseMoved(e.x, e.y); break; case TouchEvent.TOUCH_SCROLLED: - processor.scrolled(e.scrollAmount); + processor.scrolled(e.scrollAmountX,e.scrollAmountY); } usedTouchEvents.free(e); } diff --git a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/DefaultLwjglInput.java b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/DefaultLwjglInput.java index 78af7da5201..af2539e568e 100644 --- a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/DefaultLwjglInput.java +++ b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/DefaultLwjglInput.java @@ -367,7 +367,7 @@ public void processEvents () { processor.mouseMoved(e.x, e.y); break; case TouchEvent.TOUCH_SCROLLED: - processor.scrolled(e.scrollAmount); + processor.scrolled(0, e.scrollAmount); } usedTouchEvents.free(e); } diff --git a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglAWTInput.java b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglAWTInput.java index a794a900d71..4541129e679 100644 --- a/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglAWTInput.java +++ b/backends/gdx-backend-lwjgl/src/com/badlogic/gdx/backends/lwjgl/LwjglAWTInput.java @@ -383,7 +383,7 @@ void processEvents () { processor.mouseMoved(e.x, e.y); break; case TouchEvent.TOUCH_SCROLLED: - processor.scrolled(e.scrollAmount); + processor.scrolled(0, e.scrollAmount); break; } usedTouchEvents.free(e); diff --git a/backends/gdx-backend-lwjgl3/src/com/badlogic/gdx/backends/lwjgl3/DefaultLwjgl3Input.java b/backends/gdx-backend-lwjgl3/src/com/badlogic/gdx/backends/lwjgl3/DefaultLwjgl3Input.java index 51f0ac8f7f8..43fd8ccfeb4 100644 --- a/backends/gdx-backend-lwjgl3/src/com/badlogic/gdx/backends/lwjgl3/DefaultLwjgl3Input.java +++ b/backends/gdx-backend-lwjgl3/src/com/badlogic/gdx/backends/lwjgl3/DefaultLwjgl3Input.java @@ -87,31 +87,10 @@ public void invoke(long window, int codepoint) { }; private GLFWScrollCallback scrollCallback = new GLFWScrollCallback() { - private long pauseTime = 250000000L; //250ms - private float scrollYRemainder; - private long lastScrollEventTime; @Override public void invoke(long window, double scrollX, double scrollY) { DefaultLwjgl3Input.this.window.getGraphics().requestRendering(); - if (scrollYRemainder > 0 && scrollY < 0 || scrollYRemainder < 0 && scrollY > 0 || - TimeUtils.nanoTime() - lastScrollEventTime > pauseTime ) { - // fire a scroll event immediately: - // - if the scroll direction changes; - // - if the user did not move the wheel for more than 250ms - scrollYRemainder = 0; - int scrollAmount = (int)-Math.signum(scrollY); - eventQueue.scrolled(scrollAmount); - lastScrollEventTime = TimeUtils.nanoTime(); - } - else { - scrollYRemainder += scrollY; - while (Math.abs(scrollYRemainder) >= 1) { - int scrollAmount = (int)-Math.signum(scrollY); - eventQueue.scrolled(scrollAmount); - lastScrollEventTime = TimeUtils.nanoTime(); - scrollYRemainder += scrollAmount; - } - } + eventQueue.scrolled(-(float)scrollX, -(float)scrollY); } }; diff --git a/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/DefaultGwtInput.java b/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/DefaultGwtInput.java index 868f5b712d9..80438b608c1 100644 --- a/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/DefaultGwtInput.java +++ b/backends/gdx-backends-gwt/src/com/badlogic/gdx/backends/gwt/DefaultGwtInput.java @@ -679,7 +679,7 @@ private void handleEvent (NativeEvent e) { } if (e.getType().equals(getMouseWheelEvent())) { if (processor != null) { - processor.scrolled((int)getMouseWheelVelocity(e)); + processor.scrolled(0, (int)getMouseWheelVelocity(e)); } this.currentEventTimeStamp = TimeUtils.nanoTime(); e.preventDefault(); diff --git a/extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java b/extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java index 3f72f652e2a..4f08fda4e2d 100644 --- a/extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java +++ b/extensions/gdx-tools/src/com/badlogic/gdx/tools/particleeditor/ParticleEditor.java @@ -350,11 +350,11 @@ public OrthoCamController (OrthographicCamera camera) { } @Override - public boolean scrolled (int amount) { - worldCamera.zoom += amount * 0.01f; + public boolean scrolled (float amountX, float amountY) { + worldCamera.zoom += amountY * 0.01f; worldCamera.zoom = MathUtils.clamp(worldCamera.zoom, 0.01f, 5000); worldCamera.update(); - return super.scrolled(amount); + return super.scrolled(amountX,amountY); } @Override @@ -599,7 +599,7 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { return false; } diff --git a/gdx/src/com/badlogic/gdx/InputAdapter.java b/gdx/src/com/badlogic/gdx/InputAdapter.java index 737c36f5e91..c8f9984c359 100644 --- a/gdx/src/com/badlogic/gdx/InputAdapter.java +++ b/gdx/src/com/badlogic/gdx/InputAdapter.java @@ -50,6 +50,10 @@ public boolean mouseMoved (int screenX, int screenY) { } @Override + public boolean scrolled (float amountX, float amountY) { + return scrolled((int)amountY); + } + public boolean scrolled (int amount) { return false; } diff --git a/gdx/src/com/badlogic/gdx/InputEventQueue.java b/gdx/src/com/badlogic/gdx/InputEventQueue.java index 68252e930a8..ca341c61571 100644 --- a/gdx/src/com/badlogic/gdx/InputEventQueue.java +++ b/gdx/src/com/badlogic/gdx/InputEventQueue.java @@ -18,6 +18,7 @@ import com.badlogic.gdx.utils.IntArray; import com.badlogic.gdx.utils.TimeUtils; +import com.badlogic.gdx.utils.NumberUtils; /** Queues events that are later passed to the wrapped {@link InputProcessor}. * @author Nathan Sweet */ @@ -92,7 +93,7 @@ public void drain () { localProcessor.mouseMoved(q[i++], q[i++]); break; case SCROLLED: - localProcessor.scrolled(q[i++]); + localProcessor.scrolled(NumberUtils.intBitsToFloat(q[i++]) , NumberUtils.intBitsToFloat(q[i++])); break; default: throw new RuntimeException(); @@ -133,7 +134,7 @@ private synchronized int next (int nextType, int i) { i += 2; break; case SCROLLED: - i++; + i += 2; break; default: throw new RuntimeException(); @@ -218,10 +219,11 @@ public synchronized boolean mouseMoved (int screenX, int screenY) { return false; } - public synchronized boolean scrolled (int amount) { + public synchronized boolean scrolled(float amountX, float amountY) { queue.add(SCROLLED); queueTime(); - queue.add(amount); + queue.add(NumberUtils.floatToIntBits(amountX)); + queue.add(NumberUtils.floatToIntBits(amountY)); return false; } diff --git a/gdx/src/com/badlogic/gdx/InputMultiplexer.java b/gdx/src/com/badlogic/gdx/InputMultiplexer.java index 960ab8359da..24dacb57753 100644 --- a/gdx/src/com/badlogic/gdx/InputMultiplexer.java +++ b/gdx/src/com/badlogic/gdx/InputMultiplexer.java @@ -150,11 +150,11 @@ public boolean mouseMoved (int screenX, int screenY) { return false; } - public boolean scrolled (int amount) { + public boolean scrolled (float amountX,float amountY) { Object[] items = processors.begin(); try { for (int i = 0, n = processors.size; i < n; i++) - if (((InputProcessor)items[i]).scrolled(amount)) return true; + if (((InputProcessor)items[i]).scrolled(amountX, amountY)) return true; } finally { processors.end(); } diff --git a/gdx/src/com/badlogic/gdx/InputProcessor.java b/gdx/src/com/badlogic/gdx/InputProcessor.java index 28fb72d5a7d..8ee441355b0 100644 --- a/gdx/src/com/badlogic/gdx/InputProcessor.java +++ b/gdx/src/com/badlogic/gdx/InputProcessor.java @@ -67,7 +67,8 @@ public interface InputProcessor { public boolean mouseMoved (int screenX, int screenY); /** Called when the mouse wheel was scrolled. Will not be called on iOS. - * @param amount the scroll amount, -1 or 1 depending on the direction the wheel was scrolled. + * @param amountX the horizontal scroll amount, negative or positive depending on the direction the wheel was scrolled. + * @param amountY the vertical scroll amount, negative or positive depending on the direction the wheel was scrolled. * @return whether the input was processed. */ - public boolean scrolled (int amount); + public boolean scrolled (float amountX, float amountY); } diff --git a/gdx/src/com/badlogic/gdx/graphics/g3d/utils/CameraInputController.java b/gdx/src/com/badlogic/gdx/graphics/g3d/utils/CameraInputController.java index 34a0f9086eb..e6c4096e885 100644 --- a/gdx/src/com/badlogic/gdx/graphics/g3d/utils/CameraInputController.java +++ b/gdx/src/com/badlogic/gdx/graphics/g3d/utils/CameraInputController.java @@ -203,8 +203,8 @@ public boolean touchDragged (int screenX, int screenY, int pointer) { } @Override - public boolean scrolled (int amount) { - return zoom(amount * scrollFactor * translateUnits); + public boolean scrolled (float amountX, float amountY) { + return zoom(amountY * scrollFactor * translateUnits); } public boolean zoom (float amount) { diff --git a/gdx/src/com/badlogic/gdx/input/RemoteSender.java b/gdx/src/com/badlogic/gdx/input/RemoteSender.java index 148fe9780b5..eebb99926b9 100644 --- a/gdx/src/com/badlogic/gdx/input/RemoteSender.java +++ b/gdx/src/com/badlogic/gdx/input/RemoteSender.java @@ -198,7 +198,7 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { return false; } diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/InputEvent.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/InputEvent.java index 8c7dc23b46c..24a75259972 100644 --- a/gdx/src/com/badlogic/gdx/scenes/scene2d/InputEvent.java +++ b/gdx/src/com/badlogic/gdx/scenes/scene2d/InputEvent.java @@ -24,8 +24,8 @@ * @see InputListener */ public class InputEvent extends Event { private Type type; - private float stageX, stageY; - private int pointer, button, keyCode, scrollAmount; + private float stageX, stageY, scrollAmountX, scrollAmountY; + private int pointer, button, keyCode; private char character; private @Null Actor relatedActor; private boolean touchFocus = true; @@ -103,13 +103,21 @@ public void setCharacter (char character) { this.character = character; } - /** The amount the mouse was scrolled. Valid for: scrolled. */ - public int getScrollAmount () { - return scrollAmount; + /** The amount the mouse was scrolled horizontally. Valid for: scrolled. */ + public float getScrollAmountX () { + return scrollAmountX; + } + /** The amount the mouse was scrolled vertically. Valid for: scrolled. */ + public float getScrollAmountY () { + return scrollAmountY; + } + + public void setScrollAmountX (float scrollAmount) { + this.scrollAmountX = scrollAmount; } - public void setScrollAmount (int scrollAmount) { - this.scrollAmount = scrollAmount; + public void setScrollAmountY (float scrollAmount) { + this.scrollAmountY = scrollAmount; } /** The actor related to the event. Valid for: enter and exit. For enter, this is the actor being exited, or null. For exit, diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/InputListener.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/InputListener.java index a8e1c678958..132ab7debb3 100644 --- a/gdx/src/com/badlogic/gdx/scenes/scene2d/InputListener.java +++ b/gdx/src/com/badlogic/gdx/scenes/scene2d/InputListener.java @@ -74,7 +74,7 @@ public boolean handle (Event e) { case mouseMoved: return mouseMoved(event, tmpCoords.x, tmpCoords.y); case scrolled: - return scrolled(event, tmpCoords.x, tmpCoords.y, event.getScrollAmount()); + return scrolled(event, tmpCoords.x, tmpCoords.y, event.getScrollAmountX(), event.getScrollAmountY()); case enter: enter(event, tmpCoords.x, tmpCoords.y, event.getPointer(), event.getRelatedActor()); return false; @@ -128,7 +128,7 @@ public void exit (InputEvent event, float x, float y, int pointer, @Null Actor t } /** Called when the mouse wheel has been scrolled. When true is returned, the event is {@link Event#handle() handled}. */ - public boolean scrolled (InputEvent event, float x, float y, int amount) { + public boolean scrolled (InputEvent event, float x, float y, float amountX, float amountY) { return false; } diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/Stage.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/Stage.java index bf8c3d1a37b..e95d1c27673 100644 --- a/gdx/src/com/badlogic/gdx/scenes/scene2d/Stage.java +++ b/gdx/src/com/badlogic/gdx/scenes/scene2d/Stage.java @@ -386,7 +386,7 @@ public boolean mouseMoved (int screenX, int screenY) { /** Applies a mouse scroll event to the stage and returns true if an actor in the scene {@link Event#handle() handled} the * event. This event only occurs on the desktop. */ - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { Actor target = scrollFocus == null ? root : scrollFocus; screenToStageCoordinates(tempCoords.set(mouseScreenX, mouseScreenY)); @@ -394,7 +394,8 @@ public boolean scrolled (int amount) { InputEvent event = Pools.obtain(InputEvent.class); event.setStage(this); event.setType(InputEvent.Type.scrolled); - event.setScrollAmount(amount); + event.setScrollAmountX(amountX); + event.setScrollAmountY(amountY); event.setStageX(tempCoords.x); event.setStageY(tempCoords.y); target.fire(event); diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/ScrollPane.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/ScrollPane.java index 4ecc58c36e0..7a69d5eba12 100644 --- a/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/ScrollPane.java +++ b/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/ScrollPane.java @@ -208,13 +208,12 @@ public boolean handle (Event event) { addListener(flickScrollListener); addListener(new InputListener() { - public boolean scrolled (InputEvent event, float x, float y, int amount) { + public boolean scrolled (InputEvent event, float x, float y, float scrollAmountX, float scrollAmountY) { setScrollbarsVisible(true); - if (scrollY) - setScrollY(amountY + getMouseWheelY() * amount); - else if (scrollX) // - setScrollX(amountX + getMouseWheelX() * amount); - else + if (scrollY || scrollX) { + setScrollY(amountY + getMouseWheelY() * scrollAmountY); + setScrollX(amountX + getMouseWheelX() * scrollAmountX); + } else return false; return true; } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java index 3b905f2b9a6..a432803f900 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/Box2DTestCollection.java @@ -121,7 +121,7 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { return false; } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/BulletTestCollection.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/BulletTestCollection.java index 0b4cdbdf46f..8d17fed96f0 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/BulletTestCollection.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/BulletTestCollection.java @@ -162,8 +162,8 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { - return tests[testIndex].scrolled(amount); + public boolean scrolled (float amountX, float amountY) { + return tests[testIndex].scrolled(amountX,amountY); } @Override diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/InputTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/InputTest.java index eb5f623b819..20b98dbfce0 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/InputTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/InputTest.java @@ -109,8 +109,8 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { - Gdx.app.log("Input Test", "scrolled: " + amount); + public boolean scrolled (float amountX, float amountY) { + Gdx.app.log("Input Test", "scrolled: " + amountY); return false; } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/InterpolationTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/InterpolationTest.java index ee5641023ca..3ece98bd15e 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/InterpolationTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/InterpolationTest.java @@ -119,9 +119,9 @@ public void changed (ChangeEvent event, Actor actor) { stage.addActor(table); Gdx.input.setInputProcessor(new InputMultiplexer(new InputAdapter() { - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { if (!Gdx.input.isKeyPressed(Keys.CONTROL_LEFT)) return false; - duration -= amount / 15f; + duration -= amountY / 15f; duration = MathUtils.clamp(duration, 0, Float.POSITIVE_INFINITY); return true; } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/OnscreenKeyboardTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/OnscreenKeyboardTest.java index 317f3580df1..67e0c08651d 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/OnscreenKeyboardTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/OnscreenKeyboardTest.java @@ -93,7 +93,7 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { // TODO Auto-generated method stub return false; } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterChangeSpriteTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterChangeSpriteTest.java index d1c0fbd108d..d8a948b972c 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterChangeSpriteTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterChangeSpriteTest.java @@ -94,7 +94,7 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { return false; } }; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterTest.java index 76199c43746..ec8cd5fe15c 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/ParticleEmitterTest.java @@ -116,7 +116,7 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { return false; } }; diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchTest.java index f0a754277d2..22f8becd3c4 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/SpriteBatchTest.java @@ -262,7 +262,7 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { return false; } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/box2d/Box2DTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/box2d/Box2DTest.java index 63d51263dea..39e25ea3889 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/box2d/Box2DTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/box2d/Box2DTest.java @@ -232,7 +232,7 @@ public boolean mouseMoved (int x, int y) { } @Override - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { return false; } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/BulletTest.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/BulletTest.java index 48218e03cea..43a41d931f7 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/BulletTest.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/bullet/BulletTest.java @@ -70,7 +70,7 @@ public boolean mouseMoved (int screenX, int screenY) { } @Override - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { return false; } diff --git a/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/PerspectiveCamController.java b/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/PerspectiveCamController.java index f37e6ed1e58..cd4c87756ee 100644 --- a/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/PerspectiveCamController.java +++ b/tests/gdx-tests/src/com/badlogic/gdx/tests/utils/PerspectiveCamController.java @@ -102,8 +102,8 @@ public boolean touchDragged (int x, int y, int pointer) { } @Override - public boolean scrolled (int amount) { - cam.fieldOfView -= -amount * Gdx.graphics.getDeltaTime() * 100; + public boolean scrolled (float amountX, float amountY) { + cam.fieldOfView -= -amountY * Gdx.graphics.getDeltaTime() * 100; cam.update(); return true; }