konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.2.0: implemented emulated mouse clicks via keybinds

Browse Source
This commit is contained in:
Evan Debenham
2022-02-18 13:29:48 -05:00
parent a010144551
commit 3a6c4fdeb1
6 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SPD-classes/src/main/java/com/watabou/input/GameAction.java
View File

@@ -54,6 +54,10 @@ public class GameAction {
public static final GameAction NONE = new GameAction( "none" );
public static final GameAction BACK = new GameAction( "back" );
public static final GameAction LEFT_CLICK = new GameAction( "left_click" );
public static final GameAction RIGHT_CLICK = new GameAction( "right_click" );
public static final GameAction MIDDLE_CLICK = new GameAction( "middle_click" );
public static ArrayList<GameAction> allActions(){
return new ArrayList<>(ALL_ACTIONS);
}

10
SPD-classes/src/main/java/com/watabou/input/KeyEvent.java
View File

@@ -62,7 +62,15 @@ public class KeyEvent {
public static synchronized void processKeyEvents(){
for (KeyEvent k : keyEvents){
keySignal.dispatch(k);
if (KeyBindings.getActionForKey(k) == GameAction.LEFT_CLICK){
PointerEvent.emulateMouseButton(PointerEvent.LEFT, k.pressed);
} else if (KeyBindings.getActionForKey(k) == GameAction.RIGHT_CLICK){
PointerEvent.emulateMouseButton(PointerEvent.RIGHT, k.pressed);
} else if (KeyBindings.getActionForKey(k) == GameAction.MIDDLE_CLICK){
PointerEvent.emulateMouseButton(PointerEvent.MIDDLE, k.pressed);
} else {
keySignal.dispatch(k);
}
}
keyEvents.clear();
}

30
SPD-classes/src/main/java/com/watabou/input/PointerEvent.java
View File

@@ -41,6 +41,8 @@ public class PointerEvent {
public static final int LEFT = Input.Buttons.LEFT;
public static final int RIGHT = Input.Buttons.RIGHT;
public static final int MIDDLE = Input.Buttons.MIDDLE;
public static final int BACK = Input.Buttons.BACK; //currently unused
public static final int FORWARD = Input.Buttons.FORWARD;//currently unused
public PointF start;
public PointF current;
@@ -106,15 +108,43 @@ public class PointerEvent {
public static PointF currentHoverPos(){
return lastHoverPos.clone();
}
public static synchronized void emulateMouseButton( int button, boolean down ){
if (down){
addPointerEvent(new PointerEvent((int)lastHoverPos.x, (int)lastHoverPos.y, 1000+button, Type.DOWN, button));
} else {
addPointerEvent(new PointerEvent((int)lastHoverPos.x, (int)lastHoverPos.y, 1000+button, Type.UP, button));
}
}
public static synchronized void addPointerEvent( PointerEvent event ){
pointerEvents.add( event );
}
public static synchronized void processPointerEvents(){
//handle any hover events separately first as we may need to add drag events
boolean hovered = false;
for (PointerEvent p : pointerEvents){
if (p.type == Type.HOVER){
lastHoverPos.set(p.current);
pointerSignal.dispatch(p);
hovered = true;
}
}
//add drag events for any emulated presses
if (hovered){
for (int i = 1000+LEFT; i <= 1000+FORWARD; i++){
if (activePointers.containsKey(i)){
addPointerEvent(new PointerEvent((int)lastHoverPos.x, (int)lastHoverPos.y, i, Type.DOWN, i));
}
}
}
for (PointerEvent p : pointerEvents){
if (p.type == Type.HOVER){
continue;
}
if (activePointers.containsKey(p.id)){
PointerEvent existing = activePointers.get(p.id);