kinematic: Add support for bumpers.

freezy · freezy · commit 0e75d8bcf1a9 · 2023-11-05T13:14:46.000+01:00
diff --git a/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Bumper/BumperColliderInspector.cs b/VisualPinball.Unity/VisualPinball.Unity.Editor/VPT/Bumper/BumperColliderInspector.cs
@@ -28,6 +28,7 @@ public class BumperColliderInspector : ColliderInspector<BumperData, BumperCompo
 		private SerializedProperty _thresholdProperty;
 		private SerializedProperty _forceProperty;
 		private SerializedProperty _scatterProperty;
+		private SerializedProperty _isKinematicProperty;
 
 		protected override void OnEnable()
 		{
@@ -37,6 +38,7 @@ protected override void OnEnable()
 			_forceProperty = serializedObject.FindProperty(nameof(BumperColliderComponent.Force));
 			_scatterProperty = serializedObject.FindProperty(nameof(BumperColliderComponent.Scatter));
 			_hitEventProperty = serializedObject.FindProperty(nameof(BumperColliderComponent.HitEvent));
+			_isKinematicProperty = serializedObject.FindProperty(nameof(BumperColliderComponent._isKinematic));
 		}
 
 		public override void OnInspectorGUI()
@@ -47,6 +49,7 @@ public override void OnInspectorGUI()
 
 			BeginEditing();
 
+			PropertyField(_isKinematicProperty, "Movable");
 			PropertyField(_hitEventProperty, "Has Hit Event");
 			PropertyField(_forceProperty);
 			PropertyField(_thresholdProperty, "Hit Threshold");
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Extensions/MathExtensions.cs b/VisualPinball.Unity/VisualPinball.Unity/Extensions/MathExtensions.cs
@@ -58,6 +58,15 @@ public static void RotationAroundAxis(this float3x3 m, float3 axis, float rSin,
 			m.c2.z = axis.z * axis.z + rCos * (1.0f - axis.z * axis.z);
 		}
 
+		public static float3 GetScale(this float4x4 m)
+		{
+			return new float3(
+				math.length(new float3(m.c0.x, m.c1.x, m.c2.x)),
+				math.length(new float3(m.c0.y, m.c1.y, m.c2.y)),
+				math.length(new float3(m.c0.z, m.c1.z, m.c2.z))
+			);
+		}
+
 		public static Vertex3D ToVertex3D(this Vector3 vector)
 		{
 			return new Vertex3D(vector.x, vector.y, vector.z);
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsEngine.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsEngine.cs
@@ -237,9 +237,11 @@ private void Update()
 				}
 				var lastTransformationMatrix = _kinematicTransforms[coll.ItemId];
 				var currTransformationMatrix = coll.TransformationMatrix;
-				if (!lastTransformationMatrix.Equals(currTransformationMatrix)) {
-					_updatedKinematicTransforms.Add(coll.ItemId, currTransformationMatrix);
+				if (lastTransformationMatrix.Equals(currTransformationMatrix)) {
+					continue;
 				}
+				_updatedKinematicTransforms.Add(coll.ItemId, currTransformationMatrix);
+				_kinematicTransforms[coll.ItemId] = currTransformationMatrix;
 			}
 
 			// prepare job
@@ -464,5 +466,16 @@ public ScheduledAction(ulong scheduleAt, Action action)
 				Action = action;
 			}
 		}
+
+		public ICollider[] GetKinematicColliders(int itemId)
+		{
+			ref var colliderIds = ref _kinematicColliderLookups.GetValueByRef(itemId);
+			var colliders = new ICollider[colliderIds.Length];
+			for (var i = 0; i < colliderIds.Length; i++) {
+				var colliderId = colliderIds[i];
+				colliders[i] = _kinematicColliders[colliderId];
+			}
+			return colliders;
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsState.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsState.cs
@@ -101,7 +101,6 @@ public PhysicsState(ref PhysicsEnv env, ref NativeOctree<int> octree, ref Native
 
 		internal ref KickerState GetKickerState(int colliderId) => ref KickerStates.GetValueByRef(Colliders.GetItemId(colliderId));
 
-
 		internal bool HasDropTargetState(int colliderId) => DropTargetStates.ContainsKey(Colliders.GetItemId(colliderId));
 
 		internal bool HasHitTargetState(int colliderId) => HitTargetStates.ContainsKey(Colliders.GetItemId(colliderId));
@@ -110,7 +109,7 @@ public PhysicsState(ref PhysicsEnv env, ref NativeOctree<int> octree, ref Native
 
 		internal ref HitTargetState GetHitTargetState(int colliderId) => ref HitTargetStates.GetValueByRef(Colliders.GetItemId(colliderId));
 
-		internal ref BumperState GetBumperState(int colliderId) => ref BumperStates.GetValueByRef(Colliders.GetItemId(colliderId));
+		internal ref BumperState GetBumperState(int colliderId, ref NativeColliders col) => ref BumperStates.GetValueByRef(col.GetItemId(colliderId));
 
 		internal ref GateState GetGateState(int colliderId) => ref GateStates.GetValueByRef(Colliders.GetItemId(colliderId));
 
@@ -124,6 +123,10 @@ internal void Transform(int colliderId, float4x4 matrix)
 		{
 			switch (GetColliderType(ref KinematicColliders, colliderId))
 			{
+				case ColliderType.Bumper:
+				case ColliderType.Circle:
+					KinematicColliders.Circle(colliderId).Transform(KinematicCollidersAtIdentity.Circle(colliderId), matrix);
+					break;
 				case ColliderType.Point:
 					KinematicColliders.Point(colliderId).Transform(KinematicCollidersAtIdentity.Point(colliderId), matrix);
 					break;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsStaticCollision.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsStaticCollision.cs
@@ -82,7 +82,7 @@ private static void Collide(ref NativeColliders colliders, ref BallState ball, r
 					break;
 
 				case ColliderType.Bumper:
-					ref var bumperState = ref state.GetBumperState(colliderId);
+					ref var bumperState = ref state.GetBumperState(colliderId, ref colliders);
 					BumperCollider.Collide(ref ball, ref state.EventQueue, ref ball.CollisionEvent, ref bumperState.RingAnimation, ref bumperState.SkirtAnimation,
 						in collHeader, in bumperState.Static, ref state.Env.Random);
 					break;
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Physics/Collider/CircleCollider.cs b/VisualPinball.Unity/VisualPinball.Unity/Physics/Collider/CircleCollider.cs
@@ -30,8 +30,8 @@ public int Id
 
 		public ColliderHeader Header;
 
-		public readonly float2 Center;
-		public readonly float Radius;
+		public float2 Center;
+		public float Radius;
 
 		private readonly float _zHigh;
 		private readonly float _zLow;
@@ -221,5 +221,12 @@ public void Collide(ref BallState ball, in CollisionEventData collEvent, ref Ran
 		{
 			BallCollider.Collide3DWall(ref ball, in Header.Material, in collEvent, in collEvent.HitNormal, ref random);
 		}
+
+		public void Transform(CircleCollider circle, float4x4 matrix)
+		{
+			var size = matrix.GetScale();
+			Center = math.mul(matrix, new float4(circle.Center, 0f, 1f)).xy;
+			Radius = size.x / 2 * BumperComponent.DataMeshScale;
+		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Physics/Collider/ColliderReference.cs b/VisualPinball.Unity/VisualPinball.Unity/Physics/Collider/ColliderReference.cs
@@ -97,6 +97,11 @@ public void TransformToIdentity(NativeParallelHashMap<int, float4x4> itemIdToTra
 					var matrix = itemIdToTransformationMatrix[itemId];
 					var lookup = Lookups[colliderId];
 					switch (lookup.Type) {
+						case ColliderType.Bumper:
+						case ColliderType.Circle:
+							ref var circleCollider = ref CircleColliders.GetElementAsRef(lookup.Index);
+							circleCollider.Transform(CircleColliders[lookup.Index], math.inverse(matrix));
+							break;
 						case ColliderType.Point:
 							ref var pointCollider = ref PointColliders.GetElementAsRef(lookup.Index);
 							pointCollider.Transform(PointColliders[lookup.Index], math.inverse(matrix));
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperApi.cs
@@ -15,7 +15,6 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
 using UnityEngine;
 using VisualPinball.Engine.VPT.Bumper;
 
@@ -76,8 +75,13 @@ protected override void CreateColliders(ref ColliderReference colliders,
 			ref ColliderReference kinematicColliders, float margin)
 		{
 			var height = MainComponent.PositionZ;
-			colliders.Add(new CircleCollider(MainComponent.Position, MainComponent.Radius, height,
-				height + MainComponent.HeightScale, GetColliderInfo(), ColliderType.Bumper));
+			if (ColliderComponent.IsKinematic) {
+				kinematicColliders.Add(new CircleCollider(MainComponent.Position, MainComponent.Radius, height,
+					height + MainComponent.HeightScale, GetColliderInfo(), ColliderType.Bumper));
+			} else {
+				colliders.Add(new CircleCollider(MainComponent.Position, MainComponent.Radius, height,
+					height + MainComponent.HeightScale, GetColliderInfo(), ColliderType.Bumper));
+			}
 		}
 
 		#endregion
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperCollider.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperCollider.cs
@@ -26,9 +26,6 @@ public static void Collide(ref BallState ball, ref NativeQueue<EventData>.Parall
 			ref CollisionEventData collEvent, ref BumperRingAnimationState ringState, ref BumperSkirtAnimationState skirtState,
 			in ColliderHeader collHeader, in BumperStaticState state, ref Random random)
 		{
-			// todo
-			// if (!m_enabled) return;
-
 			var dot = math.dot(collEvent.HitNormal, ball.Velocity); // needs to be computed before Collide3DWall()!
 			var material = collHeader.Material;
 			BallCollider.Collide3DWall(ref ball, in material, in collEvent, in collEvent.HitNormal, ref random); // reflect ball from wall
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperColliderComponent.cs
@@ -16,13 +16,14 @@
 
 // ReSharper disable InconsistentNaming
 
+using Unity.Mathematics;
 using UnityEngine;
 using VisualPinball.Engine.VPT.Bumper;
 
 namespace VisualPinball.Unity
 {
 	[AddComponentMenu("Visual Pinball/Collision/Bumper Collider")]
-	public class BumperColliderComponent : ColliderComponent<BumperData, BumperComponent>
+	public class BumperColliderComponent : ColliderComponent<BumperData, BumperComponent>, IKinematicColliderComponent
 	{
 		#region Data
 
@@ -41,6 +42,17 @@ public class BumperColliderComponent : ColliderComponent<BumperData, BumperCompo
 		[Tooltip("If set, a hit event is triggered.")]
 		public bool HitEvent = true;
 
+		[Tooltip("If set, transforming this object will transform the colliders as well.")]
+		public bool _isKinematic;
+
+		#endregion
+
+		#region IKinematicColliderComponent
+
+		public bool IsKinematic => _isKinematic;
+		public int ItemId => MainComponent.gameObject.GetInstanceID();
+		public float4x4 TransformationMatrix => MainComponent.TransformationMatrix;
+
 		#endregion
 
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperComponent.cs
@@ -77,7 +77,8 @@ public class BumperComponent : MainRenderableComponent<BumperData>,
 		private const string BaseMeshName = "bumper.base";
 		private const string CapMeshName = "bumper.cap";
 		private const string RingMeshName = "bumper.ring";
-		private const float DataMeshScale = 100f;
+
+		public const float DataMeshScale = 100f;
 
 		public const string SocketSwitchItem = "socket_switch";
 
@@ -146,6 +147,15 @@ public override void UpdateTransforms()
 			t.localEulerAngles = new Vector3(0, Orientation, 0);
 		}
 
+		public float4x4 TransformationMatrix {
+			get {
+				var scaleMatrix = float4x4.Scale(new float3(Radius * 2f, Radius * 2f, HeightScale) / DataMeshScale);
+				var transMatrix = float4x4.Translate(new float3(Position.x, Position.y, PositionZ));
+				var rotMatrix = float4x4.RotateZ(math.radians(Orientation));
+				return math.mul(transMatrix, math.mul(rotMatrix, scaleMatrix));
+			}
+		}
+
 		#endregion
 
 		#region Conversion

Original file line number	Diff line number	Diff line change
`@@ -237,9 +237,11 @@ private void Update()`
`237`	`237`	`}`
`238`	`238`	`var lastTransformationMatrix = _kinematicTransforms[coll.ItemId];`
`239`	`239`	`var currTransformationMatrix = coll.TransformationMatrix;`
`240`		`- if (!lastTransformationMatrix.Equals(currTransformationMatrix)) {`
`241`		`- _updatedKinematicTransforms.Add(coll.ItemId, currTransformationMatrix);`
	`240`	`+ if (lastTransformationMatrix.Equals(currTransformationMatrix)) {`
	`241`	`+ continue;`
`242`	`242`	`}`
	`243`	`+ _updatedKinematicTransforms.Add(coll.ItemId, currTransformationMatrix);`
	`244`	`+ _kinematicTransforms[coll.ItemId] = currTransformationMatrix;`
`243`	`245`	`}`
`244`	`246`
`245`	`247`	`// prepare job`
`@@ -464,5 +466,16 @@ public ScheduledAction(ulong scheduleAt, Action action)`
`464`	`466`	`Action = action;`
`465`	`467`	`}`
`466`	`468`	`}`
	`469`	`+`
	`470`	`+ public ICollider[] GetKinematicColliders(int itemId)`
	`471`	`+ {`
	`472`	`+ ref var colliderIds = ref _kinematicColliderLookups.GetValueByRef(itemId);`
	`473`	`+ var colliders = new ICollider[colliderIds.Length];`
	`474`	`+ for (var i = 0; i < colliderIds.Length; i++) {`
	`475`	`+ var colliderId = colliderIds[i];`
	`476`	`+ colliders[i] = _kinematicColliders[colliderId];`
	`477`	`+ }`
	`478`	`+ return colliders;`
	`479`	`+ }`
`467`	`480`	`}`
`468`	`481`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public int Id`
`30`	`30`
`31`	`31`	`public ColliderHeader Header;`
`32`	`32`
`33`		`- public readonly float2 Center;`
`34`		`- public readonly float Radius;`
	`33`	`+ public float2 Center;`
	`34`	`+ public float Radius;`
`35`	`35`
`36`	`36`	`private readonly float _zHigh;`
`37`	`37`	`private readonly float _zLow;`
`@@ -221,5 +221,12 @@ public void Collide(ref BallState ball, in CollisionEventData collEvent, ref Ran`
`221`	`221`	`{`
`222`	`222`	`BallCollider.Collide3DWall(ref ball, in Header.Material, in collEvent, in collEvent.HitNormal, ref random);`
`223`	`223`	`}`
	`224`	`+`
	`225`	`+ public void Transform(CircleCollider circle, float4x4 matrix)`
	`226`	`+ {`
	`227`	`+ var size = matrix.GetScale();`
	`228`	`+ Center = math.mul(matrix, new float4(circle.Center, 0f, 1f)).xy;`
	`229`	`+ Radius = size.x / 2 * BumperComponent.DataMeshScale;`
	`230`	`+ }`
`224`	`231`	`}`
`225`	`232`	`}`