Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Update moz_external_vr.h #3007

Merged
merged 1 commit into from
Mar 19, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions app/src/main/cpp/moz_external_vr.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ namespace gfx {
// and mapped files if we have both release and nightlies
// running at the same time? Or...what if we have multiple
// release builds running on same machine? (Bug 1563232)
#define SHMEM_VERSION "0.0.7"
static const int32_t kVRExternalVersion = 14;
#define SHMEM_VERSION "0.0.8"
static const int32_t kVRExternalVersion = 15;

// We assign VR presentations to groups with a bitmask.
// Currently, we will only display either content or chrome.
Expand Down Expand Up @@ -131,6 +131,16 @@ enum class ControllerCapabilityFlags : uint16_t {

#endif // ifndef MOZILLA_INTERNAL_API

enum class VRControllerType : uint8_t {
_empty,
Vive,
WMR,
Knuckles,
Cosmos,
OculusTouch,
_end
};

enum class TargetRayMode : uint8_t { Gaze, TrackedPointer, Screen };

enum class GamepadMappingType : uint8_t { _empty, Standard, XRStandard };
Expand Down Expand Up @@ -341,6 +351,9 @@ struct VRControllerState {
#else
ControllerHand hand;
#endif
// For WebXR->WebVR mapping conversion, once we remove WebVR,
// we can remove this item.
VRControllerType type;
// https://immersive-web.github.io/webxr/#enumdef-xrtargetraymode
TargetRayMode targetRayMode;

Expand Down Expand Up @@ -551,15 +564,15 @@ enum class VRTelemetryId : uint8_t {
TOTAL = 4,
};

enum class VRTelemetryInstallFrom: uint8_t {
enum class VRTelemetryInstallFrom : uint8_t {
User = 0,
FxR = 1,
HTC = 2,
Valve = 3,
TOTAL = 4,
};

enum class VRTelemetryEntryMethod: uint8_t {
enum class VRTelemetryEntryMethod : uint8_t {
SystemBtn = 0,
Library = 1,
Gaze = 2,
Expand Down