瀏覽代碼

Merge pull request #12743 from BastiaanOlij/increase_joystick_maxaxis

Increase joystick axis from 8 to 10
Andreas Haas 7 年之前
父節點
當前提交
30620434e1
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 2 0
      core/global_constants.cpp
  2. 3 1
      core/os/input_event.h

+ 2 - 0
core/global_constants.cpp

@@ -435,6 +435,8 @@ void register_global_constants() {
 	BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_5);
 	BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_6);
 	BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_7);
+	BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_8);
+	BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_9);
 	BIND_GLOBAL_ENUM_CONSTANT(JOY_AXIS_MAX);
 
 	BIND_GLOBAL_ENUM_CONSTANT(JOY_ANALOG_LX);

+ 3 - 1
core/os/input_event.h

@@ -122,7 +122,9 @@ enum JoystickList {
 	JOY_AXIS_5 = 5,
 	JOY_AXIS_6 = 6,
 	JOY_AXIS_7 = 7,
-	JOY_AXIS_MAX = 8,
+	JOY_AXIS_8 = 8,
+	JOY_AXIS_9 = 9,
+	JOY_AXIS_MAX = 10,
 
 	JOY_ANALOG_LX = JOY_AXIS_0,
 	JOY_ANALOG_LY = JOY_AXIS_1,