wip

ikpil · ikpil · commit 31d059c5dbc7 · 2026-01-18T18:40:24.000+09:00
diff --git a/src/Box2D.NET.Samples/Samples/Benchmarks/BenchmarkBarrel.cs b/src/Box2D.NET.Samples/Samples/Benchmarks/BenchmarkBarrel.cs
@@ -298,7 +298,7 @@ void CreateScene()
                     float jointFriction = 0.05f;
                     float jointHertz = 5.0f;
                     float jointDamping = 0.5f;
-                    CreateHuman(ref m_humans[index], m_worldId, bodyDef.position, scale, jointFriction, jointHertz, jointDamping, index + 1, B2UserData.Empty(), false);
+                    CreateHuman(ref m_humans[index], m_worldId, bodyDef.position, scale, jointFriction, jointHertz, jointDamping, index + 1, B2UserData.Empty, false);
                 }
 
                 index += 1;
diff --git a/src/Box2D.NET.Samples/Samples/Continuous/BounceHumans.cs b/src/Box2D.NET.Samples/Samples/Continuous/BounceHumans.cs
@@ -85,7 +85,7 @@ public override void Step()
             float jointDampingRatio = 0.1f;
 
             CreateHuman(ref m_humans[m_humanCount], m_worldId, new B2Vec2(0.0f, 5.0f), 1.0f, jointFrictionTorque, jointHertz,
-                jointDampingRatio, 1, B2UserData.Empty(), true);
+                jointDampingRatio, 1, B2UserData.Empty, true);
             // Human_SetVelocity( m_humans + m_humanCount, { 10.0f - 5.0f * m_humanCount, -20.0f + 5.0f * m_humanCount } );
 
             m_countDown = 2.0f;
diff --git a/src/Box2D.NET.Samples/Samples/Continuous/Drop.cs b/src/Box2D.NET.Samples/Samples/Continuous/Drop.cs
@@ -216,7 +216,7 @@ void Scene3()
         float jointHertz = 1.0f;
         float jointDampingRatio = 0.5f;
 
-        CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 40.0f), 1.0f, jointFrictionTorque, jointHertz, jointDampingRatio, 1, B2UserData.Empty(), true);
+        CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 40.0f), 1.0f, jointFrictionTorque, jointHertz, jointDampingRatio, 1, B2UserData.Empty, true);
 
         m_frameCount = 1;
     }
diff --git a/src/Box2D.NET.Samples/Samples/Issues/ShapeCastChain.cs b/src/Box2D.NET.Samples/Samples/Issues/ShapeCastChain.cs
@@ -69,7 +69,7 @@ public ShapeCastChain(SampleContext context) : base(context)
         };
 
         B2ChainDef worldChainDef = b2DefaultChainDef();
-        worldChainDef.userData = B2UserData.Empty();
+        worldChainDef.userData = B2UserData.Empty;
         worldChainDef.points = points;
         worldChainDef.count = 4;
         worldChainDef.filter.categoryBits = 0x1;
@@ -90,14 +90,14 @@ public ShapeCastChain(SampleContext context) : base(context)
         characterBodyDef.isAwake = false;
         characterBodyDef.motionLocks.angularZ = true;
         characterBodyDef.isEnabled = true;
-        characterBodyDef.userData = B2UserData.Empty();
+        characterBodyDef.userData = B2UserData.Empty;
         characterBodyDef.type = B2BodyType.b2_kinematicBody;
 
         characterBodyId_ = b2CreateBody(m_worldId, characterBodyDef);
 
         B2ShapeDef characterShapeDef = b2DefaultShapeDef();
 
-        characterShapeDef.userData = B2UserData.Empty();
+        characterShapeDef.userData = B2UserData.Empty;
         characterShapeDef.filter.categoryBits = 0x1;
         characterShapeDef.filter.maskBits = 0x1;
         characterShapeDef.filter.groupIndex = 0;
diff --git a/src/Box2D.NET.Samples/Samples/Joints/Driving.cs b/src/Box2D.NET.Samples/Samples/Joints/Driving.cs
@@ -208,7 +208,7 @@ public Driving(SampleContext context) : base(context)
         m_hertz = 5.0f;
         m_dampingRatio = 0.7f;
 
-        m_car.Spawn(m_worldId, new B2Vec2(0.0f, 0.0f), 1.0f, m_hertz, m_dampingRatio, m_torque, B2UserData.Empty());
+        m_car.Spawn(m_worldId, new B2Vec2(0.0f, 0.0f), 1.0f, m_hertz, m_dampingRatio, m_torque, B2UserData.Empty);
     }
 
     public override void UpdateGui()
diff --git a/src/Box2D.NET.Samples/Samples/Joints/Ragdoll.cs b/src/Box2D.NET.Samples/Samples/Joints/Ragdoll.cs
@@ -57,7 +57,7 @@ public Ragdoll(SampleContext context) : base(context)
 
     void Spawn()
     {
-        CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 25.0f), 1.0f, m_jointFrictionTorque, m_jointHertz, m_jointDampingRatio, 1, B2UserData.Empty(), false);
+        CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 25.0f), 1.0f, m_jointFrictionTorque, m_jointHertz, m_jointDampingRatio, 1, B2UserData.Empty, false);
         //Human_ApplyRandomAngularImpulse(ref m_human, 10.0f);
     }
 
diff --git a/src/Box2D.NET.Samples/Samples/Joints/ScaleRagdoll.cs b/src/Box2D.NET.Samples/Samples/Joints/ScaleRagdoll.cs
@@ -55,7 +55,7 @@ void Spawn()
         float jointFrictionTorque = 0.03f;
         float jointHertz = 1.0f;
         float jointDampingRatio = 0.5f;
-        CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 5.0f), m_scale, jointFrictionTorque, jointHertz, jointDampingRatio, 1, B2UserData.Empty(), false);
+        CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 5.0f), m_scale, jointFrictionTorque, jointHertz, jointDampingRatio, 1, B2UserData.Empty, false);
         Human_ApplyRandomAngularImpulse(ref m_human, 10.0f);
     }
 
diff --git a/src/Box2D.NET.Samples/Samples/Joints/ScissorLift.cs b/src/Box2D.NET.Samples/Samples/Joints/ScissorLift.cs
@@ -200,7 +200,7 @@ public ScissorLift(SampleContext context) : base(context)
             m_liftJointId = b2CreateDistanceJoint(m_worldId, distanceDef);
 
             Car car = new Car();
-            car.Spawn(m_worldId, new B2Vec2(0.0f, y + 2.0f), 1.0f, 3.0f, 0.7f, 0.0f, B2UserData.Empty());
+            car.Spawn(m_worldId, new B2Vec2(0.0f, y + 2.0f), 1.0f, 3.0f, 0.7f, 0.0f, B2UserData.Empty);
         }
     }
 
diff --git a/src/Box2D.NET.Samples/Samples/Joints/SoftBody.cs b/src/Box2D.NET.Samples/Samples/Joints/SoftBody.cs
@@ -36,6 +36,6 @@ public SoftBody(SampleContext context) : base(context)
         }
 
         m_donut = new();
-        m_donut.Create(m_worldId, new B2Vec2(0.0f, 10.0f), 2.0f, 0, false, B2UserData.Empty());
+        m_donut.Create(m_worldId, new B2Vec2(0.0f, 10.0f), 2.0f, 0, false, B2UserData.Empty);
     }
 }
diff --git a/src/Box2D.NET.Samples/Samples/Worlds/LargeWorld.cs b/src/Box2D.NET.Samples/Samples/Worlds/LargeWorld.cs
@@ -140,7 +140,7 @@ public LargeWorld(SampleContext context) : base(context)
                 for (int i = 0; i < 5; ++i)
                 {
                     Human human = new Human();
-                    CreateHuman(ref human, m_worldId, position, 1.5f, 0.05f, 0.0f, 0.0f, humanIndex + 1, B2UserData.Empty(), false);
+                    CreateHuman(ref human, m_worldId, position, 1.5f, 0.05f, 0.0f, 0.0f, humanIndex + 1, B2UserData.Empty, false);
                     humanIndex += 1;
                     position.X += 1.0f;
                 }
@@ -152,13 +152,13 @@ public LargeWorld(SampleContext context) : base(context)
                 for (int i = 0; i < 5; ++i)
                 {
                     Donut donut = new Donut();
-                    donut.Create(m_worldId, position, 0.75f, 0, false, B2UserData.Empty());
+                    donut.Create(m_worldId, position, 0.75f, 0, false, B2UserData.Empty);
                     position.X += 2.0f;
                 }
             }
         }
 
-        m_car.Spawn(m_worldId, new B2Vec2(xStart + 20.0f, 40.0f), 10.0f, 2.0f, 0.7f, 2000.0f, B2UserData.Empty());
+        m_car.Spawn(m_worldId, new B2Vec2(xStart + 20.0f, 40.0f), 10.0f, 2.0f, 0.7f, 2000.0f, B2UserData.Empty);
 
         m_cycleIndex = 0;
         m_speed = 0.0f;
diff --git a/src/Box2D.NET.Shared/Benchmarks.cs b/src/Box2D.NET.Shared/Benchmarks.cs
@@ -270,7 +270,7 @@ public static void CreateGroup(RainData rainData, B2WorldId worldId, int rowInde
             for (int i = 0; i < (int)RainConstants.RAIN_GROUP_SIZE; ++i)
             {
                 ref Human human = ref rainData.groups[groupIndex].humans[i];
-                CreateHuman(ref human, worldId, position, scale, jointFriction, jointHertz, jointDamping, i + 1, B2UserData.Empty(), false);
+                CreateHuman(ref human, worldId, position, scale, jointFriction, jointHertz, jointDamping, i + 1, B2UserData.Empty, false);
                 position.X += 0.5f;
             }
         }
diff --git a/src/Box2D.NET/B2UserData.cs b/src/Box2D.NET/B2UserData.cs
@@ -1,69 +1,44 @@
-using System;
 using System.Runtime.InteropServices;
 
 namespace Box2D.NET
 {
     [StructLayout(LayoutKind.Explicit)]
     public readonly struct B2UserData
     {
-        [FieldOffset(0)]
-        public readonly double dValue;
-
-        [FieldOffset(0)]
-        public readonly long iValue;
-        
-        [FieldOffset(0)]
-        public readonly ulong ulValue;
-        
-        [FieldOffset(8)]
-        public readonly object oValue;
+        public static B2UserData Empty => default;
         
-        [FieldOffset(16)]
-        public readonly B2UserDataType type;
+        // Value types (Overlap at offset 0)
+        [FieldOffset(0)] public readonly double dValue;
+        [FieldOffset(0)] public readonly long iValue;
+        [FieldOffset(0)] public readonly ulong ulValue;
 
-        public B2UserData(long i)
+        // Reference type (Offset 8 to avoid GC aliasing)
+        [FieldOffset(8)] public readonly object oValue;
+
+        // Type flag (Offset 16)
+        [FieldOffset(16)] public readonly B2UserDataType type;
+
+        public B2UserData(long i) : this()
         {
             type = B2UserDataType.Signed;
-            
-            dValue = 0.0d;
-            ulValue = 0;
-            oValue = null;
-            
-            //
             iValue = i;
         }
 
-        public B2UserData(ulong ul)
+        public B2UserData(ulong ul) : this()
         {
             type = B2UserDataType.Unsigned;
-            
-            dValue = 0.0d;
-            iValue = 0;
-            oValue = null;
-            
-            //
             ulValue = ul;
         }
-        
-        public B2UserData(double d)
+
+        public B2UserData(double d) : this()
         {
             type = B2UserDataType.Double;
-            iValue = 0;
-            ulValue = 0;
-            oValue = null;
-            
-            //
             dValue = d;
         }
-        
-        public B2UserData(object o)
+
+        public B2UserData(object o) : this()
         {
             type = B2UserDataType.Ref;
-            dValue = 0.0d;
-            iValue = 0;
-            ulValue = 0;
-            
-            //
             oValue = o;
         }
 
@@ -73,21 +48,21 @@ public bool IsEmpty()
             return type == B2UserDataType.None;
         }
 
-        public long GetSigned(long def)
+        public long GetSigned(long def = 0)
         {
             return type == B2UserDataType.Signed
                 ? iValue
                 : def;
         }
-        
-        public ulong GetUnsigned(ulong def)
+
+        public ulong GetUnsigned(ulong def = 0)
         {
             return type == B2UserDataType.Unsigned
-                ? ulValue 
+                ? ulValue
                 : def;
         }
 
-        public double GetDouble(double def)
+        public double GetDouble(double def = 0)
         {
             return type == B2UserDataType.Double
                 ? dValue
@@ -101,30 +76,24 @@ public T GetRef<T>() where T : class
                 : null;
         }
 
-        public static B2UserData Empty()
-        {
-            return new B2UserData();
-        }
-
         public static B2UserData Signed(long i)
         {
             return new B2UserData(i);
         }
-        
+
         public static B2UserData Unsinged(ulong u)
         {
             return new B2UserData(u);
         }
-        
+
         public static B2UserData Double(double d)
         {
             return new B2UserData(d);
         }
-        
+
         public static B2UserData Ref<T>(T o) where T : class
         {
             return new B2UserData(o);
         }
-
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ void CreateScene()`
`298`	`298`	`float jointFriction = 0.05f;`
`299`	`299`	`float jointHertz = 5.0f;`
`300`	`300`	`float jointDamping = 0.5f;`
`301`		`- CreateHuman(ref m_humans[index], m_worldId, bodyDef.position, scale, jointFriction, jointHertz, jointDamping, index + 1, B2UserData.Empty(), false);`
	`301`	`+ CreateHuman(ref m_humans[index], m_worldId, bodyDef.position, scale, jointFriction, jointHertz, jointDamping, index + 1, B2UserData.Empty, false);`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`index += 1;`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ void Scene3()`
`216`	`216`	`float jointHertz = 1.0f;`
`217`	`217`	`float jointDampingRatio = 0.5f;`
`218`	`218`
`219`		`- CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 40.0f), 1.0f, jointFrictionTorque, jointHertz, jointDampingRatio, 1, B2UserData.Empty(), true);`
	`219`	`+ CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 40.0f), 1.0f, jointFrictionTorque, jointHertz, jointDampingRatio, 1, B2UserData.Empty, true);`
`220`	`220`
`221`	`221`	`m_frameCount = 1;`
`222`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public Driving(SampleContext context) : base(context)`
`208`	`208`	`m_hertz = 5.0f;`
`209`	`209`	`m_dampingRatio = 0.7f;`
`210`	`210`
`211`		`- m_car.Spawn(m_worldId, new B2Vec2(0.0f, 0.0f), 1.0f, m_hertz, m_dampingRatio, m_torque, B2UserData.Empty());`
	`211`	`+ m_car.Spawn(m_worldId, new B2Vec2(0.0f, 0.0f), 1.0f, m_hertz, m_dampingRatio, m_torque, B2UserData.Empty);`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`public override void UpdateGui()`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public Ragdoll(SampleContext context) : base(context)`
`57`	`57`
`58`	`58`	`void Spawn()`
`59`	`59`	`{`
`60`		`- CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 25.0f), 1.0f, m_jointFrictionTorque, m_jointHertz, m_jointDampingRatio, 1, B2UserData.Empty(), false);`
	`60`	`+ CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 25.0f), 1.0f, m_jointFrictionTorque, m_jointHertz, m_jointDampingRatio, 1, B2UserData.Empty, false);`
`61`	`61`	`//Human_ApplyRandomAngularImpulse(ref m_human, 10.0f);`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void Spawn()`
`55`	`55`	`float jointFrictionTorque = 0.03f;`
`56`	`56`	`float jointHertz = 1.0f;`
`57`	`57`	`float jointDampingRatio = 0.5f;`
`58`		`- CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 5.0f), m_scale, jointFrictionTorque, jointHertz, jointDampingRatio, 1, B2UserData.Empty(), false);`
	`58`	`+ CreateHuman(ref m_human, m_worldId, new B2Vec2(0.0f, 5.0f), m_scale, jointFrictionTorque, jointHertz, jointDampingRatio, 1, B2UserData.Empty, false);`
`59`	`59`	`Human_ApplyRandomAngularImpulse(ref m_human, 10.0f);`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public ScissorLift(SampleContext context) : base(context)`
`200`	`200`	`m_liftJointId = b2CreateDistanceJoint(m_worldId, distanceDef);`
`201`	`201`
`202`	`202`	`Car car = new Car();`
`203`		`- car.Spawn(m_worldId, new B2Vec2(0.0f, y + 2.0f), 1.0f, 3.0f, 0.7f, 0.0f, B2UserData.Empty());`
	`203`	`+ car.Spawn(m_worldId, new B2Vec2(0.0f, y + 2.0f), 1.0f, 3.0f, 0.7f, 0.0f, B2UserData.Empty);`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ public SoftBody(SampleContext context) : base(context)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`m_donut = new();`
`39`		`- m_donut.Create(m_worldId, new B2Vec2(0.0f, 10.0f), 2.0f, 0, false, B2UserData.Empty());`
	`39`	`+ m_donut.Create(m_worldId, new B2Vec2(0.0f, 10.0f), 2.0f, 0, false, B2UserData.Empty);`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public LargeWorld(SampleContext context) : base(context)`
`140`	`140`	`for (int i = 0; i < 5; ++i)`
`141`	`141`	`{`
`142`	`142`	`Human human = new Human();`
`143`		`- CreateHuman(ref human, m_worldId, position, 1.5f, 0.05f, 0.0f, 0.0f, humanIndex + 1, B2UserData.Empty(), false);`
	`143`	`+ CreateHuman(ref human, m_worldId, position, 1.5f, 0.05f, 0.0f, 0.0f, humanIndex + 1, B2UserData.Empty, false);`
`144`	`144`	`humanIndex += 1;`
`145`	`145`	`position.X += 1.0f;`
`146`	`146`	`}`
`@@ -152,13 +152,13 @@ public LargeWorld(SampleContext context) : base(context)`
`152`	`152`	`for (int i = 0; i < 5; ++i)`
`153`	`153`	`{`
`154`	`154`	`Donut donut = new Donut();`
`155`		`- donut.Create(m_worldId, position, 0.75f, 0, false, B2UserData.Empty());`
	`155`	`+ donut.Create(m_worldId, position, 0.75f, 0, false, B2UserData.Empty);`
`156`	`156`	`position.X += 2.0f;`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`}`
`160`	`160`
`161`		`- m_car.Spawn(m_worldId, new B2Vec2(xStart + 20.0f, 40.0f), 10.0f, 2.0f, 0.7f, 2000.0f, B2UserData.Empty());`
	`161`	`+ m_car.Spawn(m_worldId, new B2Vec2(xStart + 20.0f, 40.0f), 10.0f, 2.0f, 0.7f, 2000.0f, B2UserData.Empty);`
`162`	`162`
`163`	`163`	`m_cycleIndex = 0;`
`164`	`164`	`m_speed = 0.0f;`