From c5fbb5822df6718b4dc2f096ae74e20f129f4858 Mon Sep 17 00:00:00 2001 From: Erin Catto Date: Sun, 22 Dec 2024 12:20:36 -0800 Subject: [PATCH] CI fix --- src/distance.c | 14 +++++++------- src/solver_set.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/distance.c b/src/distance.c index b379013f4..889d5aa11 100644 --- a/src/distance.c +++ b/src/distance.c @@ -208,7 +208,7 @@ static void b2MakeSimplexCache( b2SimplexCache* cache, const b2Simplex* simplex // vector of the simplex. For example, the normal vector of a line segment // can be computed more accurately because it does not involve barycentric // coordinates. -b2Vec2 b2ComputeSimplexSearchDirection( const b2Simplex* simplex ) +static b2Vec2 b2ComputeSimplexSearchDirection( const b2Simplex* simplex ) { switch ( simplex->count ) { @@ -237,7 +237,7 @@ b2Vec2 b2ComputeSimplexSearchDirection( const b2Simplex* simplex ) } } -b2Vec2 b2ComputeSimplexClosestPoint( const b2Simplex* s ) +static b2Vec2 b2ComputeSimplexClosestPoint( const b2Simplex* s ) { switch ( s->count ) { @@ -260,7 +260,7 @@ b2Vec2 b2ComputeSimplexClosestPoint( const b2Simplex* s ) } } -void b2ComputeSimplexWitnessPoints( b2Vec2* a, b2Vec2* b, const b2Simplex* s ) +static void b2ComputeSimplexWitnessPoints( b2Vec2* a, b2Vec2* b, const b2Simplex* s ) { switch ( s->count ) { @@ -314,7 +314,7 @@ void b2ComputeSimplexWitnessPoints( b2Vec2* a, b2Vec2* b, const b2Simplex* s ) // Solution // a1 = d12_1 / d12 // a2 = d12_2 / d12 -void b2SolveSimplex2( b2Simplex* s ) +static void b2SolveSimplex2( b2Simplex* s ) { b2Vec2 w1 = s->v1.w; b2Vec2 w2 = s->v2.w; @@ -348,7 +348,7 @@ void b2SolveSimplex2( b2Simplex* s ) s->count = 2; } -void b2SolveSimplex3( b2Simplex* s ) +static void b2SolveSimplex3( b2Simplex* s ) { b2Vec2 w1 = s->v1.w; b2Vec2 w2 = s->v2.w; @@ -806,7 +806,7 @@ typedef struct b2SeparationFunction b2SeparationType type; } b2SeparationFunction; -b2SeparationFunction b2MakeSeparationFunction( const b2SimplexCache* cache, const b2ShapeProxy* proxyA, const b2Sweep* sweepA, +static b2SeparationFunction b2MakeSeparationFunction( const b2SimplexCache* cache, const b2ShapeProxy* proxyA, const b2Sweep* sweepA, const b2ShapeProxy* proxyB, const b2Sweep* sweepB, float t1 ) { b2SeparationFunction f; @@ -950,7 +950,7 @@ static float b2FindMinSeparation( const b2SeparationFunction* f, int* indexA, in } // -float b2EvaluateSeparation( const b2SeparationFunction* f, int indexA, int indexB, float t ) +static float b2EvaluateSeparation( const b2SeparationFunction* f, int indexA, int indexB, float t ) { b2Transform xfA = b2GetSweepTransform( &f->sweepA, t ); b2Transform xfB = b2GetSweepTransform( &f->sweepB, t ); diff --git a/src/solver_set.c b/src/solver_set.c index 035fe340d..d6e87a95e 100644 --- a/src/solver_set.c +++ b/src/solver_set.c @@ -123,7 +123,7 @@ void b2WakeSolverSet( b2World* world, int setIndex ) for ( int i = 0; i < jointCount; ++i ) { b2JointSim* jointSim = set->jointSims.data + i; - b2Joint* joint = b2JointArray_Get( &world->joints, +jointSim->jointId ); + b2Joint* joint = b2JointArray_Get( &world->joints, jointSim->jointId ); B2_ASSERT( joint->setIndex == setIndex ); b2AddJointToGraph( world, jointSim, joint ); joint->setIndex = b2_awakeSet;