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

v2.1.1: fixed bugs with cursor capture

Browse Source
This commit is contained in:
Evan Debenham
2023-06-05 23:51:31 -04:00
parent 604dead311
commit bac2af9df8
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SPD-classes/src/main/java/com/watabou/input/ControllerHandler.java
View File

@@ -179,6 +179,8 @@ public class ControllerHandler implements ControllerListener {
if (sendEvent) { if (sendEvent) {
controllerActive = true; controllerActive = true;
PointerEvent.addPointerEvent(new PointerEvent((int) controllerPointerPos.x, (int) controllerPointerPos.y, 10_000, PointerEvent.Type.HOVER, PointerEvent.NONE)); PointerEvent.addPointerEvent(new PointerEvent((int) controllerPointerPos.x, (int) controllerPointerPos.y, 10_000, PointerEvent.Type.HOVER, PointerEvent.NONE));
} else {
PointerEvent.setHoverPos(pos);
} }
} }

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

@@ -21,13 +21,11 @@
package com.watabou.input; package com.watabou.input;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input; import com.badlogic.gdx.Input;
import com.badlogic.gdx.InputAdapter; import com.badlogic.gdx.InputAdapter;
import com.badlogic.gdx.InputMultiplexer; import com.badlogic.gdx.InputMultiplexer;
import com.badlogic.gdx.InputProcessor; import com.badlogic.gdx.InputProcessor;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.noosa.ui.Cursor;
import com.watabou.utils.PointF; import com.watabou.utils.PointF;
public class InputHandler extends InputAdapter { public class InputHandler extends InputAdapter {

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

@@ -121,6 +121,10 @@ public class PointerEvent {
} }
return lastHoverPos.clone(); return lastHoverPos.clone();
} }
public static void setHoverPos(PointF pos){
lastHoverPos.set(pos);
}
public static synchronized void addPointerEvent( PointerEvent event ){ public static synchronized void addPointerEvent( PointerEvent event ){
pointerEvents.add( event ); pointerEvents.add( event );

4
SPD-classes/src/main/java/com/watabou/noosa/ui/Cursor.java
View File

@@ -26,6 +26,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap;
import com.watabou.input.ControllerHandler; import com.watabou.input.ControllerHandler;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.utils.Callback;
import com.watabou.utils.FileUtils; import com.watabou.utils.FileUtils;
import com.watabou.utils.PointF; import com.watabou.utils.PointF;
@@ -99,10 +100,9 @@ public class Cursor {
} else { } else {
if (ControllerHandler.controllerPointerActive()) { if (ControllerHandler.controllerPointerActive()) {
ControllerHandler.setControllerPointer(true); ControllerHandler.setControllerPointer(true);
ControllerHandler.updateControllerPointer(new PointF(Game.width/2, Game.height/2), false); ControllerHandler.updateControllerPointer(new PointF(Game.width/2f, Game.height/2f), false);
} else { } else {
Gdx.input.setCursorCatched(false); Gdx.input.setCursorCatched(false);
Gdx.input.setCursorPosition(Game.width/2, Game.height/2);
} }
} }
} }