fix a game controller issue.

IppClub · Nov 20, 2023 · 54aa919 · 54aa919
1 parent 8db7d0d
commit 54aa919
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Assets/Script/Lib/Dora/en/Controller.d.tl b/Assets/Script/Lib/Dora/en/Controller.d.tl
@@ -8,6 +8,8 @@ local record Controller
 		"lefty"
 		"rightx"
 		"righty"
+		"lefttrigger"
+		"righttrigger"
 	end
 
 	-- Enumeration for defining the controller button names.
@@ -21,10 +23,8 @@ local record Controller
 		"dpup"
 		"leftshoulder"
 		"leftstick"
-		"lefttrigger"
 		"rightshoulder"
 		"rightstick"
-		"righttrigger"
 		"start"
 		"x"
 		"y"

diff --git a/Assets/Script/Lib/Dora/zh-Hans/Controller.d.tl b/Assets/Script/Lib/Dora/zh-Hans/Controller.d.tl
@@ -8,6 +8,8 @@ local record Controller
 		"lefty"
 		"rightx"
 		"righty"
+		"lefttrigger"
+		"righttrigger"
 	end
 
 	-- 用于定义控制器按钮名称的枚举。
@@ -21,10 +23,8 @@ local record Controller
 		"dpup"
 		"leftshoulder"
 		"leftstick"
-		"lefttrigger"
 		"rightshoulder"
 		"rightstick"
-		"righttrigger"
 		"start"
 		"x"
 		"y"

diff --git a/Source/Input/Controller.cpp b/Source/Input/Controller.cpp
@@ -113,7 +113,7 @@ void Controller::addControllerInRender(int deviceIndex) {
 			_deviceMap[joystickId] = New<Device>(deviceId, controller);
 		});
 	} else {
-		Error("failed to open a new controller! {}", SDL_GetError());
+		Warn("failed to open a new controller! {}", SDL_GetError());
 	}
 }
 
@@ -156,10 +156,13 @@ void Controller::handleEventInRender(const SDL_Event& event) {
 			bool isDown = event.cbutton.state > 0;
 			SharedApplication.invokeInLogic([buttonName, joystickId, isDown, this]() {
 				if (auto it = _deviceMap.find(joystickId); it != _deviceMap.end()) {
-					Device::ButtonState state;
+					Device::ButtonState state{.oldState = false, .newState = false};
 					if (auto bit = it->second->buttonMap.find(buttonName); bit != it->second->buttonMap.end()) {
 						bit->second.newState = isDown;
 						state = bit->second;
+					} else {
+						state.newState = isDown;
+						it->second->buttonMap[buttonName] = state;
 					}
 					if (!state.oldState && state.newState) {
 						EventArgs<int, Slice> button("ButtonDown"_slice, it->second->id, buttonName);