Update PlatformHandMeshVisualizer.cs

Author: keveleigh

org.mixedrealitytoolkit.input/Visualizers/PlatformHandVisualizer/PlatformHandMeshVisualizer.cs

@@ -112,68 +112,66 @@ protected void Update()
                 return;
             }
 
-            if (handSubsystem != null && handSubsystem.running)
+            if (handSubsystem != null && handSubsystem.running && (handSubsystem.updateSuccessFlags & updateSuccessFlags) != 0)
             {
                 XRHandMeshDataQueryParams queryParams = new()
                 {
                     allocator = Unity.Collections.Allocator.Temp,
                 };
 
-                // Sometimes, the mesh update will fail, but that doesn't mean we don't have a valid mesh
+                // Sometimes, the mesh retrieval will fail, but that doesn't mean we aren't being tracked
                 // So, reuse the last mesh until the subsystem tells us we're untracked
                 if (lastUpdatedFrame != Time.frameCount && !handSubsystem.TryGetMeshData(out result, ref queryParams))
                 {
                     return;
                 }
 
-                if ((handSubsystem.updateSuccessFlags & updateSuccessFlags) != 0)
-                {
-                    lastUpdatedFrame = Time.frameCount;
-                    XRHandMeshData handMeshData = HandNode == XRNode.LeftHand ? result.leftHand : result.rightHand;
-                    handRenderer.enabled = true;
-                    Mesh mesh = meshFilter.mesh;
+                lastUpdatedFrame = Time.frameCount;
+                XRHandMeshData handMeshData = HandNode == XRNode.LeftHand ? result.leftHand : result.rightHand;
+                handRenderer.enabled = true;
+                Mesh mesh = meshFilter.mesh;
 
-                    if (handMeshData.positions.Length > 0 && handMeshData.indices.Length > 0)
+                if (handMeshData.positions.Length > 0 && handMeshData.indices.Length > 0)
+                {
+                    mesh.SetVertices(handMeshData.positions);
+                    Unity.Collections.NativeArray<int> indices = handMeshData.indices;
+                    // This API appears to return CCW triangles, but Unity expects CW triangles
+                    for (int i = 0; i < indices.Length; i += 3)
                     {
-                        mesh.SetVertices(handMeshData.positions);
-                        Unity.Collections.NativeArray<int> indices = handMeshData.indices;
-                        // This API appears to return CCW triangles, but Unity expects CW triangles
-                        for (int i = 0; i < indices.Length; i += 3)
-                        {
-                            (indices[i + 1], indices[i + 2]) = (indices[i + 2], indices[i + 1]);
-                        }
-                        mesh.SetIndices(indices, MeshTopology.Triangles, 0);
-                        mesh.RecalculateBounds();
+                        (indices[i + 1], indices[i + 2]) = (indices[i + 2], indices[i + 1]);
                     }
+                    mesh.SetIndices(indices, MeshTopology.Triangles, 0);
+                    mesh.RecalculateBounds();
+                }
 
-                    if (handMeshData.uvs.IsCreated && handMeshData.uvs.Length == mesh.vertexCount)
-                    {
-                        mesh.SetUVs(0, handMeshData.uvs);
-                    }
-                    else
-                    {
-                        mesh.uv = null;
-                    }
+                if (handMeshData.uvs.IsCreated && handMeshData.uvs.Length == mesh.vertexCount)
+                {
+                    mesh.SetUVs(0, handMeshData.uvs);
+                }
+                else
+                {
+                    mesh.uv = null;
+                }
 
-                    if (handMeshData.normals.IsCreated && handMeshData.normals.Length == mesh.vertexCount)
-                    {
-                        mesh.SetNormals(handMeshData.normals);
-                    }
-                    else
-                    {
-                        mesh.RecalculateNormals();
-                    }
+                if (handMeshData.normals.IsCreated && handMeshData.normals.Length == mesh.vertexCount)
+                {
+                    mesh.SetNormals(handMeshData.normals);
+                }
+                else
+                {
+                    mesh.RecalculateNormals();
+                }
 
-                    if (handMeshData.TryGetRootPose(out Pose rootPose))
-                    {
-                        transform.SetWorldPose(PlayspaceUtilities.TransformPose(rootPose));
-                    }
-                    UpdateHandMaterial();
-                    return;
+                if (handMeshData.TryGetRootPose(out Pose rootPose))
+                {
+                    transform.SetWorldPose(PlayspaceUtilities.TransformPose(rootPose));
                 }
+                UpdateHandMaterial();
+                return;
             }
+
 #if MROPENXR_PRESENT && (UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_ANDROID)
-            else if (handMeshTracker != null
+            if (handMeshTracker != null
                 && handMeshTracker.TryGetHandMesh(FrameTime.OnUpdate, meshFilter.mesh)
                 && handMeshTracker.TryLocateHandMesh(FrameTime.OnUpdate, out Pose pose))
             {