From 47f73722b958b09debe15687d14745126211fd19 Mon Sep 17 00:00:00 2001 From: swim67667 <150874399+Swim67667@users.noreply.github.com> Date: Wed, 24 Jun 2026 12:59:55 -0400 Subject: [PATCH] im sick of making commit titles- fixing stuff --- src/collision.c | 60 +++++++++++++++++++++++++++++++++--------------- wrldboxMacOS | Bin 52336 -> 52336 bytes 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/collision.c b/src/collision.c index a5c32b1..c020955 100644 --- a/src/collision.c +++ b/src/collision.c @@ -19,27 +19,51 @@ void checkCollision(){ if (fabsf(en1->position.x - en2->position.x) < (en1->size * 0.5f + en2->size * 0.5f) && fabsf(en1->position.y - en2->position.y) < (en1->size * 0.5f + en2->size * 0.5f)) { - float forcex=fabs(((en1->mass+en2->mass)/2)*((((en1->velocity.x)+(scale*1.5))+((en2->velocity.x)+(scale*1.5)))/2)+((en1->force.x+en2->force.x)/2))*(scale); - float forcey=fabs(((en1->mass+en2->mass)/2)*((((en1->velocity.y)+(scale*1.5))+((en2->velocity.y)+(scale*1.5)))/2))*(scale); + float forcex=fabs(((en1->mass+en2->mass)/2)*((((en1->velocity.x)+(scale*.5))+((en2->velocity.x)+(scale*.5)))/2)+((en1->force.x+en2->force.x)/2))*(scale); + float forcey=fabs(((en1->mass+en2->mass)/2)*((((en1->velocity.y)+(scale*.5))+((en2->velocity.y)+(scale*.5)))/2))*(scale); if(en1->position.x < en2->position.x){ - ApplyForce( - en1, - (Vector2){-forcex, -forcey} - ); - ApplyForce( - en2, - (Vector2){forcex, forcey} - ); + if(en1->position.y < en2->position.y){ + ApplyForce( + en1, + (Vector2){-forcex, -forcey} + ); + ApplyForce( + en2, + (Vector2){forcex, forcey} + ); + } + else{ + ApplyForce( + en1, + (Vector2){-forcex, forcey} + ); + ApplyForce( + en2, + (Vector2){forcex, -forcey} + ); + } } else{ - ApplyForce( - en1, - (Vector2){forcex, -forcey} - ); - ApplyForce( - en2, - (Vector2){-forcex, forcey} - ); + if(en1->position.y < en2->position.y){ + ApplyForce( + en1, + (Vector2){forcex, -forcey} + ); + ApplyForce( + en2, + (Vector2){-forcex, forcey} + ); + } + else{ + ApplyForce( + en1, + (Vector2){forcex, forcey} + ); + ApplyForce( + en2, + (Vector2){-forcex, -forcey} + ); + } } } } diff --git a/wrldboxMacOS b/wrldboxMacOS index 39673c4f92914ac4199fe11332fe7c8702592d8d..e6f51bf9262f748b2083c13fda33dc6e55b2e4bc 100755 GIT binary patch delta 1754 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 U_QVG91@7U_3n|ah`iGx?0PMuXI{*Lx