plunger: Adapt movement position, which is now relative to the plunge…

…r's position.
freezy · Jan 30, 2025 · 91c886d · 91c886d
1 parent ab4de53
commit 91c886d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerCollider.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerCollider.cs
@@ -55,6 +55,8 @@ public int Id
 		public LineZCollider JointEnd0;
 		public LineZCollider JointEnd1;
 
+		public float PosY;
+
 		public ColliderBounds Bounds { get; private set; }
 
 		public PlungerCollider(PlungerComponent comp, PlungerColliderComponent collComp, ColliderInfo info) : this()
@@ -84,6 +86,7 @@ public PlungerCollider(PlungerComponent comp, PlungerColliderComponent collComp,
 			JointEnd0 = new LineZCollider(new float2(x, position), zHeight, zHeight + Plunger.PlungerHeight, info);
 			JointEnd1 = new LineZCollider(new float2(x2, position), zHeight, zHeight + Plunger.PlungerHeight, info);
 
+			PosY = 0;
 			Bounds = new ColliderBounds(Header.ItemId, Header.Id, new Aabb(
 				new float3(-comp.Width - 10, comp.Height, 0),
 				new float3(comp.Width + 10, -100, 50)
@@ -132,6 +135,8 @@ private void Transform(PlungerCollider collider, float4x4 matrix)
 			LineSegEnd = collider.LineSegEnd.Transform(matrix);
 			JointEnd0 = collider.JointEnd0.Transform(matrix);
 			JointEnd1 = collider.JointEnd1.Transform(matrix);
+
+			PosY = matrix.GetTranslation().y;
 		}
 
 		public Aabb GetTransformedAabb(float4x4 matrix)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerDisplacementPhysics.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerDisplacementPhysics.cs
@@ -100,14 +100,16 @@ internal static void UpdateDisplacement(int itemId, ref PlungerMovementState mov
 
 		private static void UpdateCollider(float len, ref PlungerCollider collider)
 		{
-			collider.LineSegSide0.V1y = len;
-			collider.LineSegSide1.V2y = len;
+			var yPos = collider.PosY + len;
 
-			collider.LineSegEnd.V2y = len;
-			collider.LineSegEnd.V1y = len; // + 0.0001f;
+			collider.LineSegSide0.V1y = yPos;
+			collider.LineSegSide1.V2y = yPos;
 
-			collider.JointEnd0.XyY = len;
-			collider.JointEnd1.XyY = len; // + 0.0001f;
+			collider.LineSegEnd.V2y = yPos;
+			collider.LineSegEnd.V1y = yPos; // + 0.0001f;
+
+			collider.JointEnd0.XyY = yPos;
+			collider.JointEnd1.XyY = yPos; // + 0.0001f;
 
 			collider.LineSegSide0.CalcNormal();
 			collider.LineSegSide1.CalcNormal();