Add support to latest SDK

* Set true to useTextureInProject for controller model
* Improve extract hand joint data
* Update GetPinchRay API to WVR_HandPoseType_Pinch type
* Add new symbols to asmdef

Author: ChengNan

Assets/HTC.UnityPlugin/HTC.ViveInputUtility.asmdef

@@ -1,5 +1,6 @@
 {
     "name": "HTC.ViveInputUtility",
+    "rootNamespace": "",
     "references": [
         "Unity.XR.Management",
         "SteamVR",
@@ -25,6 +26,17 @@
     "precompiledReferences": [],
     "autoReferenced": true,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.htc.upm.wave.native",
+            "expression": "4.2.0",
+            "define": "VIU_WAVE_NATIVE_4_2_OR_NEWER"
+        },
+        {
+            "name": "com.htc.upm.wave.essence",
+            "expression": "5.4.0",
+            "define": "VIU_WAVE_ESSENCE_5_4_OR_NEWER"
+        }
+    ],
     "noEngineReferences": false
 }

Assets/HTC.UnityPlugin/VRModule/Modules/WaveVRModule.cs

@@ -79,7 +79,11 @@ public override void UpdateRenderModel()
 #endif
                             GameObject controllerObj = new GameObject("Controller");
                             controllerObj.transform.SetParent(m_modelObj.transform, false);
-                            controllerObj.AddComponent<Wave.Essence.Controller.Model.RenderModel>();
+                            var rm = controllerObj.AddComponent<Wave.Essence.Controller.Model.RenderModel>();
+                            rm.WhichHand = XR_Hand.Dominant;
+#if VIU_WAVE_ESSENCE_5_4_R8_OR_NEWER
+                            rm.useTextureInProject = true;
+#endif
                             controllerObj.AddComponent<Wave.Essence.Controller.Model.ButtonEffect>();
 #elif VIU_WAVEXR_ESSENCE_RENDERMODEL
                             m_modelObj.AddComponent<Wave.Essence.Controller.RenderModel>();
@@ -107,6 +111,9 @@ public override void UpdateRenderModel()
                             controllerObj.transform.SetParent(m_modelObj.transform, false);
                             var rm = controllerObj.AddComponent<Wave.Essence.Controller.Model.RenderModel>();
                             rm.WhichHand = XR_Hand.NonDominant;
+#if VIU_WAVE_ESSENCE_5_4_R8_OR_NEWER
+                            rm.useTextureInProject = true;
+#endif
                             var be = controllerObj.AddComponent<Wave.Essence.Controller.Model.ButtonEffect>();
                             be.HandType = XR_Hand.NonDominant;
 #elif VIU_WAVEXR_ESSENCE_RENDERMODEL

Assets/HTC.UnityPlugin/VRModule/Submodules/WaveHandTrackingSubmodule.cs

@@ -9,6 +9,7 @@
 
 #if VIU_WAVEVR_HAND_TRACKING
 using Wave.Native;
+using Wave.XR.Function;
 #endif
 
 namespace HTC.UnityPlugin.VRModuleManagement
@@ -48,6 +49,11 @@ public void Fetch()
             VRModuleSettings.showWaveElectronicHandWithController ?
             WVR_HandModelType.WVR_HandModelType_WithController : WVR_HandModelType.WVR_HandModelType_WithoutController;
 
+#if VIU_WAVE_NATIVE_4_2_OR_NEWER
+        private delegate void ConvertHandTrackingDataToUnityDelegate(ref WVR_HandJointData_t src, ref HandJointData26 dest);
+        private static ConvertHandTrackingDataToUnityDelegate ConvertHandTrackingDataToUnity = null;
+#endif
+
         public override bool ShouldActiveModule() { return VRModuleSettings.activateWaveHandTrackingSubmodule; }
 
         protected override void OnActivated()
@@ -173,7 +179,7 @@ public static bool TryGetLeftPinchRay(out Vector3 origin, out Vector3 direction)
             Coordinate.GetVectorFromGL(pinch.pinch.origin, out origin);
             Coordinate.GetVectorFromGL(pinch.pinch.direction, out direction);
 
-            return pinch.state.type != WVR_HandPoseType.WVR_HandPoseType_Invalid;
+            return pinch.state.type == WVR_HandPoseType.WVR_HandPoseType_Pinch;
         }
 
         public static bool TryGetRightPinchRay(out Vector3 origin, out Vector3 direction)
@@ -190,7 +196,43 @@ public static bool TryGetRightPinchRay(out Vector3 origin, out Vector3 direction
             Coordinate.GetVectorFromGL(pinch.pinch.origin, out origin);
             Coordinate.GetVectorFromGL(pinch.pinch.direction, out direction);
 
-            return pinch.state.type != WVR_HandPoseType.WVR_HandPoseType_Invalid;
+            return pinch.state.type == WVR_HandPoseType.WVR_HandPoseType_Pinch;
+        }
+
+        public static bool TryGetLeftHandScale(out Vector3 scale)
+        {
+            if (!trackingActivator.isLeftValid)
+            {
+                scale = Vector3.one;
+
+                return false;
+            }
+
+            var scaleGL = trackingActivator.getLeftHandData.scale;
+
+            scale.x = scaleGL.v0;
+            scale.y = scaleGL.v1;
+            scale.z = scaleGL.v2;
+
+            return true;
+        }
+
+        public static bool TryGetRightHandScale(out Vector3 scale)
+        {
+            if (!trackingActivator.isRightValid)
+            {
+                scale = Vector3.one;
+
+                return false;
+            }
+
+            var scaleGL = trackingActivator.getRightHandData.scale;
+
+            scale.x = scaleGL.v0;
+            scale.y = scaleGL.v1;
+            scale.z = scaleGL.v2;
+
+            return true;
         }
 
         private enum FeatureActivity
@@ -346,6 +388,9 @@ private class TrackingActivator
             private static WVR_Pose_t[] s_NaturalHandJointsPoseLeft;
             private static WVR_HandJointData_t m_NaturalHandJointDataRight = new WVR_HandJointData_t();
             private static WVR_Pose_t[] s_NaturalHandJointsPoseRight;
+#if VIU_WAVE_NATIVE_4_2_OR_NEWER
+            private static HandJointData26 jointData26 = new HandJointData26();
+#endif
             private static int[] intJointMappingArray;
             private static byte[] jointValidFlagArrayBytes;
             private static uint jointCount;
@@ -412,6 +457,18 @@ private static Func<WVR_Result> GenerateInitializer()
             {
                 return () =>
                 {
+#if VIU_WAVE_NATIVE_4_2_OR_NEWER
+                    var ptr = FunctionsHelper.GetFuncPtr("ConvertHandTrackingDataToUnity");
+                    if (ptr != IntPtr.Zero)
+                    {
+                        ConvertHandTrackingDataToUnity = Marshal.GetDelegateForFunctionPointer<ConvertHandTrackingDataToUnityDelegate>(ptr);
+                    }
+                    else
+                    {
+                        ConvertHandTrackingDataToUnity = null;
+                    }
+#endif
+
                     var result = Interop.WVR_GetHandJointCount(preferredTrackerType, ref jointCount);
                     if (result != WVR_Result.WVR_Success) return result;
 
@@ -423,18 +480,22 @@ private static Func<WVR_Result> GenerateInitializer()
                         ref s_NaturalHandJointsPoseLeft,
                         ref s_NaturalHandJointsPoseRight,
                         jointCount);
-                    var trackerInfoResult = Interop.WVR_GetHandTrackerInfo(preferredTrackerType, ref trackerInfo);
-                    var hasTrackerInfo = ExtractHandTrackerInfo(trackerInfo, ref s_NaturalHandJoints, ref s_NaturalHandJointsFlag);
-                    //if (hasTrackerInfo)
-                    //{
-                    //    for (int i = 0; i < trackerInfo.jointCount; i++)
-                    //    {
-                    //        Debug.Log("GetHandTrackerInfo() "
-                    //            + "joint count: " + trackerInfo.jointCount
-                    //            + ", s_NaturalHandJoints[" + i + "] = " + s_NaturalHandJoints[i]
-                    //            + ", s_NaturalHandJointsFlag[" + i + "] = " + s_NaturalHandJointsFlag[i]);
-                    //    }
-                    //}
+                    var trackerInfoResult = Interop.WVR_GetHandTrackerInfo(preferredTrackerType, ref trackerInfo) == WVR_Result.WVR_Success ? true : false;
+                    if (trackerInfoResult)
+                    {
+                        var hasTrackerInfo = ExtractHandTrackerInfo(trackerInfo, ref s_NaturalHandJoints, ref s_NaturalHandJointsFlag);
+                        //if (hasTrackerInfo)
+                        //{
+                        //    for (int i = 0; i < trackerInfo.jointCount; i++)
+                        //    {
+                        //        Debug.Log("GetHandTrackerInfo() "
+                        //            + "joint count: " + trackerInfo.jointCount
+                        //            + ", s_NaturalHandJoints[" + i + "] = " + s_NaturalHandJoints[i]
+                        //            + ", s_NaturalHandJointsFlag[" + i + "] = " + s_NaturalHandJointsFlag[i]);
+                        //    }
+                        //}
+                    }
+
                     return default(WVR_Result);
                 };
             }
@@ -473,6 +534,10 @@ public bool TryFetchData(WVR_PoseOriginModel originModel)
 
             public WVR_HandPoseState_t getRightPinchData { get { return pinchData.right; } }
 
+            public WVR_HandJointData_t getLeftHandData { get { return trackingData.left; } }
+
+            public WVR_HandJointData_t getRightHandData { get { return trackingData.right; } }
+
             public void UpdateJoints(IVRModuleDeviceStateRW state, bool isLeft)
             {
                 var data = isLeft ? trackingData.left : trackingData.right;
@@ -576,14 +641,15 @@ private static void InitializeHandTrackerData(
                 handTrackerData.right = handJointDataRight;
             }
 
+            private static int size_of_wvr_pose_t = Marshal.SizeOf<WVR_Pose_t>();
+
             private static void InitializeHandJointData(ref WVR_HandJointData_t handJointData, ref WVR_Pose_t[] jointsPose, uint count)
             {
                 handJointData.isValidPose = false;
                 handJointData.confidence = 0;
                 handJointData.jointCount = count;
 
-                WVR_Pose_t wvr_pose_type = default(WVR_Pose_t);
-                handJointData.joints = Marshal.AllocHGlobal(Marshal.SizeOf(wvr_pose_type) * (int)count);
+                handJointData.joints = Marshal.AllocHGlobal(size_of_wvr_pose_t * (int)count);
 
                 jointsPose = new WVR_Pose_t[count];
 
@@ -597,7 +663,7 @@ private static void InitializeHandJointData(ref WVR_HandJointData_t handJointDat
                 {
                     IntPtr wvr_pose_ptr = new IntPtr(offset);
                     Marshal.StructureToPtr(jointsPose[i], wvr_pose_ptr, false);
-                    offset += Marshal.SizeOf(wvr_pose_type);
+                    offset += size_of_wvr_pose_t;
                 }
             }
 
@@ -657,6 +723,19 @@ private static bool ExtractHandTrackerInfo(WVR_HandTrackerInfo_t handTrackerInfo
 
             private static bool ExtractHandTrackerData(WVR_HandTrackingData_t handTrackerData, ref WVR_Pose_t[] handJointsPoseLeft, ref WVR_Pose_t[] handJointsPoseRight)
             {
+#if VIU_WAVE_NATIVE_4_2_OR_NEWER
+                if (handTrackerData.left.jointCount == 26 &&
+                handTrackerData.right.jointCount == 26 &&
+                handJointsPoseLeft.Length == 26 &&
+                handJointsPoseRight.Length == 26 &&
+                ConvertHandTrackingDataToUnity != null)
+                {
+                    ExtractHandJointData2(ref handTrackerData.left, ref handJointsPoseLeft);
+                    ExtractHandJointData2(ref handTrackerData.right, ref handJointsPoseRight);
+                    return true;
+                }
+#endif
+
                 if (!ExtractHandJointData(handTrackerData.left, ref handJointsPoseLeft))
                     return false;
                 if (!ExtractHandJointData(handTrackerData.right, ref handJointsPoseRight))
@@ -680,8 +759,6 @@ private static bool ExtractHandJointData(WVR_HandJointData_t handJointData, ref
                     jointsPose = new WVR_Pose_t[handJointData.jointCount];
                 }
 
-                WVR_Pose_t wvr_pose_type = default(WVR_Pose_t);
-
                 int offset = 0;
                 for (int i = 0; i < jointsPose.Length; i++)
                 {
@@ -690,11 +767,45 @@ private static bool ExtractHandJointData(WVR_HandJointData_t handJointData, ref
                     else
                         jointsPose[i] = (WVR_Pose_t)Marshal.PtrToStructure(new IntPtr(handJointData.joints.ToInt64() + offset), typeof(WVR_Pose_t));
 
-                    offset += Marshal.SizeOf(wvr_pose_type);
+                    offset += size_of_wvr_pose_t;
                 }
 
                 return true;
             }
+
+#if VIU_WAVE_NATIVE_4_2_OR_NEWER
+            private static void ExtractHandJointData2(ref WVR_HandJointData_t jd, ref WVR_Pose_t[] poses)
+            {
+                ConvertHandTrackingDataToUnity(ref jd, ref jointData26);
+
+                poses[0] = jointData26.j00;
+                poses[1] = jointData26.j01;
+                poses[2] = jointData26.j02;
+                poses[3] = jointData26.j03;
+                poses[4] = jointData26.j04;
+                poses[5] = jointData26.j05;
+                poses[6] = jointData26.j06;
+                poses[7] = jointData26.j07;
+                poses[8] = jointData26.j08;
+                poses[9] = jointData26.j09;
+                poses[10] = jointData26.j10;
+                poses[11] = jointData26.j11;
+                poses[12] = jointData26.j12;
+                poses[13] = jointData26.j13;
+                poses[14] = jointData26.j14;
+                poses[15] = jointData26.j15;
+                poses[16] = jointData26.j16;
+                poses[17] = jointData26.j17;
+                poses[18] = jointData26.j18;
+                poses[19] = jointData26.j19;
+                poses[20] = jointData26.j20;
+                poses[21] = jointData26.j21;
+                poses[22] = jointData26.j22;
+                poses[23] = jointData26.j23;
+                poses[24] = jointData26.j24;
+                poses[25] = jointData26.j25;
+            }
+#endif
         }
 
         private class GestureActivator