fix: very minor prop. grid presentation changes for bepu (#2556)

stride3d · Dec 14, 2024 · 25e65f4 · 25e65f4
1 parent 9f56722
commit 25e65f4
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 71 deletions.
diff --git a/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/BepuSimulation.cs b/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/BepuSimulation.cs
@@ -33,7 +33,7 @@ public sealed class BepuSimulation : IDisposable
     private const string CategoryTime = "Time";
     private const string CategoryConstraints = "Constraints";
     private const string CategoryForces = "Forces";
-    private const string MaskCategory = "Collisions";
+    private const string MaskCategory = "Collision Matrix";
 
     private TimeSpan _fixedTimeStep = TimeSpan.FromTicks(TimeSpan.TicksPerSecond / 60);
     private readonly Dictionary<Type, Elider> _simulationUpdateComponents = new();

diff --git a/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/BodyComponent.cs b/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/BodyComponent.cs
@@ -74,6 +74,40 @@ public bool Gravity
         }
     }
 
+    public InterpolationMode InterpolationMode
+    {
+        get => _interpolationMode;
+        set
+        {
+            if (_interpolationMode == InterpolationMode.None && value != InterpolationMode.None)
+                Simulation?.RegisterInterpolated(this);
+            if (_interpolationMode != InterpolationMode.None && value == InterpolationMode.None)
+                Simulation?.UnregisterInterpolated(this);
+            _interpolationMode = value;
+        }
+    }
+
+    /// <summary>
+    /// Shortcut to <see cref="ContinuousDetection"/>.<see cref="ContinuousDetection.Mode"/>
+    /// </summary>
+    public ContinuousDetectionMode ContinuousDetectionMode
+    {
+        get => _continuous.Mode;
+        set
+        {
+            if (_continuous.Mode == value)
+                return;
+
+            _continuous = value switch
+            {
+                ContinuousDetectionMode.Discrete => ContinuousDetection.Discrete,
+                ContinuousDetectionMode.Passive => ContinuousDetection.Passive,
+                ContinuousDetectionMode.Continuous => ContinuousDetection.Continuous(),
+                _ => throw new ArgumentOutOfRangeException(nameof(value), value, null)
+            };
+        }
+    }
+
     public float SleepThreshold
     {
         get => _sleepThreshold;
@@ -111,40 +145,6 @@ public byte MinimumTimestepCountUnderThreshold
         }
     }
 
-    public InterpolationMode InterpolationMode
-    {
-        get => _interpolationMode;
-        set
-        {
-            if (_interpolationMode == InterpolationMode.None && value != InterpolationMode.None)
-                Simulation?.RegisterInterpolated(this);
-            if (_interpolationMode != InterpolationMode.None && value == InterpolationMode.None)
-                Simulation?.UnregisterInterpolated(this);
-            _interpolationMode = value;
-        }
-    }
-
-    /// <summary>
-    /// Shortcut to <see cref="ContinuousDetection"/>.<see cref="ContinuousDetection.Mode"/>
-    /// </summary>
-    public ContinuousDetectionMode ContinuousDetectionMode
-    {
-        get => _continuous.Mode;
-        set
-        {
-            if (_continuous.Mode == value)
-                return;
-
-            _continuous = value switch
-            {
-                ContinuousDetectionMode.Discrete => ContinuousDetection.Discrete,
-                ContinuousDetectionMode.Passive => ContinuousDetection.Passive,
-                ContinuousDetectionMode.Continuous => ContinuousDetection.Continuous(),
-                _ => throw new ArgumentOutOfRangeException(nameof(value), value, null)
-            };
-        }
-    }
-
     [DataMemberIgnore]
     public bool Awake
     {

diff --git a/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/CollidableComponent.cs b/sources/engine/Stride.BepuPhysics/Stride.BepuPhysics/CollidableComponent.cs
@@ -59,7 +59,7 @@ public abstract class CollidableComponent : EntityComponent
     /// <remarks>
     /// Changing this value will reset some of the internal physics state of this body
     /// </remarks>
-    [MemberRequired, Display(Expand = ExpandRule.Always)]
+    [Display(Expand = ExpandRule.Always)]
     public required ICollider Collider
     {
         get
@@ -80,41 +80,6 @@ public required ICollider Collider
         }
     }
 
-    /// <summary>
-    /// Provides the ability to collect and mutate contact data when this object collides with other objects.
-    /// </summary>
-    public IContactEventHandler? ContactEventHandler
-    {
-        get
-        {
-            return _trigger;
-        }
-        set
-        {
-            if (IsContactHandlerRegistered())
-                UnregisterContactHandler();
-
-            _trigger = value;
-            RegisterContactHandler();
-            TryUpdateMaterialProperties();
-        }
-    }
-
-    [DefaultValueIsSceneBased]
-    public ISimulationSelector SimulationSelector
-    {
-        get
-        {
-            return _simulationSelector;
-        }
-        set
-        {
-            _simulationSelector = value;
-            if (Processor is not null)
-                ReAttach(_simulationSelector.Pick(Processor.BepuConfiguration, Entity));
-        }
-    }
-
     public float SpringFrequency
     {
         get
@@ -189,6 +154,41 @@ public CollisionGroup CollisionGroup
         }
     }
 
+    [DefaultValueIsSceneBased]
+    public ISimulationSelector SimulationSelector
+    {
+        get
+        {
+            return _simulationSelector;
+        }
+        set
+        {
+            _simulationSelector = value;
+            if (Processor is not null)
+                ReAttach(_simulationSelector.Pick(Processor.BepuConfiguration, Entity));
+        }
+    }
+
+    /// <summary>
+    /// Provides the ability to collect and mutate contact data when this object collides with other objects.
+    /// </summary>
+    public IContactEventHandler? ContactEventHandler
+    {
+        get
+        {
+            return _trigger;
+        }
+        set
+        {
+            if (IsContactHandlerRegistered())
+                UnregisterContactHandler();
+
+            _trigger = value;
+            RegisterContactHandler();
+            TryUpdateMaterialProperties();
+        }
+    }
+
     /// <summary>
     /// The center of mass of this object
     /// </summary>