cleanup: Remove ITargetData.

freezy · Jan 11, 2025 · c867a42 · c867a42
1 parent 5d7fb38
commit c867a42
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 48 deletions.
diff --git a/VisualPinball.Engine/VPT/HitTarget/ITargetData.cs b/VisualPinball.Engine/VPT/HitTarget/ITargetData.cs
diff --git a/VisualPinball.Engine/VPT/HitTarget/ITargetData.cs.meta b/VisualPinball.Engine/VPT/HitTarget/ITargetData.cs.meta
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetApi.cs
@@ -105,7 +105,7 @@ private void SetIsDropped(bool isDropped)
 
 		protected override void CreateColliders(ref ColliderReference colliders, float4x4 translateWithinPlayfieldMatrix, float margin)
 		{
-			var colliderGenerator = new DropTargetColliderGenerator(this, MainComponent, MainComponent, translateWithinPlayfieldMatrix);
+			var colliderGenerator = new DropTargetColliderGenerator(this, MainComponent, translateWithinPlayfieldMatrix);
 			colliderGenerator.GenerateColliders(ref colliders);
 		}
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetColliderGenerator.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetColliderGenerator.cs
@@ -24,8 +24,8 @@ namespace VisualPinball.Unity
 {
 	public class DropTargetColliderGenerator : TargetColliderGenerator
 	{
-		public DropTargetColliderGenerator(IApiColliderGenerator api, ITargetData data, IMeshGenerator meshProvider, float4x4 matrix)
-			: base(api, data, meshProvider, matrix) { }
+		public DropTargetColliderGenerator(IApiColliderGenerator api, TargetComponent comp, float4x4 matrix)
+			: base(api, comp, matrix) { }
 
 		internal void GenerateColliders(ref ColliderReference colliders)
 		{

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetApi.cs
@@ -62,7 +62,7 @@ internal HitTargetApi(GameObject go, Player player, PhysicsEngine physicsEngine)
 
 		protected override void CreateColliders(ref ColliderReference colliders, float4x4 translateWithinPlayfieldMatrix, float margin)
 		{
-			var colliderGenerator = new HitTargetColliderGenerator(ColliderComponent.ColliderMesh, this, MainComponent, MainComponent, translateWithinPlayfieldMatrix);
+			var colliderGenerator = new HitTargetColliderGenerator(ColliderComponent.ColliderMesh, this, MainComponent, translateWithinPlayfieldMatrix);
 			colliderGenerator.GenerateColliders(ref colliders);
 		}
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetColliderGenerator.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetColliderGenerator.cs
@@ -27,9 +27,8 @@ public class HitTargetColliderGenerator : TargetColliderGenerator
 	{
 		private readonly Mesh _colliderMesh;
 
-		public HitTargetColliderGenerator(Mesh colliderMesh, IApiColliderGenerator api, ITargetData data,
-			IMeshGenerator meshProvider, float4x4 matrix)
-			: base(api, data, meshProvider, matrix)
+		public HitTargetColliderGenerator(Mesh colliderMesh, IApiColliderGenerator api, TargetComponent comp, float4x4 matrix)
+			: base(api, comp, matrix)
 		{
 			_colliderMesh = colliderMesh;
 		}

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/TargetColliderGenerator.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/TargetColliderGenerator.cs
@@ -23,15 +23,13 @@ namespace VisualPinball.Unity
 	public abstract class TargetColliderGenerator
 	{
 		protected readonly IApiColliderGenerator Api;
-		protected readonly ITargetData Data;
-		protected readonly IMeshGenerator MeshGenerator;
+		protected readonly TargetComponent Data;
 		protected readonly float4x4 Matrix;
 
-		protected TargetColliderGenerator(IApiColliderGenerator api, ITargetData data, IMeshGenerator meshGenerator, float4x4 matrix)
+		protected TargetColliderGenerator(IApiColliderGenerator api, TargetComponent data, float4x4 matrix)
 		{
 			Api = api;
 			Data = data;
-			MeshGenerator = meshGenerator;
 			Matrix = matrix;
 		}
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/TargetComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/TargetComponent.cs
@@ -36,7 +36,7 @@
 namespace VisualPinball.Unity
 {
 	public abstract class TargetComponent : MainRenderableComponent<HitTargetData>,
-		ISwitchDeviceComponent, ITargetData, IMeshGenerator
+		ISwitchDeviceComponent, IMeshGenerator
 	{
 		#region Data