From 24b3ada09406607b72e0274423c3346e22ee4891 Mon Sep 17 00:00:00 2001 From: Erin Catto Date: Sat, 27 Jul 2024 21:31:39 -0700 Subject: [PATCH] CI fix --- samples/sample_stacking.cpp | 11 +---------- src/distance.c | 7 +++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/samples/sample_stacking.cpp b/samples/sample_stacking.cpp index d71b93c1..c96d7049 100644 --- a/samples/sample_stacking.cpp +++ b/samples/sample_stacking.cpp @@ -182,11 +182,6 @@ class VerticalStack : public Sample m_shapeType = e_boxShape; m_rowCount = e_maxRows; m_columnCount = 5; - - // todo temp - m_rowCount = 1; - m_columnCount = 1; - m_bulletCount = 1; m_bulletType = e_circleShape; @@ -226,7 +221,7 @@ class VerticalStack : public Sample } float dx = -3.0f; - float xroot = -8.0f; + float xroot = 8.0f; for (int j = 0; j < m_columnCount; ++j) { @@ -241,10 +236,6 @@ class VerticalStack : public Sample float shift = (i % 2 == 0 ? -offset : offset); bodyDef.position = {x + shift, 0.5f + 1.0f * i}; - - // todo temp - bodyDef.position.y -= 0.25f; - // bodyDef.position = {x + shift, 1.0f + 1.51f * i}; b2BodyId bodyId = b2CreateBody(m_worldId, &bodyDef); diff --git a/src/distance.c b/src/distance.c index df1922a5..7cdd693b 100644 --- a/src/distance.c +++ b/src/distance.c @@ -8,8 +8,7 @@ #include "box2d/math_functions.h" #include - -#define B2_RESTRICT +#include b2Transform b2GetSweepTransform(const b2Sweep* sweep, float time) { @@ -314,7 +313,7 @@ void b2ComputeSimplexWitnessPoints(b2Vec2* a, b2Vec2* b, const b2Simplex* s) // Solution // a1 = d12_1 / d12 // a2 = d12_2 / d12 -void b2SolveSimplex2(b2Simplex* B2_RESTRICT s) +void b2SolveSimplex2(b2Simplex* s) { b2Vec2 w1 = s->v1.w; b2Vec2 w2 = s->v2.w; @@ -348,7 +347,7 @@ void b2SolveSimplex2(b2Simplex* B2_RESTRICT s) s->count = 2; } -void b2SolveSimplex3(b2Simplex* B2_RESTRICT s) +void b2SolveSimplex3(b2Simplex* s) { b2Vec2 w1 = s->v1.w; b2Vec2 w2 = s->v2.w;