Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
no 2021-06-16 11:34:44 +02:00
commit 3707324146
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/input/GamepadInput.java
View File

@ -107,8 +107,8 @@ public class GamepadInput {
return new Vector3f(x,y); return new Vector3f(x,y);
} }
public String getGamepadName(){ public int getGamepadName(){
return glfwGetJoystickName(this.gamepadNum); return this.gamepadNum;
} }
} }

1
src/gameplay/Characters/Blue/BlueNormals.java
View File

@ -198,7 +198,6 @@ public class BlueNormals {
f[0] = standAFrame1(); f[0] = standAFrame1();
f[1] = standAFrame1(); f[1] = standAFrame1();
f[2] = standAFrame1(); f[2] = standAFrame1();
f[3] = standAFrame3();
return(new attackPart(f)); return(new attackPart(f));
} }

6
src/gameplay/match/match.java
View File

@ -192,13 +192,15 @@ public class match {
if (glfwJoystickPresent(GLFW_JOYSTICK_1)) { if (glfwJoystickPresent(GLFW_JOYSTICK_1)) {
gamepad1.inputRefresh(); gamepad1.inputRefresh();
inputsP1.recordInputsFromGamepad(gamepad1, p1.getPosX() < p2.getPosX()); inputsP1.recordInputsFromGamepad(gamepad1, p1.getPosX() < p2.getPosX());
handleInputs(p1, inputsP1);
} }
if (glfwJoystickPresent(GLFW_JOYSTICK_2)) { if (glfwJoystickPresent(GLFW_JOYSTICK_2)) {
gamepad2.inputRefresh(); gamepad2.inputRefresh();
inputsP2.recordInputsFromGamepad(gamepad2, p2.getPosX() <= p1.getPosX()); inputsP2.recordInputsFromGamepad(gamepad2, p2.getPosX() <= p1.getPosX());
}
handleInputs(p1, inputsP1);
handleInputs(p2, inputsP2); handleInputs(p2, inputsP2);
}
//
acCode = 21; acCode = 21;
break; break;