Forráskód Böngészése

Fixes for latest libgdx (scrolled now takes x/y floats).

Nathan Sweet 4 éve
szülő
commit
da6d73a365

+ 2 - 2
spine-libgdx/spine-skeletonviewer/src/com/esotericsoftware/spine/SkeletonViewer.java

@@ -969,10 +969,10 @@ public class SkeletonViewer extends ApplicationAdapter {
 					return false;
 					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 zoom = zoomSlider.getValue(), zoomMin = zoomSlider.getMinValue(), zoomMax = zoomSlider.getMaxValue();
 					float speedAlpha = Math.min(1.2f, (zoom - zoomMin) / (zoomMax - zoomMin) * 3.5f);
 					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));
 					zoomSlider.setValue(MathUtils.clamp(zoom, zoomMin, zoomMax));
 					return false;
 					return false;
 				}
 				}