Skip to content

Commit cfe4c33

Browse files
ikpilikpil
committed
refactor: pass B2Transform by in in b2TransformPoint
1 parent f84d5f2 commit cfe4c33

25 files changed

Lines changed: 166 additions & 166 deletions

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ void SolveMove(float timeStep, float throttle)
333333

334334
float pogoRestLength = 3.0f * m_capsule.radius;
335335
float rayLength = pogoRestLength + m_capsule.radius;
336-
B2Vec2 origin = b2TransformPoint(ref m_transform, m_capsule.center1);
336+
B2Vec2 origin = b2TransformPoint(m_transform, m_capsule.center1);
337337
B2Circle circle = new B2Circle(origin, 0.5f * m_capsule.radius);
338338
B2Vec2 segmentOffset = new B2Vec2(0.75f * m_capsule.radius, 0.0f);
339339
B2Segment segment = new B2Segment(
@@ -436,8 +436,8 @@ void SolveMove(float timeStep, float throttle)
436436
m_planeCount = 0;
437437

438438
B2Capsule mover;
439-
mover.center1 = b2TransformPoint(ref m_transform, m_capsule.center1);
440-
mover.center2 = b2TransformPoint(ref m_transform, m_capsule.center2);
439+
mover.center1 = b2TransformPoint(m_transform, m_capsule.center1);
440+
mover.center2 = b2TransformPoint(m_transform, m_capsule.center2);
441441
mover.radius = m_capsule.radius;
442442

443443
b2World_CollideMover(m_worldId, ref mover, collideFilter, PlaneResultFcn, this);
@@ -544,7 +544,7 @@ public override void Keyboard(Keys key)
544544
{
545545
if (key == Keys.K)
546546
{
547-
B2Vec2 point = b2TransformPoint(ref m_transform, new B2Vec2(0.0f, m_capsule.center1.Y - 3.0f * m_capsule.radius));
547+
B2Vec2 point = b2TransformPoint(m_transform, new B2Vec2(0.0f, m_capsule.center1.Y - 3.0f * m_capsule.radius));
548548
B2Circle circle = new B2Circle(point, 0.5f);
549549
B2ShapeProxy proxy = b2MakeProxy(circle.center, 1, circle.radius);
550550
B2QueryFilter filter = new B2QueryFilter(MoverBit, DebrisBit);
@@ -629,8 +629,8 @@ public override void Draw()
629629
}
630630

631631
{
632-
B2Vec2 p1 = b2TransformPoint(ref m_transform, m_capsule.center1);
633-
B2Vec2 p2 = b2TransformPoint(ref m_transform, m_capsule.center2);
632+
B2Vec2 p1 = b2TransformPoint(m_transform, m_capsule.center1);
633+
B2Vec2 p2 = b2TransformPoint(m_transform, m_capsule.center2);
634634

635635
B2HexColor color = m_onGround ? B2HexColor.b2_colorOrange : B2HexColor.b2_colorAquamarine;
636636
DrawSolidCapsule(m_draw, p1, p2, m_capsule.radius, color);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public override void Step()
425425

426426
B2Transform transform = new B2Transform(m_rayStart, b2MakeRot(m_angle));
427427
B2Circle circle = new B2Circle(m_rayStart, m_castRadius);
428-
B2Capsule capsule = new B2Capsule(b2TransformPoint(ref transform, new B2Vec2(-0.25f, 0.0f)), b2TransformPoint(ref transform, new B2Vec2(0.25f, 0.0f)), m_castRadius);
428+
B2Capsule capsule = new B2Capsule(b2TransformPoint(transform, new B2Vec2(-0.25f, 0.0f)), b2TransformPoint(transform, new B2Vec2(0.25f, 0.0f)), m_castRadius);
429429
B2Polygon box = b2MakeOffsetRoundedBox(0.125f, 0.25f, transform.p, transform.q, m_castRadius);
430430

431431
B2ShapeProxy proxy = new B2ShapeProxy();

‎src/Box2D.NET.Samples/Samples/Collisions/Manifold.cs‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ public override void Step()
264264

265265
B2Manifold m = b2CollideCapsuleAndCircle(ref capsule, transform1, ref circle, transform2);
266266

267-
B2Vec2 v1 = b2TransformPoint(ref transform1, capsule.center1);
268-
B2Vec2 v2 = b2TransformPoint(ref transform1, capsule.center2);
267+
B2Vec2 v1 = b2TransformPoint(transform1, capsule.center1);
268+
B2Vec2 v2 = b2TransformPoint(transform1, capsule.center2);
269269
DrawSolidCapsule(m_draw, v1, v2, capsule.radius, color1);
270270

271271
DrawSolidCircle(m_draw, new B2Transform(circle.center, transform2.q), circle.radius, color2);
@@ -285,8 +285,8 @@ public override void Step()
285285

286286
B2Manifold m = b2CollideSegmentAndCircle(ref segment, transform1, ref circle, transform2);
287287

288-
B2Vec2 p1 = b2TransformPoint(ref transform1, segment.point1);
289-
B2Vec2 p2 = b2TransformPoint(ref transform1, segment.point2);
288+
B2Vec2 p1 = b2TransformPoint(transform1, segment.point1);
289+
B2Vec2 p2 = b2TransformPoint(transform1, segment.point2);
290290
DrawLine(m_draw, p1, p2, color1);
291291

292292
DrawSolidCircle(m_draw, new B2Transform(circle.center, transform2.q), circle.radius, color2);
@@ -325,12 +325,12 @@ public override void Step()
325325

326326
B2Manifold m = b2CollideCapsules(ref capsule1, transform1, ref capsule2, transform2);
327327

328-
B2Vec2 v1 = b2TransformPoint(ref transform1, capsule1.center1);
329-
B2Vec2 v2 = b2TransformPoint(ref transform1, capsule1.center2);
328+
B2Vec2 v1 = b2TransformPoint(transform1, capsule1.center1);
329+
B2Vec2 v2 = b2TransformPoint(transform1, capsule1.center2);
330330
DrawSolidCapsule(m_draw, v1, v2, capsule1.radius, color1);
331331

332-
v1 = b2TransformPoint(ref transform2, capsule2.center1);
333-
v2 = b2TransformPoint(ref transform2, capsule2.center2);
332+
v1 = b2TransformPoint(transform2, capsule2.center1);
333+
v2 = b2TransformPoint(transform2, capsule2.center2);
334334
DrawSolidCapsule(m_draw, v1, v2, capsule2.radius, color2);
335335

336336
DrawManifold(ref m, transform1.p, transform2.p);
@@ -350,8 +350,8 @@ public override void Step()
350350

351351
DrawSolidPolygon(m_draw, ref transform1, box.vertices.AsSpan(), box.count, box.radius, color1);
352352

353-
B2Vec2 v1 = b2TransformPoint(ref transform2, capsule.center1);
354-
B2Vec2 v2 = b2TransformPoint(ref transform2, capsule.center2);
353+
B2Vec2 v1 = b2TransformPoint(transform2, capsule.center1);
354+
B2Vec2 v2 = b2TransformPoint(transform2, capsule.center2);
355355
DrawSolidCapsule(m_draw, v1, v2, capsule.radius, color2);
356356

357357
DrawManifold(ref m, transform1.p, transform2.p);
@@ -369,12 +369,12 @@ public override void Step()
369369

370370
B2Manifold m = b2CollideSegmentAndCapsule(ref segment, transform1, ref capsule, transform2);
371371

372-
B2Vec2 p1 = b2TransformPoint(ref transform1, segment.point1);
373-
B2Vec2 p2 = b2TransformPoint(ref transform1, segment.point2);
372+
B2Vec2 p1 = b2TransformPoint(transform1, segment.point1);
373+
B2Vec2 p2 = b2TransformPoint(transform1, segment.point2);
374374
DrawLine(m_draw, p1, p2, color1);
375375

376-
p1 = b2TransformPoint(ref transform2, capsule.center1);
377-
p2 = b2TransformPoint(ref transform2, capsule.center2);
376+
p1 = b2TransformPoint(transform2, capsule.center1);
377+
p2 = b2TransformPoint(transform2, capsule.center2);
378378
DrawSolidCapsule(m_draw, p1, p2, capsule.radius, color2);
379379

380380
DrawManifold(ref m, transform1.p, transform2.p);
@@ -475,8 +475,8 @@ public override void Step()
475475

476476
B2Manifold m = b2CollideSegmentAndPolygon(ref segment, transform1, ref rox, transform2);
477477

478-
B2Vec2 p1 = b2TransformPoint(ref transform1, segment.point1);
479-
B2Vec2 p2 = b2TransformPoint(ref transform1, segment.point2);
478+
B2Vec2 p1 = b2TransformPoint(transform1, segment.point1);
479+
B2Vec2 p2 = b2TransformPoint(transform1, segment.point2);
480480
DrawLine(m_draw, p1, p2, color1);
481481
DrawSolidPolygon(m_draw, ref transform2, rox.vertices.AsSpan(), rox.count, rox.radius, color2);
482482

@@ -571,10 +571,10 @@ public override void Step()
571571

572572
B2Manifold m = b2CollideChainSegmentAndCircle(ref segment, transform1, ref circle, transform2);
573573

574-
B2Vec2 g1 = b2TransformPoint(ref transform1, segment.ghost1);
575-
B2Vec2 g2 = b2TransformPoint(ref transform1, segment.ghost2);
576-
B2Vec2 p1 = b2TransformPoint(ref transform1, segment.segment.point1);
577-
B2Vec2 p2 = b2TransformPoint(ref transform1, segment.segment.point2);
574+
B2Vec2 g1 = b2TransformPoint(transform1, segment.ghost1);
575+
B2Vec2 g2 = b2TransformPoint(transform1, segment.ghost2);
576+
B2Vec2 p1 = b2TransformPoint(transform1, segment.segment.point1);
577+
B2Vec2 p2 = b2TransformPoint(transform1, segment.segment.point2);
578578
DrawLine(m_draw, g1, p1, B2HexColor.b2_colorLightGray);
579579
DrawLine(m_draw, p1, p2, color1);
580580
DrawLine(m_draw, p2, g2, B2HexColor.b2_colorLightGray);
@@ -615,27 +615,27 @@ public override void Step()
615615
B2Manifold m2 = b2CollideChainSegmentAndPolygon(ref segment2, transform1, ref rox, transform2, ref m_smgroxCache2);
616616

617617
{
618-
B2Vec2 g2 = b2TransformPoint(ref transform1, segment1.ghost2);
619-
B2Vec2 p1 = b2TransformPoint(ref transform1, segment1.segment.point1);
620-
B2Vec2 p2 = b2TransformPoint(ref transform1, segment1.segment.point2);
618+
B2Vec2 g2 = b2TransformPoint(transform1, segment1.ghost2);
619+
B2Vec2 p1 = b2TransformPoint(transform1, segment1.segment.point1);
620+
B2Vec2 p2 = b2TransformPoint(transform1, segment1.segment.point2);
621621
DrawLine(m_draw, p1, p2, color1);
622622
DrawPoint(m_draw, p1, 4.0f, color1);
623623
DrawPoint(m_draw, p2, 4.0f, color1);
624624
DrawLine(m_draw, p2, g2, B2HexColor.b2_colorLightGray);
625625
}
626626

627627
{
628-
B2Vec2 g1 = b2TransformPoint(ref transform1, segment2.ghost1);
629-
B2Vec2 p1 = b2TransformPoint(ref transform1, segment2.segment.point1);
630-
B2Vec2 p2 = b2TransformPoint(ref transform1, segment2.segment.point2);
628+
B2Vec2 g1 = b2TransformPoint(transform1, segment2.ghost1);
629+
B2Vec2 p1 = b2TransformPoint(transform1, segment2.segment.point1);
630+
B2Vec2 p2 = b2TransformPoint(transform1, segment2.segment.point2);
631631
DrawLine(m_draw, g1, p1, B2HexColor.b2_colorLightGray);
632632
DrawLine(m_draw, p1, p2, color1);
633633
DrawPoint(m_draw, p1, 4.0f, color1);
634634
DrawPoint(m_draw, p2, 4.0f, color1);
635635
}
636636

637637
DrawSolidPolygon(m_draw, ref transform2, rox.vertices.AsSpan(), rox.count, rox.radius, color2);
638-
DrawPoint(m_draw, b2TransformPoint(ref transform2, rox.centroid), 5.0f, B2HexColor.b2_colorGainsboro);
638+
DrawPoint(m_draw, b2TransformPoint(transform2, rox.centroid), 5.0f, B2HexColor.b2_colorGainsboro);
639639

640640
DrawManifold(ref m1, transform1.p, transform2.p);
641641
DrawManifold(ref m2, transform1.p, transform2.p);
@@ -670,9 +670,9 @@ public override void Step()
670670
B2Manifold m2 = b2CollideChainSegmentAndCapsule(ref segment2, transform1, ref capsule, transform2, ref m_smgcapCache2);
671671

672672
{
673-
B2Vec2 g2 = b2TransformPoint(ref transform1, segment1.ghost2);
674-
B2Vec2 p1 = b2TransformPoint(ref transform1, segment1.segment.point1);
675-
B2Vec2 p2 = b2TransformPoint(ref transform1, segment1.segment.point2);
673+
B2Vec2 g2 = b2TransformPoint(transform1, segment1.ghost2);
674+
B2Vec2 p1 = b2TransformPoint(transform1, segment1.segment.point1);
675+
B2Vec2 p2 = b2TransformPoint(transform1, segment1.segment.point2);
676676
// m_context.g_draw.DrawSegment(g1, p1, b2HexColor.b2_colorLightGray);
677677
DrawLine(m_draw, p1, p2, color1);
678678
DrawPoint(m_draw, p1, 4.0f, color1);
@@ -681,9 +681,9 @@ public override void Step()
681681
}
682682

683683
{
684-
B2Vec2 g1 = b2TransformPoint(ref transform1, segment2.ghost1);
685-
B2Vec2 p1 = b2TransformPoint(ref transform1, segment2.segment.point1);
686-
B2Vec2 p2 = b2TransformPoint(ref transform1, segment2.segment.point2);
684+
B2Vec2 g1 = b2TransformPoint(transform1, segment2.ghost1);
685+
B2Vec2 p1 = b2TransformPoint(transform1, segment2.segment.point1);
686+
B2Vec2 p2 = b2TransformPoint(transform1, segment2.segment.point2);
687687
DrawLine(m_draw, g1, p1, B2HexColor.b2_colorLightGray);
688688
DrawLine(m_draw, p1, p2, color1);
689689
DrawPoint(m_draw, p1, 4.0f, color1);
@@ -692,8 +692,8 @@ public override void Step()
692692
}
693693

694694
{
695-
B2Vec2 p1 = b2TransformPoint(ref transform2, capsule.center1);
696-
B2Vec2 p2 = b2TransformPoint(ref transform2, capsule.center2);
695+
B2Vec2 p1 = b2TransformPoint(transform2, capsule.center1);
696+
B2Vec2 p2 = b2TransformPoint(transform2, capsule.center2);
697697
DrawSolidCapsule(m_draw, p1, p2, capsule.radius, color2);
698698

699699
DrawPoint(m_draw, b2Lerp(p1, p2, 0.5f), 5.0f, B2HexColor.b2_colorGainsboro);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,8 @@ public override void Step()
354354
else if (m_shapeType == e_capsuleShape)
355355
{
356356
B2Capsule capsule;
357-
capsule.center1 = b2TransformPoint(ref transform, new B2Vec2(-1.0f, 0.0f));
358-
capsule.center2 = b2TransformPoint(ref transform, new B2Vec2(1.0f, 0.0f));
357+
capsule.center1 = b2TransformPoint(transform, new B2Vec2(-1.0f, 0.0f));
358+
capsule.center2 = b2TransformPoint(transform, new B2Vec2(1.0f, 0.0f));
359359
capsule.radius = 0.5f;
360360
proxy = b2MakeProxy(capsule.center1, capsule.center2, 2, capsule.radius);
361361
DrawSolidCapsule(m_draw, capsule.center1, capsule.center2, capsule.radius, B2HexColor.b2_colorWhite);

‎src/Box2D.NET.Samples/Samples/Collisions/RayCast.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ public override void Step()
241241
if (localOutput.hit)
242242
{
243243
output = localOutput;
244-
output.point = b2TransformPoint(ref transform, localOutput.point);
244+
output.point = b2TransformPoint(transform, localOutput.point);
245245
output.normal = b2RotateVector(transform.q, localOutput.normal);
246246
maxFraction = localOutput.fraction;
247247
}
@@ -252,8 +252,8 @@ public override void Step()
252252
// capsule
253253
{
254254
B2Transform transform = new B2Transform(b2Add(m_transform.p, offset), m_transform.q);
255-
B2Vec2 v1 = b2TransformPoint(ref transform, m_capsule.center1);
256-
B2Vec2 v2 = b2TransformPoint(ref transform, m_capsule.center2);
255+
B2Vec2 v1 = b2TransformPoint(transform, m_capsule.center1);
256+
B2Vec2 v2 = b2TransformPoint(transform, m_capsule.center2);
257257
DrawSolidCapsule(m_draw, v1, v2, m_capsule.radius, color1);
258258

259259
B2Vec2 start = b2InvTransformPoint(transform, m_rayStart);
@@ -264,7 +264,7 @@ public override void Step()
264264
if (localOutput.hit)
265265
{
266266
output = localOutput;
267-
output.point = b2TransformPoint(ref transform, localOutput.point);
267+
output.point = b2TransformPoint(transform, localOutput.point);
268268
output.normal = b2RotateVector(transform.q, localOutput.normal);
269269
maxFraction = localOutput.fraction;
270270
}
@@ -285,7 +285,7 @@ public override void Step()
285285
if (localOutput.hit)
286286
{
287287
output = localOutput;
288-
output.point = b2TransformPoint(ref transform, localOutput.point);
288+
output.point = b2TransformPoint(transform, localOutput.point);
289289
output.normal = b2RotateVector(transform.q, localOutput.normal);
290290
maxFraction = localOutput.fraction;
291291
}
@@ -306,7 +306,7 @@ public override void Step()
306306
if (localOutput.hit)
307307
{
308308
output = localOutput;
309-
output.point = b2TransformPoint(ref transform, localOutput.point);
309+
output.point = b2TransformPoint(transform, localOutput.point);
310310
output.normal = b2RotateVector(transform.q, localOutput.normal);
311311
maxFraction = localOutput.fraction;
312312
}
@@ -318,8 +318,8 @@ public override void Step()
318318
{
319319
B2Transform transform = new B2Transform(b2Add(m_transform.p, offset), m_transform.q);
320320

321-
B2Vec2 p1 = b2TransformPoint(ref transform, m_segment.point1);
322-
B2Vec2 p2 = b2TransformPoint(ref transform, m_segment.point2);
321+
B2Vec2 p1 = b2TransformPoint(transform, m_segment.point1);
322+
B2Vec2 p2 = b2TransformPoint(transform, m_segment.point2);
323323
DrawLine(m_draw, p1, p2, color1);
324324

325325
B2Vec2 start = b2InvTransformPoint(transform, m_rayStart);
@@ -330,7 +330,7 @@ public override void Step()
330330
if (localOutput.hit)
331331
{
332332
output = localOutput;
333-
output.point = b2TransformPoint(ref transform, localOutput.point);
333+
output.point = b2TransformPoint(transform, localOutput.point);
334334
output.normal = b2RotateVector(transform.q, localOutput.normal);
335335
maxFraction = localOutput.fraction;
336336
}

‎src/Box2D.NET.Samples/Samples/Collisions/ShapeCast.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private void DrawShape(ShapeType type, B2Transform transform, float radius, B2He
187187
{
188188
case ShapeType.e_point:
189189
{
190-
B2Vec2 p = b2TransformPoint(ref transform, m_point);
190+
B2Vec2 p = b2TransformPoint(transform, m_point);
191191
if (radius > 0.0f)
192192
{
193193
DrawSolidCircle(m_draw, new B2Transform(m_point, transform.q), radius, color);
@@ -201,8 +201,8 @@ private void DrawShape(ShapeType type, B2Transform transform, float radius, B2He
201201

202202
case ShapeType.e_segment:
203203
{
204-
B2Vec2 p1 = b2TransformPoint(ref transform, m_segment.point1);
205-
B2Vec2 p2 = b2TransformPoint(ref transform, m_segment.point2);
204+
B2Vec2 p1 = b2TransformPoint(transform, m_segment.point1);
205+
B2Vec2 p2 = b2TransformPoint(transform, m_segment.point2);
206206

207207
if (radius > 0.0f)
208208
{
@@ -411,7 +411,7 @@ public override void Draw()
411411

412412
for (int i = 0; i < m_proxyB.count; ++i)
413413
{
414-
B2Vec2 p = b2TransformPoint(ref m_transform, m_proxyB.points[i]);
414+
B2Vec2 p = b2TransformPoint(m_transform, m_proxyB.points[i]);
415415
DrawWorldString(m_draw, m_camera, p, B2HexColor.b2_colorWhite, $" {i}");
416416
}
417417
}

‎src/Box2D.NET.Samples/Samples/Collisions/ShapeDistance.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void DrawShape(ShapeType type, ref B2Transform transform, float radius, B2HexCol
169169
{
170170
case ShapeType.e_point:
171171
{
172-
B2Vec2 p = b2TransformPoint(ref transform, m_point);
172+
B2Vec2 p = b2TransformPoint(transform, m_point);
173173
if (radius > 0.0f)
174174
{
175175
DrawSolidCircle(m_draw, new B2Transform(m_point, transform.q), radius, color);
@@ -183,8 +183,8 @@ void DrawShape(ShapeType type, ref B2Transform transform, float radius, B2HexCol
183183

184184
case ShapeType.e_segment:
185185
{
186-
B2Vec2 p1 = b2TransformPoint(ref transform, m_segment.point1);
187-
B2Vec2 p2 = b2TransformPoint(ref transform, m_segment.point2);
186+
B2Vec2 p1 = b2TransformPoint(transform, m_segment.point1);
187+
B2Vec2 p2 = b2TransformPoint(transform, m_segment.point2);
188188

189189
if (radius > 0.0f)
190190
{
@@ -436,7 +436,7 @@ public override void Draw()
436436

437437
for (int i = 0; i < m_proxyB.count; ++i)
438438
{
439-
B2Vec2 p = b2TransformPoint(ref m_transform, m_proxyB.points[i]);
439+
B2Vec2 p = b2TransformPoint(m_transform, m_proxyB.points[i]);
440440
DrawWorldString(m_draw, m_camera, p, B2HexColor.b2_colorWhite, $" {i}");
441441
}
442442
}

‎src/Box2D.NET.Samples/Samples/Collisions/SmoothManifold.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,8 @@ public override void Draw()
271271
for (int i = 0; i < m_count; ++i)
272272
{
273273
ref readonly B2ChainSegment segment = ref m_segments[i];
274-
B2Vec2 p1 = b2TransformPoint(ref transform1, segment.segment.point1);
275-
B2Vec2 p2 = b2TransformPoint(ref transform1, segment.segment.point2);
274+
B2Vec2 p1 = b2TransformPoint(transform1, segment.segment.point1);
275+
B2Vec2 p2 = b2TransformPoint(transform1, segment.segment.point2);
276276
DrawLine(m_draw, p1, p2, color1);
277277
DrawPoint(m_draw, p1, 4.0f, color1);
278278
}

0 commit comments

Comments
 (0)