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

Button peut maintenant prendre les inputs du clavier même s'il n'y a pas de manette branchée !

Browse Source
This commit is contained in:
Antoine 2021-06-07 15:03:23 +02:00
parent 33375d4680
commit 9ea45e793a
4 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/engine/Engine.java
View File

@ -230,6 +230,7 @@ public class Engine {
obj1,
obj2,
this);
this.cameraTrackingBetweenTwoObjectGl();
}
public void cameraTrackingBetweenTwoObjectGl(){

34
src/engine/TestEngine.java
View File

@ -98,18 +98,18 @@ public class TestEngine {
if (Joystick1Present){
gamepad1 = new GamepadInput(GLFW_JOYSTICK_1);
gamepad1.inputRefresh();
List<Integer> listZoomPlus = new ArrayList<>();
listZoomPlus.add(InputConst.buttonA);
List<Integer> listZoomMinusKeyboard = new ArrayList<>();
listZoomMinusKeyboard.add(GLFW_KEY_R);
List<Integer> listZoomMinus = new ArrayList<>();
listZoomMinus.add(InputConst.buttonB);
List<Integer> listZoomPlusKeyboard = new ArrayList<>();
listZoomPlusKeyboard.add(GLFW_KEY_F);
zoom = new Button("zoom", listZoomPlus, listZoomPlusKeyboard, gamepad1);
dezoom = new Button("dezoom", listZoomMinus, listZoomMinusKeyboard, gamepad1);
}
List<Integer> listZoomPlus = new ArrayList<>();
listZoomPlus.add(InputConst.buttonA);
List<Integer> listZoomMinusKeyboard = new ArrayList<>();
listZoomMinusKeyboard.add(GLFW_KEY_R);
List<Integer> listZoomMinus = new ArrayList<>();
listZoomMinus.add(InputConst.buttonB);
List<Integer> listZoomPlusKeyboard = new ArrayList<>();
listZoomPlusKeyboard.add(GLFW_KEY_F);
zoom = new Button("zoom", listZoomPlus, listZoomPlusKeyboard, gamepad1);
dezoom = new Button("dezoom", listZoomMinus, listZoomMinusKeyboard, gamepad1);
engine.translateView(new Vector3f(0.0f, -125.0f, 0.0f));
while (engine.getRunning()) {
@ -118,13 +118,13 @@ public class TestEngine {
if (Joystick1Present) {
gamepad1.inputRefresh();
// Check si le personnage a sauté
if (zoom.isButtonPressed()){
// Le personnage saute
engine.getCamera().zoom(1.001f);
}if(dezoom.isButtonPressed()){
engine.getCamera().zoom(0.999f);
}
}
// Check si le personnage a sauté
if (zoom.isButtonPressed()){
// Le personnage saute
engine.getCamera().zoom(1.001f);
}if(dezoom.isButtonPressed()){
engine.getCamera().zoom(0.999f);
}
// engine.cameraTrackingObjectGl(zangief, -250.0f);

2
src/engine/camera/TrackingTore.java
View File

@ -31,7 +31,7 @@ public class TrackingTore implements TrackingDummy {
float xPos = this.engine.getViewXPos();
float dimension = this.engine.getCamera().getDimension();
float distance = Math.abs(left.getXPos() - right.getXPos()) + right.getWidth() * right.getScalingFactor();
float middle_point = (left.getXPos() + right.getXPos() + right.getWidth() * right.getScalingFactor()) / 2;
float middle_point = (left.getXPos() + right.getXPos() + right.getWidth() * right.getScalingFactor()) / 2;
if (left.getXPos() < xPos - rayonExt){
// Il faut décaler à gauche + dezoom

9
src/engine/input/Button.java
View File

@ -21,9 +21,12 @@ public class Button {
}
public boolean isButtonPressed(){
for (int i : buttonsGamepad){
if (controller.checkPressed(i)) return true;
} for (int i : buttonsKeyboard){
if (controller != null){
for (int i : buttonsGamepad){
if (controller.checkPressed(i)) return true;
}
}
for (int i : buttonsKeyboard){
if (glfwGetKey(Engine.getWindow(), i) == 1) return true;
}
return false;