OpenVR SDK 1.1.3b:v1.1.3b

* Fixed issue with EVRSkeletalTrackingLevel not being defined in openvr_driver.h

Fixes https://github.com/ValveSoftware/openvr/issues/947

[git-p4: depot-paths = "//vr/steamvr/sdk_release/": change = 4837752]

5 files changed, 68 insertions, 45 deletions

diff --git a/headers/openvr.h b/headers/openvr.h
index 9b5784c..c5ffe72 100644
--- a/headers/openvr.h
+++ b/headers/openvr.h
@@ -1361,6 +1361,28 @@ enum EVRSkeletalMotionRange
 	VRSkeletalMotionRange_WithoutController = 1,
 };
 
+enum EVRSkeletalTrackingLevel
+{
+	// body part location can’t be directly determined by the device. Any skeletal pose provided by 
+	// the device is estimated by assuming the position required to active buttons, triggers, joysticks, 
+	// or other input sensors. 
+	// E.g. Vive Controller, Gamepad
+	VRSkeletalTracking_Estimated = 0,
+
+	// body part location can be measured directly but with fewer degrees of freedom than the actual body 
+	// part. Certain body part positions may be unmeasured by the device and estimated from other input data. 
+	// E.g. Knuckles, gloves that only measure finger curl
+	VRSkeletalTracking_Partial,
+
+	// Body part location can be measured directly throughout the entire range of motion of the body part. 
+	// E.g. Mocap suit for the full body, gloves that measure rotation of each finger segment
+	VRSkeletalTracking_Full,
+
+	VRSkeletalTrackingLevel_Count,
+	VRSkeletalTrackingLevel_Max = VRSkeletalTrackingLevel_Count - 1
+};
+
+
 
 /** Holds the transform for a single bone */
 struct VRBoneTransform_t
@@ -4117,27 +4139,6 @@ namespace vr
 		VRFingerSplay_Count
 	};
 
-	enum EVRSkeletalTrackingLevel
-	{
-		// body part location can’t be directly determined by the device. Any skeletal pose provided by 
-		// the device is estimated by assuming the position required to active buttons, triggers, joysticks, 
-		// or other input sensors. 
-		// E.g. Vive Controller, Gamepad
-		VRSkeletalTracking_Estimated = 0,
-		
-		// body part location can be measured directly but with fewer degrees of freedom than the actual body 
-		// part. Certain body part positions may be unmeasured by the device and estimated from other input data. 
-		// E.g. Knuckles, gloves that only measure finger curl
-		VRSkeletalTracking_Partial,
-		
-		// Body part location can be measured directly throughout the entire range of motion of the body part. 
-		// E.g. Mocap suit for the full body, gloves that measure rotation of each finger segment
-		VRSkeletalTracking_Full,
-		
-		VRSkeletalTrackingLevel_Count,
-		VRSkeletalTrackingLevel_Max = VRSkeletalTrackingLevel_Count - 1
-	};
-
 	enum EVRInputFilterCancelType
 	{
 		VRInputFilterCancel_Timers = 0,
diff --git a/headers/openvr_api.cs b/headers/openvr_api.cs
index 1bb833f..37ee80a 100644
--- a/headers/openvr_api.cs
+++ b/headers/openvr_api.cs
@@ -4272,6 +4272,14 @@ public enum EVRSkeletalMotionRange
 	WithController = 0,
 	WithoutController = 1,
 }
+public enum EVRSkeletalTrackingLevel
+{
+	VRSkeletalTracking_Estimated = 0,
+	VRSkeletalTracking_Partial = 1,
+	VRSkeletalTracking_Full = 2,
+	Count = 3,
+	Max = 2,
+}
 public enum EVRInitError
 {
 	None = 0,
@@ -4684,14 +4692,6 @@ public enum EVRFingerSplay
 	Ring_Pinky = 3,
 	Count = 4,
 }
-public enum EVRSkeletalTrackingLevel
-{
-	VRSkeletalTracking_Estimated = 0,
-	VRSkeletalTracking_Partial = 1,
-	VRSkeletalTracking_Full = 2,
-	Count = 3,
-	Max = 2,
-}
 public enum EVRInputFilterCancelType
 {
 	VRInputFilterCancel_Timers = 0,
diff --git a/headers/openvr_api.json b/headers/openvr_api.json
index da9ba1e..fab82e8 100644
--- a/headers/openvr_api.json
+++ b/headers/openvr_api.json
@@ -602,6 +602,13 @@
 	{"name": "VRSkeletalMotionRange_WithController","value": "0"}
 	,{"name": "VRSkeletalMotionRange_WithoutController","value": "1"}
 ]}
+,	{"enumname": "vr::EVRSkeletalTrackingLevel","values": [ 
+	{"name": "VRSkeletalTracking_Estimated","value": "0"}
+	,{"name": "VRSkeletalTracking_Partial","value": "1"}
+	,{"name": "VRSkeletalTracking_Full","value": "2"}
+	,{"name": "VRSkeletalTrackingLevel_Count","value": "3"}
+	,{"name": "VRSkeletalTrackingLevel_Max","value": "2"}
+]}
 ,	{"enumname": "vr::EVRInitError","values": [ 
 	{"name": "VRInitError_None","value": "0"}
 	,{"name": "VRInitError_Unknown","value": "1"}
@@ -978,13 +985,6 @@
 	,{"name": "VRFingerSplay_Ring_Pinky","value": "3"}
 	,{"name": "VRFingerSplay_Count","value": "4"}
 ]}
-,	{"enumname": "vr::EVRSkeletalTrackingLevel","values": [ 
-	{"name": "VRSkeletalTracking_Estimated","value": "0"}
-	,{"name": "VRSkeletalTracking_Partial","value": "1"}
-	,{"name": "VRSkeletalTracking_Full","value": "2"}
-	,{"name": "VRSkeletalTrackingLevel_Count","value": "3"}
-	,{"name": "VRSkeletalTrackingLevel_Max","value": "2"}
-]}
 ,	{"enumname": "vr::EVRInputFilterCancelType","values": [ 
 	{"name": "VRInputFilterCancel_Timers","value": "0"}
 	,{"name": "VRInputFilterCancel_Momentum","value": "1"}
diff --git a/headers/openvr_capi.h b/headers/openvr_capi.h
index 9a2ad5c..ac42097 100644
--- a/headers/openvr_capi.h
+++ b/headers/openvr_capi.h
@@ -922,6 +922,15 @@ typedef enum EVRSkeletalMotionRange
 	EVRSkeletalMotionRange_VRSkeletalMotionRange_WithoutController = 1,
 } EVRSkeletalMotionRange;
 
+typedef enum EVRSkeletalTrackingLevel
+{
+	EVRSkeletalTrackingLevel_VRSkeletalTracking_Estimated = 0,
+	EVRSkeletalTrackingLevel_VRSkeletalTracking_Partial = 1,
+	EVRSkeletalTrackingLevel_VRSkeletalTracking_Full = 2,
+	EVRSkeletalTrackingLevel_VRSkeletalTrackingLevel_Count = 3,
+	EVRSkeletalTrackingLevel_VRSkeletalTrackingLevel_Max = 2,
+} EVRSkeletalTrackingLevel;
+
 typedef enum EVRInitError
 {
 	EVRInitError_VRInitError_None = 0,
@@ -1370,15 +1379,6 @@ typedef enum EVRFingerSplay
 	EVRFingerSplay_VRFingerSplay_Count = 4,
 } EVRFingerSplay;
 
-typedef enum EVRSkeletalTrackingLevel
-{
-	EVRSkeletalTrackingLevel_VRSkeletalTracking_Estimated = 0,
-	EVRSkeletalTrackingLevel_VRSkeletalTracking_Partial = 1,
-	EVRSkeletalTrackingLevel_VRSkeletalTracking_Full = 2,
-	EVRSkeletalTrackingLevel_VRSkeletalTrackingLevel_Count = 3,
-	EVRSkeletalTrackingLevel_VRSkeletalTrackingLevel_Max = 2,
-} EVRSkeletalTrackingLevel;
-
 typedef enum EVRInputFilterCancelType
 {
 	EVRInputFilterCancelType_VRInputFilterCancel_Timers = 0,
diff --git a/headers/openvr_driver.h b/headers/openvr_driver.h
index 780d44e..b8c6952 100644
--- a/headers/openvr_driver.h
+++ b/headers/openvr_driver.h
@@ -1361,6 +1361,28 @@ enum EVRSkeletalMotionRange
 	VRSkeletalMotionRange_WithoutController = 1,
 };
 
+enum EVRSkeletalTrackingLevel
+{
+	// body part location can’t be directly determined by the device. Any skeletal pose provided by 
+	// the device is estimated by assuming the position required to active buttons, triggers, joysticks, 
+	// or other input sensors. 
+	// E.g. Vive Controller, Gamepad
+	VRSkeletalTracking_Estimated = 0,
+
+	// body part location can be measured directly but with fewer degrees of freedom than the actual body 
+	// part. Certain body part positions may be unmeasured by the device and estimated from other input data. 
+	// E.g. Knuckles, gloves that only measure finger curl
+	VRSkeletalTracking_Partial,
+
+	// Body part location can be measured directly throughout the entire range of motion of the body part. 
+	// E.g. Mocap suit for the full body, gloves that measure rotation of each finger segment
+	VRSkeletalTracking_Full,
+
+	VRSkeletalTrackingLevel_Count,
+	VRSkeletalTrackingLevel_Max = VRSkeletalTrackingLevel_Count - 1
+};
+
+
 
 /** Holds the transform for a single bone */
 struct VRBoneTransform_t