Skip to content

refactor: B2Manifold usage to use 'in' parameters #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ikpil merged 1 commit into from
Dec 23, 2025
Merged

refactor: B2Manifold usage to use 'in' parameters #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/Box2D.NET.Samples/Samples/Collisions/Manifold.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ public override void MouseMove(B2Vec2 p)
}
}

void DrawManifold(ref B2Manifold manifold, B2Vec2 origin1, B2Vec2 origin2)
void DrawManifold(in B2Manifold manifold, B2Vec2 origin1, B2Vec2 origin2)
{
if (m_showCount)
{
Expand Down Expand Up @@ -249,7 +249,7 @@ public override void Step()
DrawSolidCircle(m_draw, new B2Transform(circle1.center, transform1.q), circle1.radius, color1);
DrawSolidCircle(m_draw, new B2Transform(circle2.center, transform2.q), circle2.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -270,7 +270,7 @@ public override void Step()

DrawSolidCircle(m_draw, new B2Transform(circle.center, transform2.q), circle.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -291,7 +291,7 @@ public override void Step()

DrawSolidCircle(m_draw, new B2Transform(circle.center, transform2.q), circle.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -310,7 +310,7 @@ public override void Step()
DrawSolidPolygon(m_draw, transform1, box.vertices.AsSpan(), box.count, m_round, color1);
DrawSolidCircle(m_draw, new B2Transform(circle.center, transform2.q), circle.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -333,7 +333,7 @@ public override void Step()
v2 = b2TransformPoint(transform2, capsule2.center2);
DrawSolidCapsule(m_draw, v1, v2, capsule2.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -354,7 +354,7 @@ public override void Step()
B2Vec2 v2 = b2TransformPoint(transform2, capsule.center2);
DrawSolidCapsule(m_draw, v1, v2, capsule.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -377,7 +377,7 @@ public override void Step()
p2 = b2TransformPoint(transform2, capsule.center2);
DrawSolidCapsule(m_draw, p1, p2, capsule.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -399,7 +399,7 @@ public override void Step()
DrawSolidPolygon(m_draw, transform1, box1.vertices.AsSpan(), box1.count, box1.radius, color1);
DrawSolidPolygon(m_draw, transform2, box.vertices.AsSpan(), box.count, box.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -418,7 +418,7 @@ public override void Step()
DrawSolidPolygon(m_draw, transform1, box1.vertices.AsSpan(), box1.count, box1.radius, color1);
DrawSolidPolygon(m_draw, transform2, box.vertices.AsSpan(), box.count, box.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -438,7 +438,7 @@ public override void Step()
DrawSolidPolygon(m_draw, transform1, box.vertices.AsSpan(), box.count, box.radius, color1);
DrawSolidPolygon(m_draw, transform2, rox.vertices.AsSpan(), rox.count, rox.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -458,7 +458,7 @@ public override void Step()
DrawSolidPolygon(m_draw, transform1, rox.vertices.AsSpan(), rox.count, rox.radius, color1);
DrawSolidPolygon(m_draw, transform2, rox.vertices.AsSpan(), rox.count, rox.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -480,7 +480,7 @@ public override void Step()
DrawLine(m_draw, p1, p2, color1);
DrawSolidPolygon(m_draw, transform2, rox.vertices.AsSpan(), rox.count, rox.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -501,7 +501,7 @@ public override void Step()
DrawSolidPolygon(m_draw, transform2, wox.vertices.AsSpan(), wox.count, wox.radius, color2);
DrawSolidPolygon(m_draw, transform2, wox.vertices.AsSpan(), wox.count, 0.0f, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -528,7 +528,7 @@ public override void Step()
DrawSolidPolygon(m_draw, transform2, w2.vertices.AsSpan(), w2.count, w2.radius, color2);
DrawSolidPolygon(m_draw, transform2, w2.vertices.AsSpan(), w2.count, 0.0f, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand All @@ -551,7 +551,7 @@ public override void Step()
DrawSolidPolygon(m_draw, transform1, box.vertices.AsSpan(), box.count, 0.0f, color1);
DrawSolidPolygon(m_draw, transform2, tri.vertices.AsSpan(), tri.count, 0.0f, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset = b2Add(offset, increment);
}
Expand Down Expand Up @@ -580,7 +580,7 @@ public override void Step()
DrawLine(m_draw, p2, g2, B2HexColor.b2_colorLightGray);
DrawSolidCircle(m_draw, new B2Transform(circle.center, transform2.q), circle.radius, color2);

DrawManifold(ref m, transform1.p, transform2.p);
DrawManifold(m, transform1.p, transform2.p);

offset.X += 2.0f * increment.X;
}
Expand Down Expand Up @@ -637,8 +637,8 @@ public override void Step()
DrawSolidPolygon(m_draw, transform2, rox.vertices.AsSpan(), rox.count, rox.radius, color2);
DrawPoint(m_draw, b2TransformPoint(transform2, rox.centroid), 5.0f, B2HexColor.b2_colorGainsboro);

DrawManifold(ref m1, transform1.p, transform2.p);
DrawManifold(ref m2, transform1.p, transform2.p);
DrawManifold(m1, transform1.p, transform2.p);
DrawManifold(m2, transform1.p, transform2.p);

offset.X += 2.0f * increment.X;
}
Expand Down Expand Up @@ -699,8 +699,8 @@ public override void Step()
DrawPoint(m_draw, b2Lerp(p1, p2, 0.5f), 5.0f, B2HexColor.b2_colorGainsboro);
}

DrawManifold(ref m1, transform1.p, transform2.p);
DrawManifold(ref m2, transform1.p, transform2.p);
DrawManifold(m1, transform1.p, transform2.p);
DrawManifold(m2, transform1.p, transform2.p);

offset.X += 2.0f * increment.X;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Box2D.NET.Samples/Samples/Collisions/SmoothManifold.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public override void MouseMove(B2Vec2 p)
}
}

void DrawManifold(ref B2Manifold manifold)
void DrawManifold(in B2Manifold manifold)
{
for (int i = 0; i < manifold.pointCount; ++i)
{
Expand Down Expand Up @@ -287,7 +287,7 @@ public override void Draw()
{
ref B2ChainSegment segment = ref m_segments[i];
B2Manifold m = b2CollideChainSegmentAndCircle(ref segment, transform1, ref circle, transform2);
DrawManifold(ref m);
DrawManifold(m);
}
}
else if (m_shapeType == ShapeType.e_boxShape)
Expand All @@ -301,7 +301,7 @@ public override void Draw()
ref B2ChainSegment segment = ref m_segments[i];
B2SimplexCache cache = new B2SimplexCache();
B2Manifold m = b2CollideChainSegmentAndPolygon(ref segment, transform1, ref rox, transform2, ref cache);
DrawManifold(ref m);
DrawManifold(m);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Box2D.NET/B2ContactData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public struct B2ContactData
public B2ShapeId shapeIdB;
public B2Manifold manifold;

public B2ContactData(in B2ContactId contactId, in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, B2Manifold manifold)
public B2ContactData(in B2ContactId contactId, in B2ShapeId shapeIdA, in B2ShapeId shapeIdB, in B2Manifold manifold)
{
this.contactId = contactId;
this.shapeIdA = shapeIdA;
Expand Down
Loading