From 9dee043d9592f3a22aab5faeb6d9b4f7f7a04f17 Mon Sep 17 00:00:00 2001
From: swim67667 <150874399+Swim67667@users.noreply.github.com>
Date: Wed, 24 Jun 2026 12:47:00 -0400
Subject: [PATCH] less messed up collision

---
 src/collision.c |  31 +++++++++++++++----------------
 src/world.h     |   2 ++
 wrldboxMacOS    | Bin 52336 -> 52336 bytes
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/collision.c b/src/collision.c
index 7886957..a5c32b1 100644
--- a/src/collision.c
+++ b/src/collision.c
@@ -7,42 +7,41 @@
 void checkCollision(){
     for(int u=0; u<=MAX_ENTITIES-1; u++){
         Entity *en1 = &entities[u];
-        for(int j=1; j<=MAX_ENTITIES-1; j++){
+        if(!en1->active){ 
+        continue;
+        }
+        for(int j=u+1; j<=MAX_ENTITIES-1; j++){
             if(u!=j){
                 Entity *en2 = &entities[j];
-                if (fabsf(en1->position.x - en2->position.x) < (en1->size * 0.5f + en2->size * 0.5f)) 
+                if(!en2->active){ 
+                continue;
+                }
+                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);
                     if(en1->position.x < en2->position.x){
                         ApplyForce(
                             en1,
-                            (Vector2){-10000, 0}
+                            (Vector2){-forcex, -forcey}
                         );
                         ApplyForce(
                             en2,
-                            (Vector2){10000, 0}
+                            (Vector2){forcex, forcey}
                         );
                     }
                     else{
                         ApplyForce(
                             en1,
-                            (Vector2){10000, 0}
+                            (Vector2){forcex, -forcey}
                         );
                         ApplyForce(
                             en2,
-                            (Vector2){-10000, 0}
+                            (Vector2){-forcex, forcey}
                         );
                     }
                 }
-                // if(fabsf(en1->position.y - en2->position.y) < (en1->size * 0.5f + en2->size * 0.5f)){
-                //     ApplyForce(
-                //     en1,
-                //     (Vector2){0, 10000}
-                //     );
-                //     ApplyForce(
-                //     en2,
-                //     (Vector2){0, -10000}
-                //     );  
-                // }
             }
         }
     } 
diff --git a/src/world.h b/src/world.h
index 5df9310..4cd9163 100644
--- a/src/world.h
+++ b/src/world.h
@@ -12,6 +12,8 @@ extern bool isSimulating;
 
 extern float simTime;
 
+extern const float scale;
+
 extern const float MAX_PLAYER_SPEED;
 
 extern const float PLAYER_SPEED_FACTOR;
diff --git a/wrldboxMacOS b/wrldboxMacOS
index 44a642586a44c1a9eae151634d9110b646f9b362..39673c4f92914ac4199fe11332fe7c8702592d8d 100755
GIT binary patch
delta 1771
zcmZ8h3v5(H6uobD%f8a3-G7&U-gdk61Jp>Rgu;H_>xYsOD?b&a(3UPm)Y65b*s8e2
z51^8;>ogGwVohmMK$GegvXMSnX(1ReKvE-OjEkQ{p^2qJAbh>E?-huXyt((>bI+YS
zZzeOkTQj;_6S_beY~hPlrf4<*2LL>qa744|6P(W!6O`~ZB?>WtzQy^h{SGBOMGZ4d
zXt6Gnj&eEH3o6^8vJ5BKh(y|mL0taXzV5)xclNCG*gx6Y{sTRwEhRf9Mo7{o!rAF&
zT`s+2Gq}G5u=EbrNBJZ$_6`bBYz%Q-l)tOnSY(B#6<i-Zz+znTOL6mfY#$Bk(rv=c
zUQOLio|ERR1DMUSDf|A=mDrjLYO1FGCKx4|C2~eOrpph$oB9Zqq*7?1&?#_+90BZ3
z0b;pAFG`73k}J^X0s8p!zA)h=xg4?95D?1sm5u{g)`dAu7}Fr<N9(s#Iw}hN0x>iQ
zetV;E0PE!CNixgL&y#|3Phq~$gNyWFGFU1c5NmiK2Hr1#)F^ZfW)Co74mOrpB+;Pj
zL350APL^aB*5GhqCtBxtLm2;mLr!eSiOm3?u^M;R@IVASVq7pj9b}rrTY^1A`8{2@
zLf7D`0g#+R+y!!cI{qT&7ohKw<VyvTd`knJUAQfl7td63;tsT#$U7u?40#J4$#^Y1
zz=w6x(KlmWx+MSguui(NV2WBS4Q&c0rP1H`T<f#<@28Jn3gyx`qFy>VxilZ#;VW9`
z?9g>AxsG-vet0$eKyrs~p`SRvOFnu`ZzEmq$gbotM~>X1xha0KSftxiwvo7-rs?;P
zJ8pVNKaF@i^hf;yvd%+YlinnIJ+ymL3%TZ@=F|lf+r8mrEIqZxOP^2e)rO$cOU-GO
z=)}CVHmwAmYhFqdPN|QcPB?8osxf>`SPO;^iBY6WjZYD$NV|<In7MCUn^7!=*-1i<
zQ<%glXMk;o_+pU;O#(slsVRe*qo!>ciytPR);yBDSfsV)Tv8@Rg60=Fa^6R;SgLX#
zDLqduT?jA=$&!p)2~EA~qrY17Xq$B&tAETYkVK?P(Pz_2TMgmF2(?*xg3rc5AwOe=
z21v<7;MSP{O3k2o1JC(_1-KDw<gzf}h)j_F+*&jwf(BwU@olJHQeU~GY(6A!*wEZw
z6=?N0L8=DMF@AV9PD68P`f;IZ?+o-$v1nf@PWwwx+VaB7%L1*<Yhcx;`K^IhTGlkJ
zfkrILvd*w+fK8!UIPG+?sffOQ{JDZ*7LAHrLQ>xjW1JQ`ItT`LSV0S+gxfFD+sFSQ
zeG}-&U{-KQebw}Mb<*&j#U?9npq*hYz&VxAQTgFag)dTZrTW6URh)%FECbaHqyCht
zU!n3dvJ}2a!G4&Mp#(Onf|x4UqT(|u-lgIJ74KIHKuFc&!<yK@PNP!qTNUeV^zu-h
zDXPls*c|I?*g;pE5b%Mfuc7I8ME0DpCk1T{sA7YA75{!?psi-Lf8kQ-&OTWCwr<oV
zkIvd2{N;%EgX*Y#toiOw{d1l5wI7vzbHlT@YSEE-_m&+NKh`EScbPXIJ-6k3TAjD{
z-`dD~Pd-!jy|lBFemBQ3UtTzE{i0oKFSa^=pXs@`W&ipcd4cOAUj#q@YI)$~-;v_e
rcCO%dX<61uuC?Oq&sVpW4;<<pX<T%o`EZ^5IJvdyZ1!V#0EzJ*wHWO0

delta 1433
zcmYjReN0nV6hH62LSGBC&<~1yv=y0vu<;S;M@H~%(;6VUtda=KLHQDOghF8(>_aOi
z#t_};u1;e#f#@GKGX~Z_)=ZixA8`xW0ts1&TP7wD*~SJ_OmLgB^ZM>KZ*tE$zjJ=)
z_wIZ5-nV*zU%kK&%n>jK?z(i<=>Qx62$I23olc9nGMy(wPOr&X@MO?FuFP0vmeW}*
zEnz~7lxcL8vl@F?)z7LDj#fh==^=@&+CT2xDza_<?C%GcXId5C(XSN_lA{Wdm@dL4
z(07%Y+j79~4vw3{xEMolye=#}Rdz0`p-RT};cHTkQ@uT?qIZ>9R3{W4n~Y^;zJ47N
z#7K~@Tj$V&b+b8!murJq6X2Bl)OgqjT()^W4<fJt1@l^n%opIy6C?Kv#K;B@XXmwI
zWDqrEe$dAu|Na)_WaHd|ylgS@7<ndKBI;KDM~n)mG2u8QTX3dfgGG$|ED6UwFC3PI
z^~f>d)FaPCUsY!sgBu&Be_vOKfu!KLC47$dsvTSXC4pZRaMrK%yC0)JfD=FTFx)B$
z{E4xEvC!b87ELm-+CnSp07o<%v@gDi%sA<T_>;tAquzvz<U<>c(`+N7Hfq;YkR=;E
zp*c#@?UdKHlWsfh(pIRS*aIq*%l+0)?`VUHVK6voSK>|#L<hZ@xE+IT2YnO`!Va33
zBxTkev?=K;A}vApDG4}fNVk^^IVrENm0Z34VCsl7z;W{4ByjTH;IapV5huN;HxqOl
z`c%oK8BV6o{7;@@8yO|fIO$D8Cb{hl-7_5F$Qw>tne57ZPI?!U&H-2jl^DTS8OZH)
z(jBH3=v?wHN#9~JlW4{z_h-<nrak1iGxW%06bN1dwRLOiGzVl>08U5(m`egaT@TQs
z2kx{XRAC*pggUGqE)**+9?xGW1s>)L@wk_}>vy_e*$t|Wj<#Nx*Vohn8Xi`q`r39h
z3wCN6GrLA##CS={PM4sWD8knE!`=J6zP4s~t82H<`%ZgvOEWa0ti)QD%#V^8E=F_R
zDw$mR!B|c9nv|U@<)SV1z3`AzfZtCr8PtIS2BP6?DgA3~g-r8wc|84CGrOqqcz(2a
z*gPrnwMGY81waR@TUot3Rj%hVypSg2ml+;SmT|d+vHuY3uVwXV*54xICYWFk>|_ld
z*6<O-Z47_H@BxOe$^uZhNq*o6!}*CazRmD;1N~*9PFKy^Qt%z6b#<F*?W7t1IrM#W
zRp!ve$&{G=Mr?`>?mhhajozL;4Nb4_1JjM6hC^4}cK*oT*8YseXP0{HHNxr8(n|lR
z$Nyxp>?h;Hp&h>Vntd^^#bzb^_VMK(et*duK38$WrPm%E{HBl|o)WK=PjT7LzED>7
jfBt1kADwkvYfDLtYdnAE`@)5T1-U1lZhBK%dUX5)ViSEB