v0.7.5e: added scroll wheel support

SPD-classes/src/main/java/com/watabou/input/InputHandler.java

@@ -23,12 +23,14 @@ package com.watabou.input;
 
 import com.badlogic.gdx.InputAdapter;
 import com.watabou.noosa.Game;
+import com.watabou.utils.PointF;
 
 public class InputHandler extends InputAdapter {
 	
 	public void processAllEvents(){
 		PointerEvent.processPointerEvents();
 		KeyEvent.processKeyEvents();
+		ScrollEvent.processScrollEvents();
 	}
 	
 	// *********************
@@ -59,6 +61,18 @@ public class InputHandler extends InputAdapter {
 		return true;
 	}
 	
+	//TODO tracking this should probably be in PointerEvent
+	private static PointF pointerHoverPos = new PointF();
+	
+	@Override
+	public boolean mouseMoved(int screenX, int screenY) {
+		screenX /= (Game.dispWidth / (float)Game.width);
+		screenY /= (Game.dispHeight / (float)Game.height);
+		pointerHoverPos.x = screenX;
+		pointerHoverPos.y = screenY;
+		return true;
+	}
+	
 	// *****************
 	// *** Key Input ***
 	// *****************
@@ -85,4 +99,13 @@ public class InputHandler extends InputAdapter {
 		return true;
 	}
 	
+	// ********************
+	// *** Scroll Input ***
+	// ********************
+	
+	@Override
+	public boolean scrolled(int amount) {
+		ScrollEvent.addScrollEvent( new ScrollEvent(pointerHoverPos, amount));
+		return true;
+	}
 }

SPD-classes/src/main/java/com/watabou/input/ScrollEvent.java

@@ -0,0 +1,71 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015 Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2019 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.watabou.input;
+
+import com.watabou.utils.PointF;
+import com.watabou.utils.Signal;
+
+import java.util.ArrayList;
+
+public class ScrollEvent {
+	
+	public PointF pos;
+	public int amount;
+	
+	public ScrollEvent(PointF mousePos, int amount){
+		this.amount = amount;
+		this.pos = mousePos;
+	}
+	
+	// **********************
+	// *** Static members ***
+	// **********************
+	
+	private static Signal<ScrollEvent> scrollSignal = new Signal<>( true );
+	
+	public static void addScrollListener( Signal.Listener<ScrollEvent> listener ){
+		scrollSignal.add(listener);
+	}
+	
+	public static void removeScrollListener( Signal.Listener<ScrollEvent> listener ){
+		scrollSignal.remove(listener);
+	}
+	
+	public static void clearListeners(){
+		scrollSignal.removeAll();
+	}
+	
+	//Accumulated key events
+	private static ArrayList<ScrollEvent> scrollEvents = new ArrayList<>();
+	
+	public static synchronized void addScrollEvent( ScrollEvent event ){
+		scrollEvents.add( event );
+	}
+	
+	public static synchronized void processScrollEvents(){
+		for (ScrollEvent k : scrollEvents){
+			scrollSignal.dispatch(k);
+		}
+		scrollEvents.clear();
+	}
+	
+}

SPD-classes/src/main/java/com/watabou/noosa/PointerArea.java

@@ -34,14 +34,14 @@ public class PointerArea extends Visual implements Signal.Listener<PointerEvent>
 	//if true, this PointerArea will always block input, even when it is inactive
 	public boolean blockWhenInactive = false;
 	
-	public PointerArea(Visual target ) {
+	public PointerArea( Visual target ) {
 		super( 0, 0, 0, 0 );
 		this.target = target;
 		
 		PointerEvent.addPointerListener( this );
 	}
 	
-	public PointerArea(float x, float y, float width, float height ) {
+	public PointerArea( float x, float y, float width, float height ) {
 		super( x, y, width, height );
 		this.target = this;
 		
@@ -99,17 +99,13 @@ public class PointerArea extends Visual implements Signal.Listener<PointerEvent>
 		}
 	}
 	
-	protected void onPointerDown( PointerEvent event ) {
-	}
+	protected void onPointerDown( PointerEvent event ) { }
 	
-	protected void onPointerUp( PointerEvent event) {
-	}
+	protected void onPointerUp( PointerEvent event) { }
 	
-	protected void onClick( PointerEvent event ) {
-	}
+	protected void onClick( PointerEvent event ) { }
 	
-	protected void onDrag( PointerEvent event ) {
-	}
+	protected void onDrag( PointerEvent event ) { }
 	
 	public void reset() {
 		curEvent = null;

SPD-classes/src/main/java/com/watabou/noosa/ScrollArea.java

@@ -0,0 +1,58 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015 Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2019 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+package com.watabou.noosa;
+
+import com.watabou.input.ScrollEvent;
+import com.watabou.utils.Signal;
+
+//pointer area with additional support for detecting scrolling events
+public class ScrollArea extends PointerArea {
+	
+	public ScrollArea( Visual target ){
+		super( target );
+		ScrollEvent.addScrollListener( scrollListener );
+	}
+	
+	public ScrollArea(float x, float y, float width, float height ) {
+		super( x, y, width, height );
+		ScrollEvent.addScrollListener( scrollListener );
+	}
+	
+	private Signal.Listener<ScrollEvent> scrollListener = new Signal.Listener<ScrollEvent>() {
+		@Override
+		public boolean onSignal(ScrollEvent event) {
+			if (event != null && target.overlapsScreenPoint( (int)event.pos.x, (int)event.pos.y )){
+				onScroll( event );
+				return true;
+			}
+			return false;
+		}
+	};
+	
+	protected void onScroll( ScrollEvent event ){ }
+	
+	@Override
+	public void destroy() {
+		super.destroy();
+		ScrollEvent.removeScrollListener( scrollListener );
+	}
+}