Skip to content

Commit 7605ccf

Browse files
erincattoerincatto
committed
revert debug draw name changes
1 parent 2a39a3b commit 7605ccf

File tree

9 files changed

+100
-100
lines changed

9 files changed

+100
-100
lines changed

‎include/box2d/types.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -1345,32 +1345,32 @@ typedef enum b2HexColor
13451345
typedef struct b2DebugDraw
13461346
{
13471347
/// Draw a closed polygon provided in CCW order.
1348-
void ( *drawPolygon )( const b2Vec2* vertices, int vertexCount, b2HexColor color, void* context );
1348+
void ( *DrawPolygon )( const b2Vec2* vertices, int vertexCount, b2HexColor color, void* context );
13491349

13501350
/// Draw a solid closed polygon provided in CCW order.
1351-
void ( *drawSolidPolygon )( b2Transform transform, const b2Vec2* vertices, int vertexCount, float radius, b2HexColor color,
1351+
void ( *DrawSolidPolygon )( b2Transform transform, const b2Vec2* vertices, int vertexCount, float radius, b2HexColor color,
13521352
void* context );
13531353

13541354
/// Draw a circle.
1355-
void ( *drawCircle )( b2Vec2 center, float radius, b2HexColor color, void* context );
1355+
void ( *DrawCircle )( b2Vec2 center, float radius, b2HexColor color, void* context );
13561356

13571357
/// Draw a solid circle.
1358-
void ( *drawSolidCircle )( b2Transform transform, float radius, b2HexColor color, void* context );
1358+
void ( *DrawSolidCircle )( b2Transform transform, float radius, b2HexColor color, void* context );
13591359

13601360
/// Draw a solid capsule.
1361-
void ( *drawSolidCapsule )( b2Vec2 p1, b2Vec2 p2, float radius, b2HexColor color, void* context );
1361+
void ( *DrawSolidCapsule )( b2Vec2 p1, b2Vec2 p2, float radius, b2HexColor color, void* context );
13621362

13631363
/// Draw a line segment.
1364-
void ( *drawSegment )( b2Vec2 p1, b2Vec2 p2, b2HexColor color, void* context );
1364+
void ( *DrawSegment )( b2Vec2 p1, b2Vec2 p2, b2HexColor color, void* context );
13651365

13661366
/// Draw a transform. Choose your own length scale.
1367-
void ( *drawTransform )( b2Transform transform, void* context );
1367+
void ( *DrawTransform )( b2Transform transform, void* context );
13681368

13691369
/// Draw a point.
1370-
void ( *drawPoint )( b2Vec2 p, float size, b2HexColor color, void* context );
1370+
void ( *DrawPoint )( b2Vec2 p, float size, b2HexColor color, void* context );
13711371

13721372
/// Draw a string in world space
1373-
void ( *drawString )( b2Vec2 p, const char* s, b2HexColor color, void* context );
1373+
void ( *DrawString )( b2Vec2 p, const char* s, b2HexColor color, void* context );
13741374

13751375
/// Bounds to use if restricting drawing to a rectangular region
13761376
b2AABB drawingBounds;

‎samples/draw.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -1368,15 +1368,15 @@ void Draw::Create()
13681368

13691369
m_debugDraw = {};
13701370

1371-
m_debugDraw.drawPolygon = DrawPolygonFcn;
1372-
m_debugDraw.drawSolidPolygon = DrawSolidPolygonFcn;
1373-
m_debugDraw.drawCircle = DrawCircleFcn;
1374-
m_debugDraw.drawSolidCircle = DrawSolidCircleFcn;
1375-
m_debugDraw.drawSolidCapsule = DrawSolidCapsuleFcn;
1376-
m_debugDraw.drawSegment = DrawSegmentFcn;
1377-
m_debugDraw.drawTransform = DrawTransformFcn;
1378-
m_debugDraw.drawPoint = DrawPointFcn;
1379-
m_debugDraw.drawString = DrawStringFcn;
1371+
m_debugDraw.DrawPolygon = DrawPolygonFcn;
1372+
m_debugDraw.DrawSolidPolygon = DrawSolidPolygonFcn;
1373+
m_debugDraw.DrawCircle = DrawCircleFcn;
1374+
m_debugDraw.DrawSolidCircle = DrawSolidCircleFcn;
1375+
m_debugDraw.DrawSolidCapsule = DrawSolidCapsuleFcn;
1376+
m_debugDraw.DrawSegment = DrawSegmentFcn;
1377+
m_debugDraw.DrawTransform = DrawTransformFcn;
1378+
m_debugDraw.DrawPoint = DrawPointFcn;
1379+
m_debugDraw.DrawString = DrawStringFcn;
13801380
m_debugDraw.drawingBounds = bounds;
13811381

13821382
m_debugDraw.useDrawingBounds = false;

‎src/distance_joint.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -529,28 +529,28 @@ void b2DrawDistanceJoint( b2DebugDraw* draw, b2JointSim* base, b2Transform trans
529529
if ( joint->minLength > B2_LINEAR_SLOP )
530530
{
531531
// draw->DrawPoint(pMin, 4.0f, c2, draw->context);
532-
draw->drawSegment( b2Sub( pMin, offset ), b2Add( pMin, offset ), b2_colorLightGreen, draw->context );
532+
draw->DrawSegment( b2Sub( pMin, offset ), b2Add( pMin, offset ), b2_colorLightGreen, draw->context );
533533
}
534534

535535
if ( joint->maxLength < B2_HUGE )
536536
{
537537
// draw->DrawPoint(pMax, 4.0f, c3, draw->context);
538-
draw->drawSegment( b2Sub( pMax, offset ), b2Add( pMax, offset ), b2_colorRed, draw->context );
538+
draw->DrawSegment( b2Sub( pMax, offset ), b2Add( pMax, offset ), b2_colorRed, draw->context );
539539
}
540540

541541
if ( joint->minLength > B2_LINEAR_SLOP && joint->maxLength < B2_HUGE )
542542
{
543-
draw->drawSegment( pMin, pMax, b2_colorGray, draw->context );
543+
draw->DrawSegment( pMin, pMax, b2_colorGray, draw->context );
544544
}
545545
}
546546

547-
draw->drawSegment( pA, pB, b2_colorWhite, draw->context );
548-
draw->drawPoint( pA, 4.0f, b2_colorWhite, draw->context );
549-
draw->drawPoint( pB, 4.0f, b2_colorWhite, draw->context );
547+
draw->DrawSegment( pA, pB, b2_colorWhite, draw->context );
548+
draw->DrawPoint( pA, 4.0f, b2_colorWhite, draw->context );
549+
draw->DrawPoint( pB, 4.0f, b2_colorWhite, draw->context );
550550

551551
if ( joint->hertz > 0.0f && joint->enableSpring )
552552
{
553553
b2Vec2 pRest = b2MulAdd( pA, joint->length, axis );
554-
draw->drawPoint( pRest, 4.0f, b2_colorBlue, draw->context );
554+
draw->DrawPoint( pRest, 4.0f, b2_colorBlue, draw->context );
555555
}
556556
}

‎src/joint.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -1218,17 +1218,17 @@ void b2DrawJoint( b2DebugDraw* draw, b2World* world, b2Joint* joint )
12181218
b2Vec2 target = jointSim->mouseJoint.targetA;
12191219

12201220
b2HexColor c1 = b2_colorGreen;
1221-
draw->drawPoint( target, 4.0f, c1, draw->context );
1222-
draw->drawPoint( pB, 4.0f, c1, draw->context );
1221+
draw->DrawPoint( target, 4.0f, c1, draw->context );
1222+
draw->DrawPoint( pB, 4.0f, c1, draw->context );
12231223

12241224
b2HexColor c2 = b2_colorLightGray;
1225-
draw->drawSegment( target, pB, c2, draw->context );
1225+
draw->DrawSegment( target, pB, c2, draw->context );
12261226
}
12271227
break;
12281228

12291229
case b2_nullJoint:
12301230
{
1231-
draw->drawSegment( pA, pB, b2_colorGold, draw->context );
1231+
draw->DrawSegment( pA, pB, b2_colorGold, draw->context );
12321232
}
12331233
break;
12341234

@@ -1245,9 +1245,9 @@ void b2DrawJoint( b2DebugDraw* draw, b2World* world, b2Joint* joint )
12451245
break;
12461246

12471247
default:
1248-
draw->drawSegment( transformA.p, pA, color, draw->context );
1249-
draw->drawSegment( pA, pB, color, draw->context );
1250-
draw->drawSegment( transformB.p, pB, color, draw->context );
1248+
draw->DrawSegment( transformA.p, pA, color, draw->context );
1249+
draw->DrawSegment( pA, pB, color, draw->context );
1250+
draw->DrawSegment( transformB.p, pB, color, draw->context );
12511251
}
12521252

12531253
if ( draw->drawGraphColors )
@@ -1260,7 +1260,7 @@ void b2DrawJoint( b2DebugDraw* draw, b2World* world, b2Joint* joint )
12601260
if ( colorIndex != B2_NULL_INDEX )
12611261
{
12621262
b2Vec2 p = b2Lerp( pA, pB, 0.5f );
1263-
draw->drawPoint( p, 5.0f, colors[colorIndex], draw->context );
1263+
draw->DrawPoint( p, 5.0f, colors[colorIndex], draw->context );
12641264
}
12651265
}
12661266
}

‎src/prismatic_joint.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -633,22 +633,22 @@ void b2DrawPrismaticJoint( b2DebugDraw* draw, b2JointSim* base, b2Transform tran
633633
b2HexColor c4 = b2_colorBlue;
634634
b2HexColor c5 = b2_colorDimGray;
635635

636-
draw->drawSegment( pA, pB, c5, draw->context );
636+
draw->DrawSegment( pA, pB, c5, draw->context );
637637

638638
if ( joint->enableLimit )
639639
{
640640
b2Vec2 lower = b2MulAdd( pA, joint->lowerTranslation, axis );
641641
b2Vec2 upper = b2MulAdd( pA, joint->upperTranslation, axis );
642642
b2Vec2 perp = b2LeftPerp( axis );
643-
draw->drawSegment( lower, upper, c1, draw->context );
644-
draw->drawSegment( b2MulSub( lower, 0.1f, perp ), b2MulAdd( lower, 0.1f, perp ), c2, draw->context );
645-
draw->drawSegment( b2MulSub( upper, 0.1f, perp ), b2MulAdd( upper, 0.1f, perp ), c3, draw->context );
643+
draw->DrawSegment( lower, upper, c1, draw->context );
644+
draw->DrawSegment( b2MulSub( lower, 0.1f, perp ), b2MulAdd( lower, 0.1f, perp ), c2, draw->context );
645+
draw->DrawSegment( b2MulSub( upper, 0.1f, perp ), b2MulAdd( upper, 0.1f, perp ), c3, draw->context );
646646
}
647647
else
648648
{
649-
draw->drawSegment( b2MulSub( pA, 1.0f, axis ), b2MulAdd( pA, 1.0f, axis ), c1, draw->context );
649+
draw->DrawSegment( b2MulSub( pA, 1.0f, axis ), b2MulAdd( pA, 1.0f, axis ), c1, draw->context );
650650
}
651651

652-
draw->drawPoint( pA, 5.0f, c1, draw->context );
653-
draw->drawPoint( pB, 5.0f, c4, draw->context );
652+
draw->DrawPoint( pA, 5.0f, c1, draw->context );
653+
draw->DrawPoint( pB, 5.0f, c4, draw->context );
654654
}

‎src/revolute_joint.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -500,21 +500,21 @@ void b2DrawRevoluteJoint( b2DebugDraw* draw, b2JointSim* base, b2Transform trans
500500
const float L = drawSize;
501501
// draw->drawPoint(pA, 3.0f, b2_colorGray40, draw->context);
502502
// draw->drawPoint(pB, 3.0f, b2_colorLightBlue, draw->context);
503-
draw->drawCircle( pB, L, c1, draw->context );
503+
draw->DrawCircle( pB, L, c1, draw->context );
504504

505505
float angle = b2RelativeAngle( transformB.q, transformA.q );
506506

507507
b2Rot rot = b2MakeRot( angle );
508508
b2Vec2 r = { L * rot.c, L * rot.s };
509509
b2Vec2 pC = b2Add( pB, r );
510-
draw->drawSegment( pB, pC, c1, draw->context );
510+
draw->DrawSegment( pB, pC, c1, draw->context );
511511

512512
if ( draw->drawJointExtras )
513513
{
514514
float jointAngle = b2UnwindAngle( angle - joint->referenceAngle );
515515
char buffer[32];
516516
snprintf( buffer, 32, " %.1f deg", 180.0f * jointAngle / B2_PI );
517-
draw->drawString( pC, buffer, b2_colorWhite, draw->context );
517+
draw->DrawString( pC, buffer, b2_colorWhite, draw->context );
518518
}
519519

520520
float lowerAngle = joint->lowerAngle + joint->referenceAngle;
@@ -528,18 +528,18 @@ void b2DrawRevoluteJoint( b2DebugDraw* draw, b2JointSim* base, b2Transform trans
528528
b2Rot rotHi = b2MakeRot( upperAngle );
529529
b2Vec2 rhi = { L * rotHi.c, L * rotHi.s };
530530

531-
draw->drawSegment( pB, b2Add( pB, rlo ), c2, draw->context );
532-
draw->drawSegment( pB, b2Add( pB, rhi ), c3, draw->context );
531+
draw->DrawSegment( pB, b2Add( pB, rlo ), c2, draw->context );
532+
draw->DrawSegment( pB, b2Add( pB, rhi ), c3, draw->context );
533533

534534
b2Rot rotRef = b2MakeRot( joint->referenceAngle );
535535
b2Vec2 ref = ( b2Vec2 ){ L * rotRef.c, L * rotRef.s };
536-
draw->drawSegment( pB, b2Add( pB, ref ), b2_colorBlue, draw->context );
536+
draw->DrawSegment( pB, b2Add( pB, ref ), b2_colorBlue, draw->context );
537537
}
538538

539539
b2HexColor color = b2_colorGold;
540-
draw->drawSegment( transformA.p, pA, color, draw->context );
541-
draw->drawSegment( pA, pB, color, draw->context );
542-
draw->drawSegment( transformB.p, pB, color, draw->context );
540+
draw->DrawSegment( transformA.p, pA, color, draw->context );
541+
draw->DrawSegment( pA, pB, color, draw->context );
542+
draw->DrawSegment( transformB.p, pB, color, draw->context );
543543

544544
// char buffer[32];
545545
// sprintf(buffer, "%.1f", b2Length(joint->impulse));

‎src/types.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,14 @@ b2DebugDraw b2DefaultDebugDraw(void)
153153
b2DebugDraw draw = { 0 };
154154

155155
// These allow the user to skip some implementations and not hit null exceptions.
156-
draw.drawPolygon = b2EmptyDrawPolygon;
157-
draw.drawSolidPolygon = b2EmptyDrawSolidPolygon;
158-
draw.drawCircle = b2EmptyDrawCircle;
159-
draw.drawSolidCircle = b2EmptyDrawSolidCircle;
160-
draw.drawSolidCapsule = b2EmptyDrawSolidCapsule;
161-
draw.drawSegment = b2EmptyDrawSegment;
162-
draw.drawTransform = b2EmptyDrawTransform;
163-
draw.drawPoint = b2EmptyDrawPoint;
164-
draw.drawString = b2EmptyDrawString;
156+
draw.DrawPolygon = b2EmptyDrawPolygon;
157+
draw.DrawSolidPolygon = b2EmptyDrawSolidPolygon;
158+
draw.DrawCircle = b2EmptyDrawCircle;
159+
draw.DrawSolidCircle = b2EmptyDrawSolidCircle;
160+
draw.DrawSolidCapsule = b2EmptyDrawSolidCapsule;
161+
draw.DrawSegment = b2EmptyDrawSegment;
162+
draw.DrawTransform = b2EmptyDrawTransform;
163+
draw.DrawPoint = b2EmptyDrawPoint;
164+
draw.DrawString = b2EmptyDrawString;
165165
return draw;
166166
}

‎src/wheel_joint.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -528,22 +528,22 @@ void b2DrawWheelJoint( b2DebugDraw* draw, b2JointSim* base, b2Transform transfor
528528
b2HexColor c4 = b2_colorDimGray;
529529
b2HexColor c5 = b2_colorBlue;
530530

531-
draw->drawSegment( pA, pB, c5, draw->context );
531+
draw->DrawSegment( pA, pB, c5, draw->context );
532532

533533
if ( joint->enableLimit )
534534
{
535535
b2Vec2 lower = b2MulAdd( pA, joint->lowerTranslation, axis );
536536
b2Vec2 upper = b2MulAdd( pA, joint->upperTranslation, axis );
537537
b2Vec2 perp = b2LeftPerp( axis );
538-
draw->drawSegment( lower, upper, c1, draw->context );
539-
draw->drawSegment( b2MulSub( lower, 0.1f, perp ), b2MulAdd( lower, 0.1f, perp ), c2, draw->context );
540-
draw->drawSegment( b2MulSub( upper, 0.1f, perp ), b2MulAdd( upper, 0.1f, perp ), c3, draw->context );
538+
draw->DrawSegment( lower, upper, c1, draw->context );
539+
draw->DrawSegment( b2MulSub( lower, 0.1f, perp ), b2MulAdd( lower, 0.1f, perp ), c2, draw->context );
540+
draw->DrawSegment( b2MulSub( upper, 0.1f, perp ), b2MulAdd( upper, 0.1f, perp ), c3, draw->context );
541541
}
542542
else
543543
{
544-
draw->drawSegment( b2MulSub( pA, 1.0f, axis ), b2MulAdd( pA, 1.0f, axis ), c1, draw->context );
544+
draw->DrawSegment( b2MulSub( pA, 1.0f, axis ), b2MulAdd( pA, 1.0f, axis ), c1, draw->context );
545545
}
546546

547-
draw->drawPoint( pA, 5.0f, c1, draw->context );
548-
draw->drawPoint( pB, 5.0f, c4, draw->context );
547+
draw->DrawPoint( pA, 5.0f, c1, draw->context );
548+
draw->DrawPoint( pB, 5.0f, c4, draw->context );
549549
}

0 commit comments

Comments
 (0)