Skip to content

Commit 64fc059

Browse files
committed
OpenVR SDK 1.1.3b:
* Fixed issue with EVRSkeletalTrackingLevel not being defined in openvr_driver.h Fixes #947 [git-p4: depot-paths = "//vr/steamvr/sdk_release/": change = 4837752]
1 parent 25d2b81 commit 64fc059

File tree

5 files changed

+68
-45
lines changed

5 files changed

+68
-45
lines changed

headers/openvr.h

+22-21
Original file line numberDiff line numberDiff line change
@@ -1361,6 +1361,28 @@ enum EVRSkeletalMotionRange
13611361
VRSkeletalMotionRange_WithoutController = 1,
13621362
};
13631363

1364+
enum EVRSkeletalTrackingLevel
1365+
{
1366+
// body part location can’t be directly determined by the device. Any skeletal pose provided by
1367+
// the device is estimated by assuming the position required to active buttons, triggers, joysticks,
1368+
// or other input sensors.
1369+
// E.g. Vive Controller, Gamepad
1370+
VRSkeletalTracking_Estimated = 0,
1371+
1372+
// body part location can be measured directly but with fewer degrees of freedom than the actual body
1373+
// part. Certain body part positions may be unmeasured by the device and estimated from other input data.
1374+
// E.g. Knuckles, gloves that only measure finger curl
1375+
VRSkeletalTracking_Partial,
1376+
1377+
// Body part location can be measured directly throughout the entire range of motion of the body part.
1378+
// E.g. Mocap suit for the full body, gloves that measure rotation of each finger segment
1379+
VRSkeletalTracking_Full,
1380+
1381+
VRSkeletalTrackingLevel_Count,
1382+
VRSkeletalTrackingLevel_Max = VRSkeletalTrackingLevel_Count - 1
1383+
};
1384+
1385+
13641386

13651387
/** Holds the transform for a single bone */
13661388
struct VRBoneTransform_t
@@ -4117,27 +4139,6 @@ namespace vr
41174139
VRFingerSplay_Count
41184140
};
41194141

4120-
enum EVRSkeletalTrackingLevel
4121-
{
4122-
// body part location can’t be directly determined by the device. Any skeletal pose provided by
4123-
// the device is estimated by assuming the position required to active buttons, triggers, joysticks,
4124-
// or other input sensors.
4125-
// E.g. Vive Controller, Gamepad
4126-
VRSkeletalTracking_Estimated = 0,
4127-
4128-
// body part location can be measured directly but with fewer degrees of freedom than the actual body
4129-
// part. Certain body part positions may be unmeasured by the device and estimated from other input data.
4130-
// E.g. Knuckles, gloves that only measure finger curl
4131-
VRSkeletalTracking_Partial,
4132-
4133-
// Body part location can be measured directly throughout the entire range of motion of the body part.
4134-
// E.g. Mocap suit for the full body, gloves that measure rotation of each finger segment
4135-
VRSkeletalTracking_Full,
4136-
4137-
VRSkeletalTrackingLevel_Count,
4138-
VRSkeletalTrackingLevel_Max = VRSkeletalTrackingLevel_Count - 1
4139-
};
4140-
41414142
enum EVRInputFilterCancelType
41424143
{
41434144
VRInputFilterCancel_Timers = 0,

headers/openvr_api.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -4272,6 +4272,14 @@ public enum EVRSkeletalMotionRange
42724272
WithController = 0,
42734273
WithoutController = 1,
42744274
}
4275+
public enum EVRSkeletalTrackingLevel
4276+
{
4277+
VRSkeletalTracking_Estimated = 0,
4278+
VRSkeletalTracking_Partial = 1,
4279+
VRSkeletalTracking_Full = 2,
4280+
Count = 3,
4281+
Max = 2,
4282+
}
42754283
public enum EVRInitError
42764284
{
42774285
None = 0,
@@ -4684,14 +4692,6 @@ public enum EVRFingerSplay
46844692
Ring_Pinky = 3,
46854693
Count = 4,
46864694
}
4687-
public enum EVRSkeletalTrackingLevel
4688-
{
4689-
VRSkeletalTracking_Estimated = 0,
4690-
VRSkeletalTracking_Partial = 1,
4691-
VRSkeletalTracking_Full = 2,
4692-
Count = 3,
4693-
Max = 2,
4694-
}
46954695
public enum EVRInputFilterCancelType
46964696
{
46974697
VRInputFilterCancel_Timers = 0,

headers/openvr_api.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,13 @@
602602
{"name": "VRSkeletalMotionRange_WithController","value": "0"}
603603
,{"name": "VRSkeletalMotionRange_WithoutController","value": "1"}
604604
]}
605+
, {"enumname": "vr::EVRSkeletalTrackingLevel","values": [
606+
{"name": "VRSkeletalTracking_Estimated","value": "0"}
607+
,{"name": "VRSkeletalTracking_Partial","value": "1"}
608+
,{"name": "VRSkeletalTracking_Full","value": "2"}
609+
,{"name": "VRSkeletalTrackingLevel_Count","value": "3"}
610+
,{"name": "VRSkeletalTrackingLevel_Max","value": "2"}
611+
]}
605612
, {"enumname": "vr::EVRInitError","values": [
606613
{"name": "VRInitError_None","value": "0"}
607614
,{"name": "VRInitError_Unknown","value": "1"}
@@ -978,13 +985,6 @@
978985
,{"name": "VRFingerSplay_Ring_Pinky","value": "3"}
979986
,{"name": "VRFingerSplay_Count","value": "4"}
980987
]}
981-
, {"enumname": "vr::EVRSkeletalTrackingLevel","values": [
982-
{"name": "VRSkeletalTracking_Estimated","value": "0"}
983-
,{"name": "VRSkeletalTracking_Partial","value": "1"}
984-
,{"name": "VRSkeletalTracking_Full","value": "2"}
985-
,{"name": "VRSkeletalTrackingLevel_Count","value": "3"}
986-
,{"name": "VRSkeletalTrackingLevel_Max","value": "2"}
987-
]}
988988
, {"enumname": "vr::EVRInputFilterCancelType","values": [
989989
{"name": "VRInputFilterCancel_Timers","value": "0"}
990990
,{"name": "VRInputFilterCancel_Momentum","value": "1"}

headers/openvr_capi.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -922,6 +922,15 @@ typedef enum EVRSkeletalMotionRange
922922
EVRSkeletalMotionRange_VRSkeletalMotionRange_WithoutController = 1,
923923
} EVRSkeletalMotionRange;
924924

925+
typedef enum EVRSkeletalTrackingLevel
926+
{
927+
EVRSkeletalTrackingLevel_VRSkeletalTracking_Estimated = 0,
928+
EVRSkeletalTrackingLevel_VRSkeletalTracking_Partial = 1,
929+
EVRSkeletalTrackingLevel_VRSkeletalTracking_Full = 2,
930+
EVRSkeletalTrackingLevel_VRSkeletalTrackingLevel_Count = 3,
931+
EVRSkeletalTrackingLevel_VRSkeletalTrackingLevel_Max = 2,
932+
} EVRSkeletalTrackingLevel;
933+
925934
typedef enum EVRInitError
926935
{
927936
EVRInitError_VRInitError_None = 0,
@@ -1370,15 +1379,6 @@ typedef enum EVRFingerSplay
13701379
EVRFingerSplay_VRFingerSplay_Count = 4,
13711380
} EVRFingerSplay;
13721381

1373-
typedef enum EVRSkeletalTrackingLevel
1374-
{
1375-
EVRSkeletalTrackingLevel_VRSkeletalTracking_Estimated = 0,
1376-
EVRSkeletalTrackingLevel_VRSkeletalTracking_Partial = 1,
1377-
EVRSkeletalTrackingLevel_VRSkeletalTracking_Full = 2,
1378-
EVRSkeletalTrackingLevel_VRSkeletalTrackingLevel_Count = 3,
1379-
EVRSkeletalTrackingLevel_VRSkeletalTrackingLevel_Max = 2,
1380-
} EVRSkeletalTrackingLevel;
1381-
13821382
typedef enum EVRInputFilterCancelType
13831383
{
13841384
EVRInputFilterCancelType_VRInputFilterCancel_Timers = 0,

headers/openvr_driver.h

+22
Original file line numberDiff line numberDiff line change
@@ -1361,6 +1361,28 @@ enum EVRSkeletalMotionRange
13611361
VRSkeletalMotionRange_WithoutController = 1,
13621362
};
13631363

1364+
enum EVRSkeletalTrackingLevel
1365+
{
1366+
// body part location can’t be directly determined by the device. Any skeletal pose provided by
1367+
// the device is estimated by assuming the position required to active buttons, triggers, joysticks,
1368+
// or other input sensors.
1369+
// E.g. Vive Controller, Gamepad
1370+
VRSkeletalTracking_Estimated = 0,
1371+
1372+
// body part location can be measured directly but with fewer degrees of freedom than the actual body
1373+
// part. Certain body part positions may be unmeasured by the device and estimated from other input data.
1374+
// E.g. Knuckles, gloves that only measure finger curl
1375+
VRSkeletalTracking_Partial,
1376+
1377+
// Body part location can be measured directly throughout the entire range of motion of the body part.
1378+
// E.g. Mocap suit for the full body, gloves that measure rotation of each finger segment
1379+
VRSkeletalTracking_Full,
1380+
1381+
VRSkeletalTrackingLevel_Count,
1382+
VRSkeletalTrackingLevel_Max = VRSkeletalTrackingLevel_Count - 1
1383+
};
1384+
1385+
13641386

13651387
/** Holds the transform for a single bone */
13661388
struct VRBoneTransform_t

0 commit comments

Comments
 (0)