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

v1.4.0: mouse and controller cursor positions are now synced

Browse Source
This commit is contained in:
Evan Debenham
2022-07-29 15:33:03 -04:00
parent 3c4420e8a0
commit 90a1d3ce2b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,9 +156,10 @@ public class ControllerHandler implements ControllerListener {
controllerPointerActive = active; controllerPointerActive = active;
if (active){ if (active){
Gdx.input.setCursorCatched(true); Gdx.input.setCursorCatched(true);
controllerPointerPos = new PointF(Game.width/2, Game.height/2); controllerPointerPos = new PointF(PointerEvent.currentHoverPos());
} else if (!Cursor.isCursorCaptured()) { } else if (!Cursor.isCursorCaptured()) {
Gdx.input.setCursorCatched(false); Gdx.input.setCursorCatched(false);
Gdx.input.setCursorPosition((int)controllerPointerPos.x, (int)controllerPointerPos.y);
} }
} }

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

@@ -28,6 +28,7 @@ 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.noosa.ui.Cursor;
import com.watabou.utils.PointF;
public class InputHandler extends InputAdapter { public class InputHandler extends InputAdapter {
@@ -121,7 +122,12 @@ public class InputHandler extends InputAdapter {
@Override @Override
public boolean mouseMoved(int screenX, int screenY) { public boolean mouseMoved(int screenX, int screenY) {
ControllerHandler.setControllerPointer(false); if (ControllerHandler.controllerPointerActive()) {
ControllerHandler.setControllerPointer(false);
PointF hover = ControllerHandler.getControllerPointerPos();
screenX = (int)hover.x;
screenY = (int)hover.y;
}
PointerEvent.addPointerEvent(new PointerEvent(screenX, screenY, -1, PointerEvent.Type.HOVER)); PointerEvent.addPointerEvent(new PointerEvent(screenX, screenY, -1, PointerEvent.Type.HOVER));
return true; return true;
} }