Skip to content

Commit

Permalink
version 5.6.0-r.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
srl87 committed Mar 4, 2024
1 parent 78fec28 commit 8edec13
Show file tree
Hide file tree
Showing 20 changed files with 89 additions and 42 deletions.
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
8 changes: 4 additions & 4 deletions com.htc.upm.wave.essence/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "com.htc.upm.wave.essence",
"displayName": "VIVE Wave XR Plugin - Essence",
"version": "5.6.0-r.10.1",
"version": "5.6.0-r.10.2",
"unity": "2019.4",
"description": "The \"VIVE Wave XR Plugin - Essence\" package built on top of the \"VIVE Wave XR Plugin - Native\" package.The package provides rich features that make your developerment easier.\n\nYou can view the documentation for additional information.\n\n",
"description": "The \"VIVE Wave XR Plugin - Essence\" package built on top of the \"VIVE Wave XR Plugin - Native\" package.The package provides rich features that make your developerment easier.\n\nYou can view the documentation for additional information.",
"keywords": [
"vr",
"xr",
Expand All @@ -15,8 +15,8 @@
"url": "https://www.htc.com"
},
"dependencies": {
"com.htc.upm.wave.xrsdk": "5.6.0-r.10.1",
"com.htc.upm.wave.native": "5.6.0-r.10.1"
"com.htc.upm.wave.xrsdk": "5.6.0-r.10.2",
"com.htc.upm.wave.native": "5.6.0-r.10.2"
},
"samples": [
{
Expand Down
23 changes: 21 additions & 2 deletions com.htc.upm.wave.native/Runtime/Scripts/WVR_DirectPreview.cs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public static extern WVR_Result WVR_GetHandTrackingData_S(
WVR_HandTrackerType trackerType,
WVR_HandModelType modelType,
WVR_PoseOriginModel originModel,
ref WVR_HandTrackingData_t handTrackerData,
ref WVR_DPHandTrackingData_t handTrackerData,
ref WVR_HandPoseData_t pose);
public override WVR_Result GetHandTrackingData(
WVR_HandTrackerType trackerType,
Expand All @@ -139,7 +139,26 @@ public override WVR_Result GetHandTrackingData(
ref WVR_HandTrackingData_t handTrackerData,
ref WVR_HandPoseData_t pose)
{
return WVR_GetHandTrackingData_S(trackerType, modelType, originModel, ref handTrackerData, ref pose);
WVR_DPHandTrackingData_t handTrackerDPData = new WVR_DPHandTrackingData_t();
WVR_Result result = WVR_GetHandTrackingData_S(trackerType, modelType, originModel, ref handTrackerDPData, ref pose);
if (result == WVR_Result.WVR_Success)
{
handTrackerData.right.isValidPose = handTrackerDPData.right.isValidPose;
handTrackerData.right.confidence = handTrackerDPData.right.confidence;
handTrackerData.right.jointCount = handTrackerDPData.right.jointCount;
handTrackerData.right.joints = handTrackerDPData.right.joints;
handTrackerData.right.scale = handTrackerDPData.right.scale;
handTrackerData.right.wristLinearVelocity = handTrackerDPData.right.wristLinearVelocity;
handTrackerData.right.wristAngularVelocity = handTrackerDPData.right.wristAngularVelocity;
handTrackerData.left.isValidPose = handTrackerDPData.left.isValidPose;
handTrackerData.left.confidence = handTrackerDPData.left.confidence;
handTrackerData.left.jointCount = handTrackerDPData.left.jointCount;
handTrackerData.left.joints = handTrackerDPData.left.joints;
handTrackerData.left.scale = handTrackerDPData.left.scale;
handTrackerData.left.wristLinearVelocity = handTrackerDPData.left.wristLinearVelocity;
handTrackerData.left.wristAngularVelocity = handTrackerDPData.left.wristAngularVelocity;
}
return result;
}

[DllImportAttribute("wvr_plugins_directpreview", EntryPoint = "WVR_ControllerSupportElectronicHand_S", CallingConvention = CallingConvention.Cdecl)]
Expand Down
30 changes: 29 additions & 1 deletion com.htc.upm.wave.native/Runtime/Scripts/wvr.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,23 @@ public struct WVR_HandJointData_t
public WVR_HandGraspState_t grasp;
}

[StructLayout(LayoutKind.Sequential)]
/**
* @brief The data structure of one hand that copy from WVR_HandTrackingData_t since DP not support hand grasp.
* @version API Level 6
*/
[StructLayout(LayoutKind.Sequential)]
public struct WVR_DPHandJointData_t
{
public bool isValidPose; /**< The label of valid(true)/invalid(false) pose. */
public float confidence; /**< The hand confidence value. */
public uint jointCount; /**< Specify the size of the @ref WVR_Pose_t array. */
public IntPtr joints; /**< The array of the @ref WVR_Pose_t. */
public WVR_Vector3f_t scale; /**< defualt is 1. */
public WVR_Vector3f_t wristLinearVelocity;
public WVR_Vector3f_t wristAngularVelocity;
}

[StructLayout(LayoutKind.Sequential)]
public struct HandJointData26
{
public bool isValidPose;
Expand Down Expand Up @@ -1584,6 +1600,18 @@ public struct WVR_HandTrackingData_t
public WVR_HandJointData_t right; /**< The hand tracker data of right hand, refer to @ref WVR_HandJointData_t. */
public WVR_HandJointData_t left; /**< The hand tracker data of left hand, refer to @ref WVR_HandJointData_t. */
}

/**
* @brief The data structure of the hand tracker data that copy from WVR_HandTrackingData_t since DP not support hand grasp.
* @version API Level 6
*/
[StructLayout(LayoutKind.Sequential)]
public struct WVR_DPHandTrackingData_t
{
public long timestamp;
public WVR_DPHandJointData_t right; /**< The hand tracker data of right hand, refer to @ref WVR_HandJointData_t. */
public WVR_DPHandJointData_t left; /**< The hand tracker data of left hand, refer to @ref WVR_HandJointData_t. */
}
#endregion

#region Tracker
Expand Down
6 changes: 3 additions & 3 deletions com.htc.upm.wave.native/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "com.htc.upm.wave.native",
"displayName": "VIVE Wave XR Plugin - Native",
"version": "5.6.0-r.10.1",
"version": "5.6.0-r.10.2",
"unity": "2019.4",
"description": "The \"VIVE Wave XR Plugin - Native\" package provides the wraper of WaveVR.\n\nView the documentation for additional information.\n\n",
"description": "The \"VIVE Wave XR Plugin - Native\" package provides the wraper of WaveVR.\n\nView the documentation for additional information.",
"keywords": [
"vr",
"xr",
Expand All @@ -15,7 +15,7 @@
"url": "https://www.htc.com"
},
"dependencies": {
"com.htc.upm.wave.xrsdk": "5.6.0-r.10.1"
"com.htc.upm.wave.xrsdk": "5.6.0-r.10.2"
},
"samples": [
{
Expand Down
Git LFS file not shown
4 changes: 2 additions & 2 deletions com.htc.upm.wave.xrsdk/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "com.htc.upm.wave.xrsdk",
"displayName": "VIVE Wave XR Plugin",
"version": "5.6.0-r.10.1",
"version": "5.6.0-r.10.2",
"unity": "2019.4",
"description": "The \"VIVE Wave XR Plugin\" package serves as a bridge between VIVE moblile devices and Unity.\nBy communicuating with Unity's \"XR Plugin Management\" package, this package allows your application to run on VIVE mobile devices.\n\nView the documentation for additional information.\n\n",
"description": "The \"VIVE Wave XR Plugin\" package surves as a bridge between VIVE moblile devices and Unity.\nBy communicuating with Unity's \"XR Plugin Management\" package, this package allows your application to run on VIVE mobile devices.\n\nView the documentation for additional information.",
"keywords": [
"vr",
"xr",
Expand Down

0 comments on commit 8edec13

Please # to comment.