Merge pull request #15 from z3y/dev

Dev
z3y · May 2, 2023 · c8ad26a · c8ad26a
2 parents c124acd + a877cbb
commit c8ad26a
Show file tree

Hide file tree

Showing 3 changed files with 330 additions and 28 deletions.
diff --git a/Runtime/Scripts/MarkerSync.cs b/Runtime/Scripts/MarkerSync.cs
@@ -30,13 +30,13 @@ public override void OnDeserialization()
                     if (markerTrail.enabled)
                     {
                         markerTrail.StopWriting();
-                        markerTrail.AddEndCap();
+                        //markerTrail.AddEndCap();
                     }
                     markerTrail.StartWriting();
                     break;
                 case 1: // stop writing without sync
                     markerTrail.StopWriting();
-                    markerTrail.AddEndCap();
+                    //markerTrail.AddEndCap();
                     markerTrail.UpdateUsedVertices();
                     markerTrail.RecalculateMeshBounds();
                     break;

diff --git a/Runtime/Scripts/MarkerTrail.cs b/Runtime/Scripts/MarkerTrail.cs
@@ -104,16 +104,20 @@ public void SetGradient(MaterialPropertyBlock pb)
 
         private void Update()
         {
-            _time += Time.deltaTime;
+            if (!enabled) // can end up running for a frame breaking things
+            {
+                return;
+            }
 
+            _time += Time.deltaTime;
 
             _smoothingPosition = Vector3.Lerp(trailPosition.position, _previousSmoothingPosition, _smoothingCached);
             _previousSmoothingPosition = _smoothingPosition;
 
             UpdateLastPosition(_smoothingPosition, _previousPosition);
             UpdateMeshData();
 
-            if (_time <= updateRate || Vector3.Distance(_smoothingPosition, _previousPosition) < minDistance || !enabled)
+            if (_time <= updateRate || Vector3.Distance(_smoothingPosition, _previousPosition) < minDistance)
             {
                 return;
             }
@@ -164,18 +168,18 @@ public void StopWriting()
 
             if (isLocal && GetSyncLines().Length > 1)
             {
-                AddEndCap();
+                //AddEndCap();
                 StoreLastLinesTransform(_smoothingPosition);
                 RecalculateMeshBounds();
             }
         }
 
-        public void AddEndCap()
+       /* public void AddEndCap()
         {
             CreateTrailLine(_previousPosition, _smoothingPosition);
             //CreateTrailLine(_smoothingPosition, _previousPosition); // mot needed anymore
             UpdateMeshData();
-        }
+        }*/