Object snap

pzgulyas · pzgulyas · commit 1b88d7a75d06 · 2023-12-09T19:50:45.000+01:00
diff --git a/Source/Contrib/TrackViewer/UserInterface/SceneView.xaml.cs b/Source/Contrib/TrackViewer/UserInterface/SceneView.xaml.cs
@@ -109,13 +109,16 @@ public void Update(GameTime gameTime)
             {
                 if (ObjectSnap && Camera.PickByMouse(out var snappedObject))
                 {
+                    if (snappedObject != SnappedObject)
+                        Viewer.EditorShapes.BoundingBoxShapes.RemoveAll(s => s == SnappedObject);
                     SnappedObject = snappedObject;
-                    Viewer.EditorShapes.BoundingBoxShapes.Add(SnappedObject);
+                    if (!Viewer.EditorShapes.BoundingBoxShapes.Contains(SnappedObject))
+                        Viewer.EditorShapes.BoundingBoxShapes.Add(SnappedObject);
                 }
                 else
                 {
+                    Viewer.EditorShapes.BoundingBoxShapes.RemoveAll(s => s == SnappedObject);
                     SnappedObject = null;
-                    Viewer.EditorShapes.BoundingBoxShapes.TryTake(out _);
                 }
                 MovedObject.Location.XNAMatrix = GetMovingMatrix(MovedObjectOriginalPosition, HandleOriginalPosition, HandlePosition);
                 Viewer.EditorShapes.MovedObject = MovedObject;
@@ -438,6 +441,7 @@ void CancelObjectMove()
                 HandlePosition.CopyFrom(HandleOriginalPosition);
             else
                 HandlePosition = null;
+            Viewer.EditorShapes.BoundingBoxShapes.Clear();
             EditorState = EditorState.ObjectSelected;
         }
 
@@ -457,6 +461,7 @@ void ApplyObjectMove()
 
             DeltaContext = UndoStack.Peek();
             MovedObject = null;
+            Viewer.EditorShapes.BoundingBoxShapes.Clear();
             EditorState = EditorState.ObjectSelected;
         }
 
@@ -472,12 +477,14 @@ void CancelHandleMove()
         {
             HandlePosition = null;
             HandleOriginalPosition = null;
+            Viewer.EditorShapes.BoundingBoxShapes.Clear();
             EditorState = EditorState.ObjectSelected;
         }
 
         void ApplyHandleMove()
         {
             HandleOriginalPosition = new WorldPosition(HandlePosition);
+            Viewer.EditorShapes.BoundingBoxShapes.Clear();
             EditorState = EditorState.ObjectSelected;
         }
 
@@ -486,8 +493,7 @@ void SelectedObjectChanged()
             Viewer.EditorShapes.SelectedObject = SelectedObject;
             Viewer.EditorShapes.MovedObject = null;
             Viewer.EditorShapes.HandleLocation = null;
-            while (!Viewer.EditorShapes.BoundingBoxShapes.IsEmpty)
-                Viewer.EditorShapes.BoundingBoxShapes.TryTake(out _);
+            Viewer.EditorShapes.BoundingBoxShapes.Clear();
             HandlePosition = null;
             HandleOriginalPosition = null;
             SnappedObject = null;
diff --git a/Source/RunActivity/Viewer3D/EditorPrimitives.cs b/Source/RunActivity/Viewer3D/EditorPrimitives.cs
@@ -48,7 +48,7 @@ public class EditorShapes : StaticShape, IDisposable
         public WorldPosition MovedObjectLocation { get; set; }
         BoundingBoxPrimitive MovedObjectPrimitive;
 
-        public ConcurrentBag<StaticShape> BoundingBoxShapes = new ConcurrentBag<StaticShape>();
+        public readonly List<StaticShape> BoundingBoxShapes = new List<StaticShape>();
         readonly ConcurrentDictionary<(int tileX, int tileZ, int uid, Matrix matrix, int number), BoundingBoxPrimitive> BoundingBoxPrimitives = new ConcurrentDictionary<(int, int, int, Matrix, int), BoundingBoxPrimitive>();
         readonly ConcurrentBag<EditorPrimitive> UnusedPrimitives = new ConcurrentBag<EditorPrimitive>();
 

Original file line number	Diff line number	Diff line change
`@@ -109,13 +109,16 @@ public void Update(GameTime gameTime)`
`109`	`109`	`{`
`110`	`110`	`if (ObjectSnap && Camera.PickByMouse(out var snappedObject))`
`111`	`111`	`{`
	`112`	`+ if (snappedObject != SnappedObject)`
	`113`	`+ Viewer.EditorShapes.BoundingBoxShapes.RemoveAll(s => s == SnappedObject);`
`112`	`114`	`SnappedObject = snappedObject;`
`113`		`- Viewer.EditorShapes.BoundingBoxShapes.Add(SnappedObject);`
	`115`	`+ if (!Viewer.EditorShapes.BoundingBoxShapes.Contains(SnappedObject))`
	`116`	`+ Viewer.EditorShapes.BoundingBoxShapes.Add(SnappedObject);`
`114`	`117`	`}`
`115`	`118`	`else`
`116`	`119`	`{`
	`120`	`+ Viewer.EditorShapes.BoundingBoxShapes.RemoveAll(s => s == SnappedObject);`
`117`	`121`	`SnappedObject = null;`
`118`		`- Viewer.EditorShapes.BoundingBoxShapes.TryTake(out _);`
`119`	`122`	`}`
`120`	`123`	`MovedObject.Location.XNAMatrix = GetMovingMatrix(MovedObjectOriginalPosition, HandleOriginalPosition, HandlePosition);`
`121`	`124`	`Viewer.EditorShapes.MovedObject = MovedObject;`
`@@ -438,6 +441,7 @@ void CancelObjectMove()`
`438`	`441`	`HandlePosition.CopyFrom(HandleOriginalPosition);`
`439`	`442`	`else`
`440`	`443`	`HandlePosition = null;`
	`444`	`+ Viewer.EditorShapes.BoundingBoxShapes.Clear();`
`441`	`445`	`EditorState = EditorState.ObjectSelected;`
`442`	`446`	`}`
`443`	`447`
`@@ -457,6 +461,7 @@ void ApplyObjectMove()`
`457`	`461`
`458`	`462`	`DeltaContext = UndoStack.Peek();`
`459`	`463`	`MovedObject = null;`
	`464`	`+ Viewer.EditorShapes.BoundingBoxShapes.Clear();`
`460`	`465`	`EditorState = EditorState.ObjectSelected;`
`461`	`466`	`}`
`462`	`467`
`@@ -472,12 +477,14 @@ void CancelHandleMove()`
`472`	`477`	`{`
`473`	`478`	`HandlePosition = null;`
`474`	`479`	`HandleOriginalPosition = null;`
	`480`	`+ Viewer.EditorShapes.BoundingBoxShapes.Clear();`
`475`	`481`	`EditorState = EditorState.ObjectSelected;`
`476`	`482`	`}`
`477`	`483`
`478`	`484`	`void ApplyHandleMove()`
`479`	`485`	`{`
`480`	`486`	`HandleOriginalPosition = new WorldPosition(HandlePosition);`
	`487`	`+ Viewer.EditorShapes.BoundingBoxShapes.Clear();`
`481`	`488`	`EditorState = EditorState.ObjectSelected;`
`482`	`489`	`}`
`483`	`490`
`@@ -486,8 +493,7 @@ void SelectedObjectChanged()`
`486`	`493`	`Viewer.EditorShapes.SelectedObject = SelectedObject;`
`487`	`494`	`Viewer.EditorShapes.MovedObject = null;`
`488`	`495`	`Viewer.EditorShapes.HandleLocation = null;`
`489`		`- while (!Viewer.EditorShapes.BoundingBoxShapes.IsEmpty)`
`490`		`- Viewer.EditorShapes.BoundingBoxShapes.TryTake(out _);`
	`496`	`+ Viewer.EditorShapes.BoundingBoxShapes.Clear();`
`491`	`497`	`HandlePosition = null;`
`492`	`498`	`HandleOriginalPosition = null;`
`493`	`499`	`SnappedObject = null;`