mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-01 10:52:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4930 from laytan/js-gamepad-improvements

Browse Source 
core/sys/wasm/js: improve gamepad API
This commit is contained in:
gingerBill
2025-03-13 09:21:15 +00:00
committed by GitHub
parent d3b1aaad18 d349c96071
commit 9b7aebe2b6
2 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/sys/wasm/js/events.odin
View File

@@ -189,7 +189,7 @@ Key_Location :: enum u8 {
KEYBOARD_MAX_KEY_SIZE :: 32
KEYBOARD_MAX_CODE_SIZE :: 32
GAMEPAD_MAX_ID_SIZE :: 64
GAMEPAD_MAX_ID_SIZE :: 96
GAMEPAD_MAX_MAPPING_SIZE :: 64
GAMEPAD_MAX_BUTTONS :: 64
@@ -384,7 +384,14 @@ get_gamepad_state :: proc "contextless" (index: int, s: ^Gamepad_State) -> bool
if s == nil {
return false
}
return _get_gamepad_state(index, s)
if !_get_gamepad_state(index, s) {
return false
}
s.id = string(s._id_buf[:s._id_len])
s.mapping = string(s._mapping_buf[:s._mapping_len])
return true
}
@@ -415,4 +422,4 @@ do_event_callback :: proc(user_data: rawptr, callback: proc(e: Event)) {
callback(event)
}
}
}

44
core/sys/wasm/js/odin.js
View File

@@ -1588,10 +1588,24 @@ function odinSetupDefaultImports(wasmMemoryInterface, consoleElement, memory) {
}
}
wmi.storeInt(off(W, W), e.gamepad.id.length)
wmi.storeInt(off(W, W), e.gamepad.mapping.length)
wmi.storeString(off(64, 1), e.gamepad.id);
wmi.storeString(off(64, 1), e.gamepad.mapping);
let idLength = e.gamepad.id.length;
let id = e.gamepad.id;
if (idLength > 96) {
idLength = 96;
id = id.slice(0, 93) + '...';
}
let mappingLength = e.gamepad.mapping.length;
let mapping = e.gamepad.mapping;
if (mappingLength > 64) {
mappingLength = 61;
mapping = mapping.slice(0, 61) + '...';
}
wmi.storeInt(off(W, W), idLength);
wmi.storeInt(off(W, W), mappingLength);
wmi.storeString(off(96, 1), id);
wmi.storeString(off(64, 1), mapping);
}
},
@@ -1756,10 +1770,24 @@ function odinSetupDefaultImports(wasmMemoryInterface, consoleElement, memory) {
}
}
wmi.storeInt(off(W, W), gamepad.id.length)
wmi.storeInt(off(W, W), gamepad.mapping.length)
wmi.storeString(off(64, 1), gamepad.id);
wmi.storeString(off(64, 1), gamepad.mapping);
let idLength = gamepad.id.length;
let id = gamepad.id;
if (idLength > 96) {
idLength = 96;
id = id.slice(0, 93) + '...';
}
let mappingLength = gamepad.mapping.length;
let mapping = gamepad.mapping;
if (mappingLength > 64) {
mappingLength = 61;
mapping = mapping.slice(0, 61) + '...';
}
wmi.storeInt(off(W, W), idLength);
wmi.storeInt(off(W, W), mappingLength);
wmi.storeString(off(96, 1), id);
wmi.storeString(off(64, 1), mapping);
return true;
}