From da6d73a3653f3f46dd41726277679056b906a372 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Tue, 13 Oct 2020 17:34:56 -0700 Subject: [PATCH] Fixes for latest libgdx (scrolled now takes x/y floats). --- .../src/com/esotericsoftware/spine/SkeletonViewer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java index 3e6aad70f..cd8145b74 100644 --- a/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java +++ b/spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java @@ -969,10 +969,10 @@ public class SkeletonViewer extends ApplicationAdapter { return false; } - public boolean scrolled (int amount) { + public boolean scrolled (float amountX, float amountY) { float zoom = zoomSlider.getValue(), zoomMin = zoomSlider.getMinValue(), zoomMax = zoomSlider.getMaxValue(); float speedAlpha = Math.min(1.2f, (zoom - zoomMin) / (zoomMax - zoomMin) * 3.5f); - zoom -= linear.apply(0.02f, 0.2f, speedAlpha) * Math.signum(amount); + zoom -= linear.apply(0.02f, 0.2f, speedAlpha) * Math.signum(amountY); zoomSlider.setValue(MathUtils.clamp(zoom, zoomMin, zoomMax)); return false; }