@@ -47,8 +47,8 @@ namespace gfx {
47
47
// and mapped files if we have both release and nightlies
48
48
// running at the same time? Or...what if we have multiple
49
49
// release builds running on same machine? (Bug 1563232)
50
- #define SHMEM_VERSION " 0.0.7 "
51
- static const int32_t kVRExternalVersion = 14 ;
50
+ #define SHMEM_VERSION " 0.0.8 "
51
+ static const int32_t kVRExternalVersion = 15 ;
52
52
53
53
// We assign VR presentations to groups with a bitmask.
54
54
// Currently, we will only display either content or chrome.
@@ -131,6 +131,16 @@ enum class ControllerCapabilityFlags : uint16_t {
131
131
132
132
#endif // ifndef MOZILLA_INTERNAL_API
133
133
134
+ enum class VRControllerType : uint8_t {
135
+ _empty,
136
+ Vive,
137
+ WMR,
138
+ Knuckles,
139
+ Cosmos,
140
+ OculusTouch,
141
+ _end
142
+ };
143
+
134
144
enum class TargetRayMode : uint8_t { Gaze, TrackedPointer, Screen };
135
145
136
146
enum class GamepadMappingType : uint8_t { _empty, Standard, XRStandard };
@@ -341,6 +351,9 @@ struct VRControllerState {
341
351
#else
342
352
ControllerHand hand;
343
353
#endif
354
+ // For WebXR->WebVR mapping conversion, once we remove WebVR,
355
+ // we can remove this item.
356
+ VRControllerType type;
344
357
// https://immersive-web.github.io/webxr/#enumdef-xrtargetraymode
345
358
TargetRayMode targetRayMode;
346
359
@@ -551,15 +564,15 @@ enum class VRTelemetryId : uint8_t {
551
564
TOTAL = 4 ,
552
565
};
553
566
554
- enum class VRTelemetryInstallFrom : uint8_t {
567
+ enum class VRTelemetryInstallFrom : uint8_t {
555
568
User = 0 ,
556
569
FxR = 1 ,
557
570
HTC = 2 ,
558
571
Valve = 3 ,
559
572
TOTAL = 4 ,
560
573
};
561
574
562
- enum class VRTelemetryEntryMethod : uint8_t {
575
+ enum class VRTelemetryEntryMethod : uint8_t {
563
576
SystemBtn = 0 ,
564
577
Library = 1 ,
565
578
Gaze = 2 ,
0 commit comments