jobs: Enable colliders for all items.

freezy · Oct 5, 2023 · 241498b · 241498b
1 parent d3eba6f
commit 241498b
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 37 deletions.
diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/InsideOfs.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/InsideOfs.cs
@@ -50,7 +50,7 @@ private void ClearItems(int itemId)
 
 		private void ClearBitIndex(int ballId)
 		{
-			var maps = _insideOfs.GetValueArray(Allocator.TempJob);
+			var maps = _insideOfs.GetValueArray(Allocator.Temp);
 			var index = GetBitIndex(ballId);
 			foreach (var ballIndices in maps) {
 				if (!ballIndices.IsSet(index)) {
@@ -68,7 +68,7 @@ private int GetBitIndex(int ballId)
 				return _bitLookup[ballId];
 			}
 
-			var indices = _bitLookup.GetValueArray(Allocator.TempJob);
+			var indices = _bitLookup.GetValueArray(Allocator.Temp);
 			for (var i = 0; i < 64; i++) {
 				if (indices.Contains(i)) {
 					continue;

diff --git a/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsEngine.cs b/VisualPinball.Unity/VisualPinball.Unity/Game/PhysicsEngine.cs
@@ -62,11 +62,7 @@ internal void Register<T>(T item) where T : MonoBehaviour
 		{
 			var go = item.gameObject;
 			var itemId = go.GetInstanceID();
-			if (_transforms.ContainsKey(itemId)) {
-				// animation components are always added, sometimes they overlap with the main component (i.e. triggers)
-				return;
-			}
-			_transforms.Add(itemId, go.transform);
+			_transforms.TryAdd(itemId, go.transform);
 
 			switch (item) {
 				case BumperComponent c: _bumperStates[itemId] = c.CreateState(); break;

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperColliderComponent.cs
@@ -16,14 +16,13 @@
 
 // ReSharper disable InconsistentNaming
 
-using System.Collections.Generic;
 using UnityEngine;
 using VisualPinball.Engine.VPT.Bumper;
 
 namespace VisualPinball.Unity
 {
 	[AddComponentMenu("Visual Pinball/Collision/Bumper Collider")]
-	public class BumperColliderComponent : ColliderComponent<BumperData, BumperComponent>, ICollidableComponent
+	public class BumperColliderComponent : ColliderComponent<BumperData, BumperComponent>
 	{
 		#region Data
 
@@ -47,12 +46,6 @@ public class BumperColliderComponent : ColliderComponent<BumperData, BumperCompo
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player)
 			=> new BumperApi(gameObject, player);
 
-
-		void ICollidableComponent.GetColliders(Player player, List<ICollider> colliders, float margin)
-		{
-			InstantiateColliderApi(player).CreateColliders(colliders, margin);
-		}
-
 		public override PhysicsMaterialData PhysicsMaterialData => GetPhysicsMaterialData(scatterAngleDeg: Scatter);
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/ColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/ColliderComponent.cs
@@ -34,7 +34,7 @@ namespace VisualPinball.Unity
 {
 	[DisallowMultipleComponent]
 	public abstract class ColliderComponent<TData, TMainComponent> : SubComponent<TData, TMainComponent>,
-		IColliderComponent
+		IColliderComponent, ICollidableComponent
 		where TData : ItemData
 		where TMainComponent : MainComponent<TData>
 	{
@@ -457,6 +457,10 @@ private static void DrawAabb(Aabb aabb, bool isSelected)
 
 		#endregion
 
+		void ICollidableComponent.GetColliders(Player player, List<ICollider> colliders, float margin)
+		{
+			InstantiateColliderApi(player).CreateColliders(colliders, margin);
+		}
 		#endif
 	}
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperColliderComponent.cs
@@ -25,7 +25,7 @@ namespace VisualPinball.Unity
 {
 	[AddComponentMenu("Visual Pinball/Collision/Flipper Collider")]
 	[HelpURL("https://docs.visualpinball.org/creators-guide/manual/mechanisms/flippers.html")]
-	public class FlipperColliderComponent : ColliderComponent<FlipperData, FlipperComponent>, ICollidableComponent
+	public class FlipperColliderComponent : ColliderComponent<FlipperData, FlipperComponent>
 	{
 		#region Data
 
@@ -162,10 +162,5 @@ public class FlipperColliderComponent : ColliderComponent<FlipperData, FlipperCo
 
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player)
 			=> new FlipperApi(gameObject, player);
-
-		void ICollidableComponent.GetColliders(Player player, List<ICollider> colliders, float margin)
-		{
-			InstantiateColliderApi(player).CreateColliders(colliders, margin);
-		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetColliderComponent.cs
@@ -16,8 +16,6 @@
 
 // ReSharper disable InconsistentNaming
 
-using System;
-using Unity.Entities;
 using UnityEngine;
 using VisualPinball.Engine.VPT.HitTarget;
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Playfield/PlayfieldColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Playfield/PlayfieldColliderComponent.cs
@@ -24,7 +24,7 @@
 namespace VisualPinball.Unity
 {
 	[AddComponentMenu("Visual Pinball/Collision/Playfield Collider")]
-	public class PlayfieldColliderComponent : ColliderComponent<TableData, PlayfieldComponent>, ICollidableComponent
+	public class PlayfieldColliderComponent : ColliderComponent<TableData, PlayfieldComponent>
 	{
 		#region Data
 
@@ -56,10 +56,5 @@ public class PlayfieldColliderComponent : ColliderComponent<TableData, Playfield
 		public override PhysicsMaterialData PhysicsMaterialData => GetPhysicsMaterialData(0, 0);
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player)
 			=> new PlayfieldApi(gameObject, player);
-
-		void ICollidableComponent.GetColliders(Player player, List<ICollider> colliders, float margin)
-		{
-			InstantiateColliderApi(player).CreateColliders(colliders, margin);
-		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Primitive/PrimitiveColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Primitive/PrimitiveColliderComponent.cs
@@ -23,7 +23,7 @@
 namespace VisualPinball.Unity
 {
 	[AddComponentMenu("Visual Pinball/Collision/Primitive Collider")]
-	public class PrimitiveColliderComponent : ColliderComponent<PrimitiveData, PrimitiveComponent>, ICollidableComponent
+	public class PrimitiveColliderComponent : ColliderComponent<PrimitiveData, PrimitiveComponent>
 	{
 		#region Data
 
@@ -62,10 +62,5 @@ public class PrimitiveColliderComponent : ColliderComponent<PrimitiveData, Primi
 		public override PhysicsMaterialData PhysicsMaterialData => GetPhysicsMaterialData(Elasticity, ElasticityFalloff, Friction, Scatter, OverwritePhysics);
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player)
 			=> new PrimitiveApi(gameObject, player);
-
-		void ICollidableComponent.GetColliders(Player player, List<ICollider> colliders, float margin)
-		{
-			InstantiateColliderApi(player).CreateColliders(colliders, margin);
-		}
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerComponent.cs
@@ -86,7 +86,7 @@ private void Awake()
 			// register at player
 			GetComponentInParent<Player>().RegisterTrigger(this);
 
-			if (GetComponentInChildren<TriggerColliderComponent>() && GetComponentInChildren<TriggerAnimationComponent>() && GetComponentInChildren<TriggerMeshComponent>()) {
+			if (GetComponentInChildren<TriggerColliderComponent>()) {
 				GetComponentInParent<PhysicsEngine>().Register(this);
 			}
 		}