Merging with develop

This commit is contained in:
Zoe Roux
2021-06-14 13:50:47 +02:00
61 changed files with 2026 additions and 924 deletions
+4 -4
View File
@@ -33,9 +33,9 @@ namespace BBM
key.second = gamepad.isDown(key.first);
controllable.move.x = gamepad.getAxisValue(gamepadComponent.LeftStickX) * -1;
controllable.move.y = gamepad.getAxisValue(gamepadComponent.LeftStickY) * -1;
controllable.move.x -= gamepad.isDown(gamepadComponent.keyRight);
controllable.move.x += gamepad.isDown(gamepadComponent.keyLeft);
controllable.move.y += gamepad.isDown(gamepadComponent.keyUp);
controllable.move.y -= gamepad.isDown(gamepadComponent.keyDown);
controllable.move.x -= static_cast<float>(gamepad.isDown(gamepadComponent.keyRight));
controllable.move.x += static_cast<float>(gamepad.isDown(gamepadComponent.keyLeft));
controllable.move.y += static_cast<float>(gamepad.isDown(gamepadComponent.keyUp));
controllable.move.y -= static_cast<float>(gamepad.isDown(gamepadComponent.keyDown));
}
}