style: Put physics material into blocks.

freezy · Jan 30, 2025 · c8feddc · c8feddc
1 parent 91c886d
commit c8feddc
Show file tree

Hide file tree

Showing 16 changed files with 76 additions and 16 deletions.
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperApi.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperApi.cs
@@ -96,9 +96,9 @@ void IApiCoil.OnCoil(bool enabled)
 						IsKinematic = false,
 						BallId = ballId
 					};
-					var physicsMaterialData = ColliderComponent.PhysicsMaterialData;
-					var random = PhysicsEngine.Random;
-					BallCollider.Collide3DWall(ref ballState, in physicsMaterialData, in collEvent, in bumpDirection, ref random);
+					//var physicsMaterialData = ColliderComponent.PhysicsMaterialData;
+					//var random = PhysicsEngine.;
+					//BallCollider.Collide3DWall(ref ballState, in physicsMaterialData, in collEvent, in bumpDirection, ref state);
 					ballState.Velocity += bumpDirection * ColliderComponent.Force;
 				}
 			}

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Bumper/BumperColliderComponent.cs
@@ -44,13 +44,17 @@ public class BumperColliderComponent : ColliderComponent<BumperData, BumperCompo
 
 		#endregion
 
-		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
-			=> MainComponent.BumperApi ?? new BumperApi(gameObject, player, physicsEngine);
+		#region Physics Material
 
 		protected override float PhysicsElasticity => 1;
 		protected override float PhysicsElasticityFalloff => 1;
 		protected override float PhysicsFriction => 0;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => true;
+
+		#endregion
+
+		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
+			=> MainComponent.BumperApi ?? new BumperApi(gameObject, player, physicsEngine);
 	}
 }
diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Flipper/FlipperColliderComponent.cs
@@ -76,12 +76,16 @@ public class FlipperColliderComponent : ColliderComponent<FlipperData, FlipperCo
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => ElasticityFalloff;
 		protected override float PhysicsFriction => Friction;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => true;
 
+		#endregion
+
 		#region FlipperTricks
 		/// <summary>
 		/// If set, apply Flipper Tricks Physics (nFozzy/RothBauerW)

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Gate/GateColliderComponent.cs
@@ -64,6 +64,16 @@ public class GateColliderComponent : ColliderComponent<GateData, GateComponent>,
 
 		#endregion
 
+		#region Physics Material
+
+		protected override float PhysicsElasticity => Elasticity;
+		protected override float PhysicsElasticityFalloff => 1;
+		protected override float PhysicsFriction => Friction;
+		protected override float PhysicsScatter => 0;
+		protected override bool PhysicsOverwrite => true;
+
+		#endregion
+
 		#region IGateColliderData
 
 		public float AngleMin { get => _angleMin; set => _angleMin = value; }
@@ -73,12 +83,6 @@ public class GateColliderComponent : ColliderComponent<GateData, GateComponent>,
 
 		#endregion
 
-		protected override float PhysicsElasticity => Elasticity;
-		protected override float PhysicsElasticityFalloff => 1;
-		protected override float PhysicsFriction => Friction;
-		protected override float PhysicsScatter => 0;
-		protected override bool PhysicsOverwrite => true;
-
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> MainComponent.GateApi ?? new GateApi(gameObject, player, physicsEngine);
 	}

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/DropTargetColliderComponent.cs
@@ -59,12 +59,16 @@ public class DropTargetColliderComponent : ColliderComponent<HitTargetData, Targ
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => ElasticityFalloff;
 		protected override float PhysicsFriction => Friction;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => OverwritePhysics;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> (MainComponent as DropTargetComponent)?.DropTargetApi ?? new DropTargetApi(gameObject, player, physicsEngine);
 	}

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/HitTarget/HitTargetColliderComponent.cs
@@ -56,12 +56,16 @@ public class HitTargetColliderComponent : ColliderComponent<HitTargetData, Targe
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => ElasticityFalloff;
 		protected override float PhysicsFriction => Friction;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => OverwritePhysics;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> (MainComponent as HitTargetComponent)?.HitTargetApi ?? new HitTargetApi(gameObject, player, physicsEngine);
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Kicker/KickerColliderComponent.cs
@@ -49,17 +49,21 @@ public class KickerColliderComponent : ColliderComponent<KickerData, KickerCompo
 
 		#endregion
 
-		private void Awake()
-		{
-			PhysicsEngine = GetComponentInParent<PhysicsEngine>();
-		}
+		#region Physics Material
 
 		protected override float PhysicsElasticity => 1;
 		protected override float PhysicsElasticityFalloff => 1;
 		protected override float PhysicsFriction => 0;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => true;
 
+		#endregion
+
+		private void Awake()
+		{
+			PhysicsEngine = GetComponentInParent<PhysicsEngine>();
+		}
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine) =>
 			MainComponent.KickerApi ?? new KickerApi(gameObject, player, physicsEngine);
 

diff --git a/...alPinball.Unity/VisualPinball.Unity/VPT/MetalWireGuide/MetalWireGuideColliderComponent.cs b/...alPinball.Unity/VisualPinball.Unity/VPT/MetalWireGuide/MetalWireGuideColliderComponent.cs
@@ -53,12 +53,16 @@ public class MetalWireGuideColliderComponent : ColliderComponent<MetalWireGuideD
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => ElasticityFalloff;
 		protected override float PhysicsFriction => Friction;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => OverwritePhysics;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> MainComponent.MetalWireGuideApi ?? new MetalWireGuideApi(gameObject, player, physicsEngine);
 	}

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Playfield/PlayfieldColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Playfield/PlayfieldColliderComponent.cs
@@ -52,14 +52,18 @@ public class PlayfieldColliderComponent : ColliderComponent<TableData, Playfield
 
 		#endregion
 
-		[NonSerialized] public bool ShowAllColliderMeshes = false;
+		#region Physics Material
 
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => ElasticityFalloff;
 		protected override float PhysicsFriction => Friction;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => true;
 
+		#endregion
+
+		[NonSerialized] public bool ShowAllColliderMeshes = false;
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> MainComponent.PlayfieldApi ?? new PlayfieldApi(gameObject, player, physicsEngine);
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Plunger/PlungerColliderComponent.cs
@@ -54,12 +54,16 @@ public class PlungerColliderComponent : ColliderComponent<PlungerData, PlungerCo
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => 1;
 		protected override float PhysicsElasticityFalloff => 1;
 		protected override float PhysicsFriction => 0;
 		protected override float PhysicsScatter => 0;
 		protected override bool PhysicsOverwrite => true;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> MainComponent.PlungerApi ?? new PlungerApi(gameObject, player, physicsEngine);
 	}

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Primitive/PrimitiveColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Primitive/PrimitiveColliderComponent.cs
@@ -59,12 +59,16 @@ public class PrimitiveColliderComponent : ColliderComponent<PrimitiveData, Primi
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => ElasticityFalloff;
 		protected override float PhysicsFriction => Friction;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => OverwritePhysics;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=>MainComponent.PrimitiveApi ?? new PrimitiveApi(gameObject, player, physicsEngine);
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Ramp/RampColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Ramp/RampColliderComponent.cs
@@ -59,12 +59,16 @@ public class RampColliderComponent : ColliderComponent<RampData, RampComponent>
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => 1;
 		protected override float PhysicsFriction => Friction;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => OverwritePhysics;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> MainComponent.RampApi ?? new RampApi(gameObject, player, physicsEngine);
 	}

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Rubber/RubberColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Rubber/RubberColliderComponent.cs
@@ -54,12 +54,16 @@ public class RubberColliderComponent : ColliderComponent<RubberData, RubberCompo
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => ElasticityFalloff;
 		protected override float PhysicsFriction => Friction;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => OverwritePhysics;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> MainComponent.RubberApi ?? new RubberApi(gameObject, player, physicsEngine);
 	}

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Spinner/SpinnerColliderComponent.cs
@@ -36,12 +36,16 @@ public class SpinnerColliderComponent : ColliderComponent<SpinnerData, SpinnerCo
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => 1;
 		protected override float PhysicsFriction => 0;
 		protected override float PhysicsScatter => 0;
 		protected override bool PhysicsOverwrite => true;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> MainComponent.SpinnerApi ?? new SpinnerApi(gameObject, player, physicsEngine);
 

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SurfaceColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Surface/SurfaceColliderComponent.cs
@@ -66,12 +66,16 @@ public class SurfaceColliderComponent : ColliderComponent<SurfaceData, SurfaceCo
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => Elasticity;
 		protected override float PhysicsElasticityFalloff => ElasticityFalloff;
 		protected override float PhysicsFriction => Friction;
 		protected override float PhysicsScatter => Scatter;
 		protected override bool PhysicsOverwrite => OverwritePhysics;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> MainComponent.SurfaceApi ?? new SurfaceApi(gameObject, player, physicsEngine);
 	}

diff --git a/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderComponent.cs b/VisualPinball.Unity/VisualPinball.Unity/VPT/Trigger/TriggerColliderComponent.cs
@@ -50,12 +50,16 @@ public class TriggerColliderComponent : ColliderComponent<TriggerData, TriggerCo
 
 		#endregion
 
+		#region Physics Material
+
 		protected override float PhysicsElasticity => 1;
 		protected override float PhysicsElasticityFalloff => 1;
 		protected override float PhysicsFriction => 0;
 		protected override float PhysicsScatter => 0;
 		protected override bool PhysicsOverwrite => true;
 
+		#endregion
+
 		protected override IApiColliderGenerator InstantiateColliderApi(Player player, PhysicsEngine physicsEngine)
 			=> MainComponent.TriggerApi ?? new TriggerApi(gameObject, player, physicsEngine);
 	}