Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1621369 - Part 4: Support WebXR to WebVR gamepad button/axis re-mapping. r=kip

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D66680

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Daosheng Mu 2020-03-13 20:57:15 +00:00
parent 81a78595ce
commit 9258842ca9
2 changed files with 94 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
gfx/vr/VRDisplayClient.cpp
View File

@ -115,17 +115,107 @@ void VRDisplayClient::FireEvents() {
vm->RunFrameRequestCallbacks();
}
// We only call FireGamepadEvents() in WebVR instead of WebXR
FireGamepadEvents();
}
void VRDisplayClient::GamepadMappingForWebVR(
VRControllerState& aControllerState) {
float triggerValue[kVRControllerMaxButtons];
memcpy(triggerValue, aControllerState.triggerValue,
sizeof(aControllerState.triggerValue));
const uint64_t buttonPressed = aControllerState.buttonPressed;
const uint64_t buttonTouched = aControllerState.buttonTouched;
auto SetTriggerValue = [&](uint64_t newSlot, uint64_t oldSlot) {
aControllerState.triggerValue[newSlot] = triggerValue[oldSlot];
};
auto ShiftButtonBitForNewSlot = [&](uint64_t newSlot, uint64_t oldSlot,
bool aIsTouch = false) {
if (aIsTouch) {
return ((buttonTouched & (1ULL << oldSlot)) != 0) * (1ULL << newSlot);
}
SetTriggerValue(newSlot, oldSlot);
return ((buttonPressed & (1ULL << oldSlot)) != 0) * (1ULL << newSlot);
};
switch (aControllerState.type) {
case VRControllerType::Vive:
aControllerState.buttonPressed =
ShiftButtonBitForNewSlot(1, 0) | ShiftButtonBitForNewSlot(2, 1) |
ShiftButtonBitForNewSlot(0, 2) | ShiftButtonBitForNewSlot(3, 4);
aControllerState.buttonTouched = ShiftButtonBitForNewSlot(0, 1, true) |
ShiftButtonBitForNewSlot(2, 1, true) |
ShiftButtonBitForNewSlot(0, 2, true) |
ShiftButtonBitForNewSlot(3, 4, true);
aControllerState.numButtons = 4;
aControllerState.numAxes = 2;
break;
case VRControllerType::WMR:
aControllerState.buttonPressed =
ShiftButtonBitForNewSlot(1, 0) | ShiftButtonBitForNewSlot(2, 1) |
ShiftButtonBitForNewSlot(0, 2) | ShiftButtonBitForNewSlot(3, 3) |
ShiftButtonBitForNewSlot(4, 4);
aControllerState.buttonTouched = ShiftButtonBitForNewSlot(1, 0, true) |
ShiftButtonBitForNewSlot(2, 1, true) |
ShiftButtonBitForNewSlot(0, 2, true) |
ShiftButtonBitForNewSlot(3, 3, true) |
ShiftButtonBitForNewSlot(4, 4, true);
aControllerState.numButtons = 5;
aControllerState.numAxes = 4;
break;
case VRControllerType::Cosmos:
aControllerState.buttonPressed =
ShiftButtonBitForNewSlot(0, 0) | ShiftButtonBitForNewSlot(1, 1) |
ShiftButtonBitForNewSlot(4, 3) | ShiftButtonBitForNewSlot(2, 4) |
ShiftButtonBitForNewSlot(3, 5) | ShiftButtonBitForNewSlot(5, 6);
aControllerState.buttonTouched = ShiftButtonBitForNewSlot(0, 0, true) |
ShiftButtonBitForNewSlot(1, 1, true) |
ShiftButtonBitForNewSlot(4, 3, true) |
ShiftButtonBitForNewSlot(2, 4, true) |
ShiftButtonBitForNewSlot(3, 5, true) |
ShiftButtonBitForNewSlot(5, 6, true);
aControllerState.axisValue[0] = aControllerState.axisValue[2];
aControllerState.axisValue[1] = aControllerState.axisValue[3];
aControllerState.numButtons = 6;
aControllerState.numAxes = 2;
break;
case VRControllerType::OculusTouch:
aControllerState.buttonPressed =
ShiftButtonBitForNewSlot(0, 3) | ShiftButtonBitForNewSlot(1, 0) |
ShiftButtonBitForNewSlot(2, 1) | ShiftButtonBitForNewSlot(3, 4) |
ShiftButtonBitForNewSlot(4, 5) | ShiftButtonBitForNewSlot(5, 6);
aControllerState.buttonTouched = ShiftButtonBitForNewSlot(0, 3, true) |
ShiftButtonBitForNewSlot(1, 0, true) |
ShiftButtonBitForNewSlot(2, 1, true) |
ShiftButtonBitForNewSlot(3, 4, true) |
ShiftButtonBitForNewSlot(4, 5, true) |
ShiftButtonBitForNewSlot(5, 6, true);
aControllerState.axisValue[0] = aControllerState.axisValue[2];
aControllerState.axisValue[1] = aControllerState.axisValue[3];
aControllerState.numButtons = 6;
aControllerState.numAxes = 2;
break;
default:
// Undefined controller type, we will keep its the same order.
break;
}
}
void VRDisplayClient::FireGamepadEvents() {
RefPtr<dom::GamepadManager> gamepadManager(dom::GamepadManager::GetService());
if (!gamepadManager) {
return;
}
for (int stateIndex = 0; stateIndex < kVRControllerMaxCount; stateIndex++) {
const VRControllerState& state = mDisplayInfo.mControllerState[stateIndex];
const VRControllerState& lastState = mLastEventControllerState[stateIndex];
VRControllerState state = {}, lastState = {};
memcpy(&state, &mDisplayInfo.mControllerState[stateIndex],
sizeof(VRControllerState));
memcpy(&lastState, &mLastEventControllerState[stateIndex],
sizeof(VRControllerState));
GamepadMappingForWebVR(state);
GamepadMappingForWebVR(lastState);
uint32_t gamepadId =
mDisplayInfo.mDisplayID * kVRControllerMaxCount + stateIndex;
bool bIsNew = false;

2
gfx/vr/VRDisplayClient.h
View File

@ -70,6 +70,8 @@ class VRDisplayClient {
VRControllerState mLastEventControllerState[kVRControllerMaxCount];
private:
void GamepadMappingForWebVR(VRControllerState& aControllerState);
VRSubmitFrameResultInfo mSubmitFrameResult;
};