v1.2.0: implemented basic controller support

This commit is contained in:
Evan Debenham
2022-02-18 12:08:27 -05:00
parent ccfb7ddfad
commit a010144551
12 changed files with 218 additions and 6 deletions

View File

@@ -7,5 +7,6 @@ dependencies {
//TODO migrate this to implementation from api
//in order to do this I have to remove 100% of libGDX API access from core
api "com.badlogicgames.gdx:gdx:$gdxVersion"
api "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion"
implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
}

View File

@@ -0,0 +1,137 @@
/*
* Pixel Dungeon
* Copyright (C) 2012-2015 Oleg Dolya
*
* Shattered Pixel Dungeon
* Copyright (C) 2014-2022 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.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.controllers.Controller;
import com.badlogic.gdx.controllers.ControllerListener;
import com.badlogic.gdx.controllers.ControllerMapping;
import com.watabou.utils.DeviceCompat;
import com.watabou.utils.PointF;
import java.lang.annotation.Target;
public class ControllerHandler implements ControllerListener {
public static boolean controllersSupported() {
if (DeviceCompat.isAndroid() && Gdx.app.getVersion() < 16) {
return false;
} else {
return true;
}
}
@Override
public void connected(Controller controller) {
}
@Override
public void disconnected(Controller controller) {
}
@Override
public boolean buttonDown(Controller controller, int buttonCode) {
int keyCode = buttonToKey(controller, buttonCode);
if (keyCode != Input.Keys.UNKNOWN){
KeyEvent.addKeyEvent(new KeyEvent(keyCode, true));
return true;
}
return false;
}
@Override
public boolean buttonUp(Controller controller, int buttonCode) {
int keyCode = buttonToKey(controller, buttonCode);
if (keyCode != Input.Keys.UNKNOWN){
KeyEvent.addKeyEvent(new KeyEvent(keyCode, false));
return true;
}
return false;
}
public static PointF leftStickPosition = new PointF();
public static PointF rightStickPosition = new PointF();
private float L2Trigger = 0f;
private float R2Trigger = 0f;
@Override
public boolean axisMoved(Controller controller, int axisCode, float value) {
ControllerMapping mapping = controller.getMapping();
if (mapping.axisRightX == axisCode) rightStickPosition.x = value;
else if (mapping.axisRightY == axisCode) rightStickPosition.y = value;
else if (mapping.axisLeftX == axisCode) leftStickPosition.x = value;
else if (mapping.axisLeftY == axisCode) leftStickPosition.y = value;
//L2 and R2 triggers on Desktop
else if (axisCode == 4) {
if (L2Trigger < 0.5f && value >= 0.5f){
KeyEvent.addKeyEvent(new KeyEvent(Input.Keys.BUTTON_L2, true));
} else if (L2Trigger >= 0.5f && value < 0.5f){
KeyEvent.addKeyEvent(new KeyEvent(Input.Keys.BUTTON_L2, false));
}
L2Trigger = value;
} else if (axisCode == 5){
if (R2Trigger < 0.5f && value >= 0.5f){
KeyEvent.addKeyEvent(new KeyEvent(Input.Keys.BUTTON_R2, true));
} else if (R2Trigger >= 0.5f && value < 0.5f){
KeyEvent.addKeyEvent(new KeyEvent(Input.Keys.BUTTON_R2, false));
}
R2Trigger = value;
}
return true;
}
//converts controller button codes to keyEvent codes
public static int buttonToKey(Controller controller, int keyCode){
ControllerMapping mapping = controller.getMapping();
if (keyCode == mapping.buttonA) return Input.Keys.BUTTON_A;
if (keyCode == mapping.buttonB) return Input.Keys.BUTTON_B;
//C button?
if (keyCode == mapping.buttonX) return Input.Keys.BUTTON_X;
if (keyCode == mapping.buttonY) return Input.Keys.BUTTON_Y;
if (keyCode == mapping.buttonBack) return Input.Keys.BUTTON_SELECT;
if (keyCode == mapping.buttonStart) return Input.Keys.BUTTON_START;
if (keyCode == mapping.buttonL1) return Input.Keys.BUTTON_L1;
if (keyCode == mapping.buttonL2) return Input.Keys.BUTTON_L2;
if (keyCode == mapping.buttonR1) return Input.Keys.BUTTON_R1;
if (keyCode == mapping.buttonR2) return Input.Keys.BUTTON_R2;
if (keyCode == mapping.buttonDpadUp) return Input.Keys.DPAD_UP;
if (keyCode == mapping.buttonDpadLeft) return Input.Keys.DPAD_LEFT;
if (keyCode == mapping.buttonDpadDown) return Input.Keys.DPAD_DOWN;
if (keyCode == mapping.buttonDpadRight) return Input.Keys.DPAD_RIGHT;
if (keyCode == mapping.buttonLeftStick) return Input.Keys.BUTTON_THUMBL;
if (keyCode == mapping.buttonRightStick) return Input.Keys.BUTTON_THUMBR;
return Input.Keys.UNKNOWN;
}
}

View File

@@ -24,12 +24,14 @@ package com.watabou.noosa;
import com.badlogic.gdx.Application;
import com.badlogic.gdx.ApplicationListener;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.controllers.Controllers;
import com.badlogic.gdx.graphics.glutils.GLVersion;
import com.badlogic.gdx.utils.TimeUtils;
import com.watabou.glscripts.Script;
import com.watabou.gltextures.TextureCache;
import com.watabou.glwrap.Blending;
import com.watabou.glwrap.Vertexbuffer;
import com.watabou.input.ControllerHandler;
import com.watabou.input.InputHandler;
import com.watabou.input.PointerEvent;
import com.watabou.noosa.audio.Music;
@@ -100,6 +102,9 @@ public class Game implements ApplicationListener {
dispWidth = Gdx.graphics.getDisplayMode().width;
inputHandler = new InputHandler( Gdx.input );
if (ControllerHandler.controllersSupported()){
Controllers.addListener(new ControllerHandler());
}
//refreshes texture and vertex data stored on the gpu
versionContextRef = Gdx.graphics.getGLVersion();