chore(cleanup): Remove unneeded ItemId from states.

VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsCycle.cs

@@ -103,31 +103,31 @@ internal void Simulate(ref PhysicsState state, in AABB playfieldBounds, ref Nati
 				using (var enumerator = state.FlipperStates.GetEnumerator()) {
 					while (enumerator.MoveNext()) {
 						ref var flipperState = ref enumerator.Current.Value;
-						FlipperDisplacementPhysics.UpdateDisplacement(flipperState.ItemId, ref flipperState.Movement,
+						FlipperDisplacementPhysics.UpdateDisplacement(enumerator.Current.Key, ref flipperState.Movement,
 							ref flipperState.Tricks, in flipperState.Static, hitTime, ref state.EventQueue);
 					}
 				}
 				// gates
 				using (var enumerator = state.GateStates.GetEnumerator()) {
 					while (enumerator.MoveNext()) {
 						ref var gateState = ref enumerator.Current.Value;
-						GateDisplacementPhysics.UpdateDisplacement(gateState.ItemId, ref gateState.Movement, in gateState.Static,
+						GateDisplacementPhysics.UpdateDisplacement(enumerator.Current.Key, ref gateState.Movement, in gateState.Static,
 							hitTime, ref state.EventQueue);
 					}
 				}
 				// plunger
 				using (var enumerator = state.PlungerStates.GetEnumerator()) {
 					while (enumerator.MoveNext()) {
 						ref var plungerState = ref enumerator.Current.Value;
-						PlungerDisplacementPhysics.UpdateDisplacement(plungerState.ItemId, ref plungerState.Movement, ref plungerState.Collider,
+						PlungerDisplacementPhysics.UpdateDisplacement(enumerator.Current.Key, ref plungerState.Movement, ref plungerState.Collider,
 							in plungerState.Static, hitTime, ref state.EventQueue);
 					}
 				}
 				// spinners
 				using (var enumerator = state.SpinnerStates.GetEnumerator()) {
 					while (enumerator.MoveNext()) {
 						ref var spinnerState = ref enumerator.Current.Value;
-						SpinnerDisplacementPhysics.UpdateDisplacement(spinnerState.ItemId, ref spinnerState.Movement, in spinnerState.Static,
+						SpinnerDisplacementPhysics.UpdateDisplacement(enumerator.Current.Key, ref spinnerState.Movement, in spinnerState.Static,
 							hitTime, ref state.EventQueue);
 					}
 				}

VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperComponent.cs

@@ -358,7 +358,6 @@ internal BumperState CreateState()
 				} : default;
 
 			return new BumperState(
-				collComponent ? gameObject.GetInstanceID() : 0,
 				skirtAnimComponent ? skirtAnimComponent.gameObject.GetInstanceID() : 0,
 				ringAnimComponent ? ringAnimComponent.gameObject.GetInstanceID() : 0,
 				staticData,

VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperState.cs

@@ -18,17 +18,15 @@ namespace VisualPinball.Unity
 {
 	internal struct BumperState
 	{
-		internal readonly int ItemId;
 		internal readonly int SkirtItemId;
 		internal int RingItemId;
 		internal BumperStaticState Static;
 		internal BumperRingAnimationState RingAnimation;
 		internal BumperSkirtAnimationState SkirtAnimation;
 
-		public BumperState(int itemId, int skirtItemId, int ringItemId, BumperStaticState @static,
+		public BumperState(int skirtItemId, int ringItemId, BumperStaticState @static,
 			BumperRingAnimationState ringAnimation, BumperSkirtAnimationState skirtAnimation)
 		{
-			ItemId = itemId;
 			SkirtItemId = skirtItemId;
 			RingItemId = ringItemId;
 			Static = @static;

VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperComponent.cs

@@ -506,7 +506,6 @@ internal FlipperState CreateState()
 				// vpx physics
 				var d = GetMaterialData(colliderComponent);
 				var state = new FlipperState(
-					gameObject.GetInstanceID(),
 					d,
 					GetMovementData(d),
 					GetVelocityData(d),

VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperState.cs

@@ -18,19 +18,17 @@ namespace VisualPinball.Unity
 {
 	internal struct FlipperState
 	{
-		internal readonly int ItemId;
 		internal FlipperStaticData Static;
 		internal FlipperMovementState Movement;
 		internal FlipperVelocityData Velocity;
 		internal FlipperHitData Hit;
 		internal FlipperTricksData Tricks;
 		internal SolenoidState Solenoid;
 
-		public FlipperState(int itemId, FlipperStaticData @static, FlipperMovementState movement,
+		public FlipperState(FlipperStaticData @static, FlipperMovementState movement,
 			FlipperVelocityData velocity, FlipperHitData hit, FlipperTricksData tricks,
 			SolenoidState solenoid)
 		{
-			ItemId = itemId;
 			Static = @static;
 			Movement = movement;
 			Velocity = velocity;

VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateComponent.cs

@@ -312,7 +312,6 @@ internal GateState CreateState()
 				} : default;
 
 			return new GateState(
-				collComponent ? gameObject.GetInstanceID() : 0,
 				wireComponent ? wireComponent.gameObject.GetInstanceID() : 0,
 				staticData,
 				movementData

VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateState.cs

@@ -18,14 +18,12 @@ namespace VisualPinball.Unity
 {
 	internal struct GateState
 	{
-		internal readonly int ItemId;
 		internal readonly int WireItemId;
 		internal GateStaticState Static;
 		internal GateMovementState Movement;
 
-		public GateState(int itemId, int wireItemId, GateStaticState @static, GateMovementState movement)
+		public GateState(int wireItemId, GateStaticState @static, GateMovementState movement)
 		{
-			ItemId = itemId;
 			WireItemId = wireItemId;
 			Static = @static;
 			Movement = movement;

VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetComponent.cs

@@ -168,7 +168,6 @@ internal DropTargetState CreateState()
 				} : default;
 
 			return new DropTargetState(
-				colliderComponent && animationComponent ? gameObject.GetInstanceID() : 0,
 				animationComponent ? animationComponent.gameObject.GetInstanceID() : 0,
 				staticData,
 				animationData

VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetState.cs

@@ -18,14 +18,12 @@ namespace VisualPinball.Unity
 {
 	internal struct DropTargetState
 	{
-		internal readonly int ItemId;
 		internal readonly int AnimatedItemId;
 		internal DropTargetStaticState Static;
 		internal DropTargetAnimationState Animation;
 
-		public DropTargetState(int itemId, int animatedItemId, DropTargetStaticState @static, DropTargetAnimationState animation)
+		public DropTargetState(int animatedItemId, DropTargetStaticState @static, DropTargetAnimationState animation)
 		{
-			ItemId = itemId;
 			AnimatedItemId = animatedItemId;
 			Static = @static;
 			Animation = animation;

VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetComponent.cs

@@ -144,7 +144,6 @@ internal HitTargetState CreateState()
 				} : default;
 
 			return new HitTargetState(
-				hitTargetColliderComponent && hitTargetAnimationComponent ? gameObject.GetInstanceID() : 0,
 				hitTargetAnimationComponent ? hitTargetAnimationComponent.gameObject.GetInstanceID() : 0,
 				staticData,
 				animationData

VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetState.cs

@@ -18,14 +18,12 @@ namespace VisualPinball.Unity
 {
 	internal struct HitTargetState
 	{
-		internal readonly int ItemId;
 		internal readonly int AnimatedItemId;
 		internal HitTargetStaticData Static;
 		internal HitTargetAnimationData Animation;
 
-		public HitTargetState(int itemId, int animatedItemId, HitTargetStaticData @static, HitTargetAnimationData animation)
+		public HitTargetState(int animatedItemId, HitTargetStaticData @static, HitTargetAnimationData animation)
 		{
-			ItemId = itemId;
 			AnimatedItemId = animatedItemId;
 			Static = @static;
 			Animation = animation;

VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerComponent.cs

@@ -280,7 +280,6 @@ internal KickerState CreateState()
 				: new ColliderMeshData(KickerHitMesh.Vertices, Radius, new float3(Center.x, Center.y, height), Allocator.Persistent);
 
 			return new KickerState(
-				colliderComponent ? colliderComponent.gameObject.GetInstanceID() : 0,
 				staticData,
 				new KickerCollisionState(),
 				meshData

VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerState.cs

@@ -20,14 +20,12 @@ namespace VisualPinball.Unity
 {
 	internal struct KickerState : IDisposable
 	{
-		internal readonly int ItemId;
 		internal KickerStaticState Static;
 		internal KickerCollisionState Collision;
 		internal ColliderMeshData CollisionMesh;
 
-		public KickerState(int itemId, KickerStaticState @static, KickerCollisionState collision, ColliderMeshData collisionMesh)
+		public KickerState(KickerStaticState @static, KickerCollisionState collision, ColliderMeshData collisionMesh)
 		{
-			ItemId = itemId;
 			Static = @static;
 			Collision = collision;
 			CollisionMesh = collisionMesh;

VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerComponent.cs

@@ -303,7 +303,6 @@ internal PlungerState CreateState()
 			};
 
 			return new PlungerState(
-				gameObject.GetInstanceID(),
 				new PlungerStaticState {
 					MomentumXfer = collComponent.MomentumXfer,
 					ScatterVelocity = collComponent.ScatterVelocity,

VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerState.cs

@@ -18,16 +18,14 @@ namespace VisualPinball.Unity
 {
 	internal struct PlungerState
 	{
-		internal readonly int ItemId;
 		internal PlungerStaticState Static;
 		internal PlungerColliderState Collider;
 		internal PlungerMovementState Movement;
 		internal PlungerVelocityState Velocity;
 		internal PlungerAnimationState Animation;
 
-		public PlungerState(int itemId, PlungerStaticState @static, PlungerColliderState collider, PlungerMovementState movement, PlungerVelocityState velocity, PlungerAnimationState animation)
+		public PlungerState(PlungerStaticState @static, PlungerColliderState collider, PlungerMovementState movement, PlungerVelocityState velocity, PlungerAnimationState animation)
 		{
-			ItemId = itemId;
 			Static = @static;
 			Collider = collider;
 			Movement = movement;

VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerComponent.cs

@@ -273,7 +273,6 @@ internal SpinnerState CreateState()
 				} : default;
 
 			return new SpinnerState(
-				collComponent ? gameObject.GetInstanceID() : 0,
 				animComponent ? animComponent.gameObject.GetInstanceID() : 0,
 				staticData,
 				movementData

VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerState.cs

@@ -18,14 +18,12 @@ namespace VisualPinball.Unity
 {
 	internal struct SpinnerState
 	{
-		internal readonly int ItemId;
 		internal readonly int AnimationItemId;
 		internal SpinnerStaticState Static;
 		internal SpinnerMovementState Movement;
 
-		public SpinnerState(int itemId, int animationItemId, SpinnerStaticState @static, SpinnerMovementState movement)
+		public SpinnerState(int animationItemId, SpinnerStaticState @static, SpinnerMovementState movement)
 		{
-			ItemId = itemId;
 			AnimationItemId = animationItemId;
 			Static = @static;
 			Movement = movement;

VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SurfaceComponent.cs

@@ -219,7 +219,7 @@ internal SurfaceState CreateState()
 				return default;
 			}
 
-			return new SurfaceState(gameObject.GetInstanceID(), new LineSlingshotState {
+			return new SurfaceState(new LineSlingshotState {
 				IsDisabled = false,
 				Threshold = collComponent.SlingshotThreshold,
 			});

VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SurfaceState.cs

@@ -18,12 +18,10 @@ namespace VisualPinball.Unity
 {
 	internal struct SurfaceState
 	{
-		internal readonly int ItemId;
 		internal LineSlingshotState Slingshot;
 
-		public SurfaceState(int itemId, LineSlingshotState slingshot)
+		public SurfaceState(LineSlingshotState slingshot)
 		{
-			ItemId = itemId;
 			Slingshot = slingshot;
 		}
 	}

VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerComponent.cs

@@ -261,7 +261,6 @@ internal TriggerState CreateState()
 
 			if (collComponent.ForFlipper == null) {
 				return new TriggerState(
-					gameObject.GetInstanceID(),
 					animComponent ? animComponent.gameObject.GetInstanceID() : 0,
 					new TriggerStaticState {
 						AnimSpeed = animComponent ? animComponent.AnimSpeed : 0,
@@ -275,7 +274,6 @@ internal TriggerState CreateState()
 			}
 
 			return new TriggerState(
-				gameObject.GetInstanceID(),
 				new TriggerStaticState {
 					AnimSpeed = 0,
 					Radius = collComponent.HitCircleRadius,

VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerState.cs

@@ -20,7 +20,6 @@ namespace VisualPinball.Unity
 {
 	internal struct TriggerState : IDisposable
 	{
-		internal readonly int ItemId;
 		internal readonly int AnimatedItemId;
 		internal TriggerStaticState Static;
 		internal TriggerMovementState Movement;
@@ -30,9 +29,8 @@ internal struct TriggerState : IDisposable
 		/// <summary>
 		/// Default trigger usage.
 		/// </summary>
-		public TriggerState(int itemId, int animatedItemId, TriggerStaticState @static, TriggerMovementState movement, TriggerAnimationState animation)
+		public TriggerState(int animatedItemId, TriggerStaticState @static, TriggerMovementState movement, TriggerAnimationState animation)
 		{
-			ItemId = itemId;
 			AnimatedItemId = animatedItemId;
 			Static = @static;
 			Movement = movement;
@@ -43,9 +41,8 @@ public TriggerState(int itemId, int animatedItemId, TriggerStaticState @static,
 		/// <summary>
 		/// Flipper correction usage.
 		/// </summary>
-		public TriggerState(int itemId, TriggerStaticState @static, FlipperCorrectionState flipperCorrection)
+		public TriggerState(TriggerStaticState @static, FlipperCorrectionState flipperCorrection)
 		{
-			ItemId = itemId;
 			AnimatedItemId = 0;
 			Static = @static;
 			Movement = default;