droptarget: Fix animation translation when rotated.

freezy · Nov 26, 2024 · d52a83e · d52a83e
1 parent 3980449
commit d52a83e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsMovements.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsMovements.cs
@@ -65,12 +65,13 @@ internal void ApplyDropTargetMovement(ref NativeParallelHashMap<int, DropTargetS
 			while (enumerator.MoveNext()) {
 				ref var dropTargetState = ref enumerator.Current.Value;
 				var dropTargetTransform = transforms[dropTargetState.AnimatedItemId];
-				var localPos = dropTargetTransform.localPosition;
-				dropTargetTransform.localPosition = new Vector3(
-					localPos.x,
-					Physics.ScaleToWorld(dropTargetState.Animation.ZOffset),
-					localPos.z
-				);
+				var localYDirection = dropTargetTransform.up;
+
+				// Compute the new position by moving along the local Y-axis
+				var newPosition = (Vector3)dropTargetState.Static.InitialPosition + localYDirection * Physics.ScaleToWorld(dropTargetState.Animation.ZOffset);
+
+				// Apply the new position
+				dropTargetTransform.position = newPosition;
 			}
 		}
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetComponent.cs
@@ -158,6 +158,7 @@ internal DropTargetState CreateState()
 					Speed = animationComponent.Speed,
 					RaiseDelay = animationComponent.RaiseDelay,
 					UseHitEvent = colliderComponent.UseHitEvent,
+					InitialPosition = transform.position
 				} : default;
 
 			var animationData = colliderComponent && animationComponent

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetStaticState.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetStaticState.cs
@@ -14,12 +14,15 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+using Unity.Mathematics;
+
 namespace VisualPinball.Unity
 {
 	internal struct DropTargetStaticState
 	{
 		public float Speed;
 		public float RaiseDelay;
 		public bool UseHitEvent;
+		public float3 InitialPosition;
 	}
 }