Refactor: Remove 'in' modifier for small ID structs

src/Box2D.NET.Samples/Samples/Benchmarks/BenchmarkCast.cs

@@ -163,7 +163,7 @@ void BuildScene()
         m_minTime = 1e6f;
     }
 
-    static float CastCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
+    static float CastCallback(B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
     {
         CastResult result = context as CastResult;
         result.point = point;
@@ -173,7 +173,7 @@ static float CastCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, flo
     }
 
 
-    static bool OverlapCallback(in B2ShapeId shapeId, object context)
+    static bool OverlapCallback(B2ShapeId shapeId, object context)
     {
         OverlapResult result = context as OverlapResult;
         if (result.count < 32)

src/Box2D.NET.Samples/Samples/Benchmarks/BenchmarkSensor.cs

@@ -143,7 +143,7 @@ void CreateRow(float y)
         }
     }
 
-    private bool Filter(in B2ShapeId idA, in B2ShapeId idB)
+    private bool Filter(B2ShapeId idA, B2ShapeId idB)
     {
         ShapeUserData userData = null;
         if (b2Shape_IsSensor(idA))
@@ -163,7 +163,7 @@ private bool Filter(in B2ShapeId idA, in B2ShapeId idB)
         return true;
     }
 
-    private static bool FilterFcn(in B2ShapeId idA, in B2ShapeId idB, object context)
+    private static bool FilterFcn(B2ShapeId idA, B2ShapeId idB, object context)
     {
         BenchmarkSensor self = context as BenchmarkSensor;
         return self.Filter(idA, idB);

src/Box2D.NET.Samples/Samples/Characters/Mover.cs

@@ -85,7 +85,7 @@
     public bool m_jumpReleased;
     public bool m_lockCamera;
 
     private int m_deltaX;
     private int m_deltaY;
 
     private static Sample Create(SampleContext context)
@@ -93,7 +93,7 @@
         return new Mover(context);
     }
 
-    private static float CastCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
+    private static float CastCallback(B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
     {
         CastResult result = (CastResult)context;
         result.point = point;
@@ -307,7 +307,7 @@
             desiredSpeed = m_maxSpeed;
         }
 
         float noWalkSteer = 0.0f;
         if (m_onGround)
         {
             m_velocity.Y = 0.0f;
@@ -497,7 +497,7 @@
         ImGui.End();
     }
 
-    static bool PlaneResultFcn(in B2ShapeId shapeId, ref B2PlaneResult planeResult, object context)
+    static bool PlaneResultFcn(B2ShapeId shapeId, ref B2PlaneResult planeResult, object context)
     {
         B2_ASSERT(planeResult.hit == true);
 
@@ -521,7 +521,7 @@
         return true;
     }
 
-    static bool Kick(in B2ShapeId shapeId, object context)
+    static bool Kick(B2ShapeId shapeId, object context)
     {
         Mover self = (Mover)context;
         B2BodyId bodyId = b2Shape_GetBody(shapeId);

src/Box2D.NET.Samples/Samples/Collisions/CastWorld.cs

@@ -556,7 +556,7 @@ public override void Draw()
 
 
     // This callback finds the closest hit. This is the most common callback used in games.
-    static float RayCastClosestCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
+    static float RayCastClosestCallback(B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
     {
         CastContext rayContext = (CastContext)context;
 
@@ -584,7 +584,7 @@ static float RayCastClosestCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 n
     // This callback finds any hit. For this type of query we are usually just checking for obstruction,
     // so the hit data is not relevant.
     // NOTE: shape hits are not ordered, so this may not return the closest hit
-    static float RayCastAnyCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
+    static float RayCastAnyCallback(B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
     {
         CastContext rayContext = (CastContext)context;
 
@@ -614,7 +614,7 @@ static float RayCastAnyCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 norma
     // NOTE: shape hits are not ordered, so this may return hits in any order. This means that
     // if you limit the number of results, you may discard the closest hit. You can see this
     // behavior in the sample.
-    static float RayCastMultipleCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
+    static float RayCastMultipleCallback(B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
     {
         CastContext rayContext = (CastContext)context;
 
@@ -648,7 +648,7 @@ static float RayCastMultipleCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2
     }
 
     // This ray cast collects multiple hits along the ray and sorts them.
-    static float RayCastSortedCallback(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
+    static float RayCastSortedCallback(B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context)
     {
         CastContext rayContext = (CastContext)context;
 

src/Box2D.NET.Samples/Samples/Collisions/OverlapWorld.cs

@@ -50,7 +50,7 @@
     private B2Vec2 m_startPosition;
 
     private B2Vec2 m_position;
     private B2Vec2 m_basePosition;
     private float m_angle;
     private float m_baseAngle;
 
@@ -64,7 +64,7 @@
     }
 
 
-    static bool OverlapResultFcn(in B2ShapeId shapeId, object context)
+    static bool OverlapResultFcn(B2ShapeId shapeId, object context)
     {
         ShapeUserData userData = b2Shape_GetUserData(shapeId).GetRef<ShapeUserData>();
         if (userData != null && userData.ignore)

src/Box2D.NET.Samples/Samples/Events/Platform.cs

@@ -116,7 +116,7 @@ public Platform(SampleContext context) : base(context)
         m_jumping = false;
     }
 
-    private static bool PreSolveStatic(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, B2Vec2 point, B2Vec2 normal, object context)
+    private static bool PreSolveStatic(B2ShapeId shapeIdA, B2ShapeId shapeIdB, B2Vec2 point, B2Vec2 normal, object context)
     {
         Platform self = context as Platform;
         return self.PreSolve(shapeIdA, shapeIdB, point, normal);
@@ -125,7 +125,7 @@ private static bool PreSolveStatic(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB,
     // This callback must be thread-safe. It may be called multiple times simultaneously.
     // Notice how this method is constant and doesn't change any data. It also
     // does not try to access any values in the world that may be changing, such as contact data.
-    public bool PreSolve(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, B2Vec2 point, B2Vec2 normal)
+    public bool PreSolve(B2ShapeId shapeIdA, B2ShapeId shapeIdB, B2Vec2 point, B2Vec2 normal)
     {
         B2_ASSERT(b2Shape_IsValid(shapeIdA));
         B2_ASSERT(b2Shape_IsValid(shapeIdB));

src/Box2D.NET.Samples/Samples/Events/SensorHits.cs

@@ -189,7 +189,7 @@ public override void UpdateGui()
         ImGui.End();
     }
 
-    void CollectTransforms(in B2ShapeId sensorShapeId)
+    void CollectTransforms(B2ShapeId sensorShapeId)
     {
         const int capacity = 5;
         Span<B2ShapeId> visitorIds = stackalloc B2ShapeId[capacity];

src/Box2D.NET.Samples/Samples/Events/SensorTypes.cs

@@ -139,7 +139,7 @@ public SensorTypes(SampleContext context) : base(context)
         }
     }
 
-    void PrintOverlaps(in B2ShapeId sensorShapeId, string prefix)
+    void PrintOverlaps(B2ShapeId sensorShapeId, string prefix)
     {
         // Determine the necessary capacity
         int capacity = b2Shape_GetSensorCapacity(sensorShapeId);

src/Box2D.NET.Samples/Samples/Issues/ShapeCastChain.cs

@@ -234,7 +234,7 @@ private bool ShapeCastSingle(ref PhysicsHitQueryResult2D outResult, B2Vec2 start
         return false;
     }
 
-    private static float b2CastResult_Closest(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object c)
+    private static float b2CastResult_Closest(B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object c)
     {
         CastContext_Single context = c as CastContext_Single;
 

src/Box2D.NET.Samples/Samples/Sample.cs

@@ -251,7 +251,7 @@ public void ResetText()
         m_textLine = m_textIncrement;
     }
 
-    public bool QueryCallback(in B2ShapeId shapeId, object context)
+    public bool QueryCallback(B2ShapeId shapeId, object context)
     {
         QueryContext queryContext = context as QueryContext;
 

src/Box2D.NET.Samples/Samples/Shapes/CustomFilter.cs

@@ -73,7 +73,7 @@ public override void Step()
         base.Step();
     }
 
-    bool ShouldCollide(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB)
+    bool ShouldCollide(B2ShapeId shapeIdA, B2ShapeId shapeIdB)
     {
         var userDataA = b2Shape_GetUserData(shapeIdA);
         var userDataB = b2Shape_GetUserData(shapeIdB);
@@ -89,7 +89,7 @@ bool ShouldCollide(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB)
         return ((indexA & 1) + (indexB & 1)) != 1;
     }
 
-    static bool CustomFilterStatic(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, object context)
+    static bool CustomFilterStatic(B2ShapeId shapeIdA, B2ShapeId shapeIdB, object context)
     {
         CustomFilter customFilter = context as CustomFilter;
 

src/Box2D.NET/B2ContactBeginTouchEvent.cs

@@ -17,7 +17,7 @@ public struct B2ContactBeginTouchEvent
         /// Used b2Contact_IsValid before using this id.
         public B2ContactId contactId;
 
-        public B2ContactBeginTouchEvent(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, in B2ContactId contactId)
+        public B2ContactBeginTouchEvent(B2ShapeId shapeIdA, B2ShapeId shapeIdB, B2ContactId contactId)
         {
             this.shapeIdA = shapeIdA;
             this.shapeIdB = shapeIdB;

src/Box2D.NET/B2ContactData.cs

@@ -14,7 +14,7 @@ public struct B2ContactData
         public B2ShapeId shapeIdB;
         public B2Manifold manifold;
 
-        public B2ContactData(in B2ContactId contactId, in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, in B2Manifold manifold)
+        public B2ContactData(B2ContactId contactId, B2ShapeId shapeIdA, B2ShapeId shapeIdB, in B2Manifold manifold)
         {
             this.contactId = contactId;
             this.shapeIdA = shapeIdA;

src/Box2D.NET/B2ContactEndTouchEvent.cs

@@ -25,7 +25,7 @@ public struct B2ContactEndTouchEvent
         ///	@see b2Contact_IsValid
         public B2ContactId contactId;
 
-        public B2ContactEndTouchEvent(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, in B2ContactId contactId)
+        public B2ContactEndTouchEvent(B2ShapeId shapeIdA, B2ShapeId shapeIdB, B2ContactId contactId)
         {
             this.shapeIdA = shapeIdA;
             this.shapeIdB = shapeIdB;

src/Box2D.NET/B2Contacts.cs

@@ -630,7 +630,7 @@ internal static bool b2UpdateContact(B2World world, B2ContactSim contactSim, B2S
             return touching;
         }
 
-        internal static B2Contact b2GetContactFullId(B2World world, in B2ContactId contactId)
+        internal static B2Contact b2GetContactFullId(B2World world, B2ContactId contactId)
         {
             int id = contactId.index1 - 1;
             B2Contact contact = b2Array_Get(ref world.contacts, id);
@@ -640,7 +640,7 @@ internal static B2Contact b2GetContactFullId(B2World world, in B2ContactId conta
 
 
         /// Get the data for a contact. The manifold may have no points if the contact is not touching.
-        public static B2ContactData b2Contact_GetData(in B2ContactId contactId)
+        public static B2ContactData b2Contact_GetData(B2ContactId contactId)
         {
             B2World world = b2GetWorld(contactId.world0);
             B2Contact contact = b2GetContactFullId(world, contactId);

src/Box2D.NET/B2Delegates.cs

@@ -81,7 +81,7 @@ namespace Box2D.NET
     /// @see b2ShapeDef
     /// @warning Do not attempt to modify the world inside this callback
     /// @ingroup world
-    public delegate bool b2CustomFilterFcn(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, object context);
+    public delegate bool b2CustomFilterFcn(B2ShapeId shapeIdA, B2ShapeId shapeIdB, object context);
 
     /// Prototype for a pre-solve callback.
     /// This is called after a contact is updated. This allows you to inspect a
@@ -96,14 +96,14 @@ namespace Box2D.NET
     /// Return false if you want to disable the contact this step
     /// @warning Do not attempt to modify the world inside this callback
     /// @ingroup world
-    public delegate bool b2PreSolveFcn(in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, B2Vec2 point, B2Vec2 normal, object context);
+    public delegate bool b2PreSolveFcn(B2ShapeId shapeIdA, B2ShapeId shapeIdB, B2Vec2 point, B2Vec2 normal, object context);
 
     /// Prototype callback for overlap queries.
     /// Called for each shape found in the query.
     /// @see b2World_OverlapABB
     /// @return false to terminate the query.
     /// @ingroup world
-    public delegate bool b2OverlapResultFcn(in B2ShapeId shapeId, object context);
+    public delegate bool b2OverlapResultFcn(B2ShapeId shapeId, object context);
 
     /// Prototype callback for ray and shape casts.
     /// Called for each shape found in the query. You control how the ray cast
@@ -121,11 +121,11 @@ namespace Box2D.NET
     /// @return -1 to filter, 0 to terminate, fraction to clip the ray for closest hit, 1 to continue
     /// @see b2World_CastRay
     /// @ingroup world
-    public delegate float b2CastResultFcn(in B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context);
+    public delegate float b2CastResultFcn(B2ShapeId shapeId, B2Vec2 point, B2Vec2 normal, float fraction, object context);
 
     // Used to collect collision planes for character movers.
     // Return true to continue gathering planes.
-    public delegate bool b2PlaneResultFcn(in B2ShapeId shapeId, ref B2PlaneResult plane, object context);
+    public delegate bool b2PlaneResultFcn(B2ShapeId shapeId, ref B2PlaneResult plane, object context);
 
     // Manifold functions should compute important results in local space to improve precision. However, this
     // interface function takes two world transforms instead of a relative transform for these reasons:

src/Box2D.NET/B2Ids.cs

@@ -52,7 +52,7 @@ public static class B2Ids
         public static bool B2_IS_NULL(B2BodyId id) => id.index1 == 0;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool B2_IS_NULL(in B2ShapeId id) => id.index1 == 0;
+        public static bool B2_IS_NULL(B2ShapeId id) => id.index1 == 0;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool B2_IS_NULL(B2ChainId id) => id.index1 == 0;
@@ -68,7 +68,7 @@ public static class B2Ids
         public static bool B2_IS_NON_NULL(B2BodyId id) => id.index1 != 0;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool B2_IS_NON_NULL(in B2ShapeId id) => id.index1 != 0;
+        public static bool B2_IS_NON_NULL(B2ShapeId id) => id.index1 != 0;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool B2_IS_NON_NULL(B2ChainId id) => id.index1 != 0;
@@ -77,22 +77,22 @@ public static class B2Ids
         public static bool B2_IS_NON_NULL(B2JointId id) => id.index1 != 0;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool B2_IS_NON_NULL(in B2ContactId id) => id.index1 != 0;
+        public static bool B2_IS_NON_NULL(B2ContactId id) => id.index1 != 0;
 
         /// Compare two ids for equality. Doesn't work for b2WorldId. Don't mix types.
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool B2_ID_EQUALS(B2BodyId id1, B2BodyId id2) => id1.index1 == id2.index1 && id1.world0 == id2.world0 && id1.generation == id2.generation;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool B2_ID_EQUALS(in B2ShapeId id1, in B2ShapeId id2) => id1.index1 == id2.index1 && id1.world0 == id2.world0 && id1.generation == id2.generation;
+        public static bool B2_ID_EQUALS(B2ShapeId id1, B2ShapeId id2) => id1.index1 == id2.index1 && id1.world0 == id2.world0 && id1.generation == id2.generation;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool B2_ID_EQUALS(B2ChainId id1, B2ChainId id2) => id1.index1 == id2.index1 && id1.world0 == id2.world0 && id1.generation == id2.generation;
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool B2_ID_EQUALS(B2JointId id1, B2JointId id2) => id1.index1 == id2.index1 && id1.world0 == id2.world0 && id1.generation == id2.generation;
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool B2_ID_EQUALS(in B2ContactId id1, in B2ContactId id2) => id1.index1 == id2.index1 && id1.world0 == id2.world0 && id1.generation == id2.generation;
+        public static bool B2_ID_EQUALS(B2ContactId id1, B2ContactId id2) => id1.index1 == id2.index1 && id1.world0 == id2.world0 && id1.generation == id2.generation;
 
         /// Store a world id into a uint32_t.
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -126,7 +126,7 @@ public static B2BodyId b2LoadBodyId(ulong x)
 
         /// Store a shape id into a ulong.
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ulong b2StoreShapeId(in B2ShapeId id)
+        public static ulong b2StoreShapeId(B2ShapeId id)
         {
             return ((ulong)id.index1 << 32) | ((ulong)id.world0) << 16 | (ulong)id.generation;
         }
@@ -171,7 +171,7 @@ public static B2JointId b2LoadJointId(ulong x)
 
         /// Store a contact id into 16 bytes
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void b2StoreContactId(in B2ContactId id, Span<uint> values)
+        public static void b2StoreContactId(B2ContactId id, Span<uint> values)
         {
             values[0] = (uint)id.index1;
             values[1] = (uint)id.world0;

src/Box2D.NET/B2SensorBeginTouchEvent.cs

@@ -29,7 +29,7 @@ public struct B2SensorBeginTouchEvent
         /// The id of the shape that began touching the sensor shape
         public B2ShapeId visitorShapeId;
 
-        public B2SensorBeginTouchEvent(in B2ShapeId sensorShapeId, in B2ShapeId visitorShapeId)
+        public B2SensorBeginTouchEvent(B2ShapeId sensorShapeId, B2ShapeId visitorShapeId)
         {
             this.sensorShapeId = sensorShapeId;
             this.visitorShapeId = visitorShapeId;

src/Box2D.NET/B2SensorEndTouchEvent.cs

@@ -20,7 +20,7 @@ public struct B2SensorEndTouchEvent
         ///	@see b2Shape_IsValid
         public B2ShapeId visitorShapeId;
 
-        public B2SensorEndTouchEvent(in B2ShapeId sensorShapeId, in B2ShapeId visitorShapeId)
+        public B2SensorEndTouchEvent(B2ShapeId sensorShapeId, B2ShapeId visitorShapeId)
         {
             this.sensorShapeId = sensorShapeId;
             this.visitorShapeId = visitorShapeId;