Apple-2-SW
/
lawless-legends
mirror of https://github.com/badvision/lawless-legends.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update joystick DB logic to respect OS

This commit is contained in:
Brendan Robert 2024-03-09 22:42:31 -06:00
parent f0b87d07ec
commit 904a6f5216
2 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Platform/Apple/tools/jace/src/main/java/jace/core/Utility.java
View File

@ -389,5 +389,20 @@ public class Utility {
}
}
return nameMatch;
}
}
public static enum OS {Windows, Linux, Mac, Unknown}
public static OS getOS() {
String osName = System.getProperty("os.name").toLowerCase();
if (osName.contains("windows")) {
return OS.Windows;
} else if (osName.contains("Linux")) {
return OS.Linux;
} else if (osName.contains("Mac")) {
return OS.Mac;
} else {
System.out.println("Unknown %s".formatted(osName));
return OS.Unknown;
}
}
}

48
Platform/Apple/tools/jace/src/main/java/jace/hardware/Joystick.java
View File

@ -37,6 +37,8 @@ import jace.core.Device;
import jace.core.Keyboard;
import jace.core.RAMEvent;
import jace.core.RAMListener;
import jace.core.Utility;
import jace.core.Utility.OS;
import jace.state.Stateful;
import javafx.application.Platform;
import javafx.scene.input.MouseEvent;
@ -91,8 +93,12 @@ public class Joystick extends Device {
}
}
static Map<String, ControllerMapping> controllerMappings = new HashMap<>();
static Map<OS, Map<String, ControllerMapping>> controllerMappings = new HashMap<>();
static void parseGameControllerDB(String mappings) {
for (OS os : OS.values()) {
controllerMappings.put(os, new HashMap<>());
}
// File format:
// Any line starting with a # or empty is a comment
// Format is GUID, name, mappings
@ -116,7 +122,7 @@ public class Joystick extends Device {
ControllerMapping controller = new ControllerMapping();
controller.guid = guid;
controller.name = name;
controllerMappings.put(guid, controller);
OS os = OS.Unknown;
// Split the mapping into parts
for (int i = 2; i < parts.length; i++) {
String[] mappingParts = parts[i].split(":");
@ -160,12 +166,18 @@ public class Joystick extends Device {
} else {
if (target.equals("platform")) {
controller.platform = source;
if (source.toLowerCase().contains("windows")) {
os = OS.Windows;
} else if (source.toLowerCase().contains("mac")) {
os = OS.Mac;
} else if (source.toLowerCase().contains("linux")) {
os = OS.Linux;
}
}
}
}
controllerMappings.get(os).put(guid, controller);
}
}
@ConfigurableField(name = "Center Mouse", shortName = "center", description = "Moves mouse back to the center of the screen, can get annoying.")
@ -485,7 +497,33 @@ public class Joystick extends Device {
controllerNumber = null;
Integer controllerNum = getControllerNum();
if (controllerNum != null) {
controllerMapping = controllerMappings.get(GLFW.glfwGetJoystickGUID(controllerNum));
OS currentOS = Utility.getOS();
OS[] searchOrder = {};
switch (currentOS) {
case Linux:
searchOrder = new OS[]{OS.Linux, OS.Windows, OS.Mac, OS.Unknown};
break;
case Mac:
searchOrder = new OS[]{OS.Mac, OS.Windows, OS.Linux, OS.Unknown};
break;
case Unknown:
searchOrder = new OS[]{OS.Unknown, OS.Linux, OS.Windows, OS.Mac};
break;
case Windows:
searchOrder = new OS[]{OS.Windows, OS.Unknown, OS.Linux, OS.Mac};
break;
default:
break;
}
String guid = GLFW.glfwGetJoystickGUID(controllerNum);
controllerMapping = null;
for (OS searchOS : searchOrder) {
if (controllerMappings.get(searchOS).containsKey(guid)) {
System.out.println("Found mapping for %s, OS=%s".formatted(guid, searchOS));
controllerMapping = controllerMappings.get(searchOS).get(guid);
break;
}
}
if (controllerMapping != null) {
System.out.println("Using controller " + controllerMapping.name);
} else {