mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-09-12 04:49:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

more small cleanupses (#1722)

Browse Source 
* reduce max supersampling options in progress menu

* cleanup knuth rng file

* save & load cheats

* allow keyboard controls when cpad is connected

* ignore key presses when imgui is being used

* save settings when quitting game
This commit is contained in:
ManDude
2022-08-04 02:51:13 +01:00
committed by GitHub
parent 3e538dabe6
commit 5148523917
7 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/system/newpad.cpp
+13 -6
View File
@@ -8,10 +8,12 @@
#include "common/log/log.h"
#include "common/util/Assert.h"
#include <common/util/FileUtil.h>
#include "common/util/FileUtil.h"
#include "game/graphics/pipelines/opengl.h" // for GLFW macros
#include "third-party/imgui/imgui.h"
namespace Pad {
/*
@@ -57,6 +59,10 @@ void ClearKeys() {
}
void OnKeyPress(int key) {
if (ImGui::IsAnyItemActive()) {
return;
}
if (input_mode == InputModeStatus::Enabled) {
if (key == GLFW_KEY_ESCAPE) {
ExitInputMode(true);
@@ -118,14 +124,13 @@ int IsPressed(MappingInfo& mapping, Button button, int pad = 0) {
// returns the value of the analog axis (in the future, likely pressure sensitive if we support it?)
// if invalid or otherwise -- returns 127 (analog stick neutral position)
int AnalogValue(MappingInfo& /*mapping*/, Analog analog, int pad = 0) {
float input = 0.0f;
if (CheckPadIdx(pad) == -1) {
// Pad out of range, return a stable value
return 127;
}
if (pad == 0 && g_gamepads.gamepad_idx[0] == -1) { // Gamepad not present - use keyboard
float input = 0.0f;
if (pad == 0) {
// Movement controls mapped to WASD keys
if (g_buffered_key_status[GLFW_KEY_W] && analog == Analog::Left_Y)
input += -1.0f;
@@ -145,7 +150,7 @@ int AnalogValue(MappingInfo& /*mapping*/, Analog analog, int pad = 0) {
input += -1.0f;
if (g_buffered_key_status[GLFW_KEY_L] && analog == Analog::Right_X)
input += 1.0f;
} else if (pad == 1 && g_gamepads.gamepad_idx[1] == -1) {
} else if (pad == 1) {
// these bindings are not sane
if (g_buffered_key_status[GLFW_KEY_KP_5] && analog == Analog::Left_Y)
input += -1.0f;
@@ -165,7 +170,9 @@ int AnalogValue(MappingInfo& /*mapping*/, Analog analog, int pad = 0) {
input += -1.0f;
if (g_buffered_key_status[GLFW_KEY_KP_9] && analog == Analog::Right_X)
input += 1.0f;
} else { // Gamepad present
}
if (input == 0) {
input = g_gamepad_analogs[pad][(int)analog];
}