From 0a73f70cc322dace847c4ee52dcbb58a6708fa6a Mon Sep 17 00:00:00 2001 From: Kenneth Yang Date: Wed, 9 Apr 2025 16:41:07 -0700 Subject: [PATCH 1/3] Update Rider package --- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 94e3c947..f44fca34 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,7 +3,7 @@ "com.unity.addressables": "2.2.2", "com.unity.ai.navigation": "2.0.5", "com.unity.animation.rigging": "1.3.0", - "com.unity.ide.rider": "3.0.34", + "com.unity.ide.rider": "3.0.35", "com.unity.ide.visualstudio": "2.0.22", "com.unity.inputsystem": "1.11.2", "com.unity.memoryprofiler": "1.1.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index c0d1d955..55921cbd 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -71,7 +71,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.34", + "version": "3.0.35", "depth": 0, "source": "registry", "dependencies": { From a299f598538dbaed26114a0216c4d618f28db9c3 Mon Sep 17 00:00:00 2001 From: Kenneth Yang Date: Wed, 9 Apr 2025 16:48:02 -0700 Subject: [PATCH 2/3] Do not crash if motion invalid --- .../Pinpoint/Probes/Controllers/CartesianProbeController.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Pinpoint/Probes/Controllers/CartesianProbeController.cs b/Assets/Scripts/Pinpoint/Probes/Controllers/CartesianProbeController.cs index 900bfc53..5a102ab7 100644 --- a/Assets/Scripts/Pinpoint/Probes/Controllers/CartesianProbeController.cs +++ b/Assets/Scripts/Pinpoint/Probes/Controllers/CartesianProbeController.cs @@ -489,9 +489,8 @@ private async void MoveProbe_XYZD(Vector4 direction, float speed) // Disable/ignore more input until movement is done. ManipulatorKeyboardMoveInProgress = true; - // Call movement and re-enable input when done. - if (!await ProbeManager.ManipulatorBehaviorController.MoveByWorldSpaceDelta(posDelta)) - return; + // Call movement. + await ProbeManager.ManipulatorBehaviorController.MoveByWorldSpaceDelta(posDelta); // Re-enable input. ManipulatorKeyboardMoveInProgress = false; From 0f3a6221c833e3eebbc796d6a7b499779448345b Mon Sep 17 00:00:00 2001 From: Kenneth Yang Date: Wed, 9 Apr 2025 16:49:24 -0700 Subject: [PATCH 3/3] Document what happens if movement fails --- .../Pinpoint/Probes/Controllers/CartesianProbeController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/Pinpoint/Probes/Controllers/CartesianProbeController.cs b/Assets/Scripts/Pinpoint/Probes/Controllers/CartesianProbeController.cs index 5a102ab7..22162a37 100644 --- a/Assets/Scripts/Pinpoint/Probes/Controllers/CartesianProbeController.cs +++ b/Assets/Scripts/Pinpoint/Probes/Controllers/CartesianProbeController.cs @@ -489,7 +489,7 @@ private async void MoveProbe_XYZD(Vector4 direction, float speed) // Disable/ignore more input until movement is done. ManipulatorKeyboardMoveInProgress = true; - // Call movement. + // Call movement (does nothing if movement is invalid). await ProbeManager.ManipulatorBehaviorController.MoveByWorldSpaceDelta(posDelta); // Re-enable input.