From 0dd35c52c08f7e063cc9c43ef23081e2012d8197 Mon Sep 17 00:00:00 2001 From: swim67667 <150874399+Swim67667@users.noreply.github.com> Date: Wed, 24 Jun 2026 13:34:34 -0400 Subject: [PATCH] yup --- src/collision.c | 60 +++++++++++++++--------------------------------- wrldboxMacOS | Bin 52336 -> 52336 bytes 2 files changed, 18 insertions(+), 42 deletions(-) diff --git a/src/collision.c b/src/collision.c index c020955..94490cf 100644 --- a/src/collision.c +++ b/src/collision.c @@ -19,51 +19,27 @@ 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*.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); + float forcex=fabsf(((en1->mass+en2->mass)/2)*((((en1->velocity.x)+(scale))+((en2->velocity.x)+(scale)))/2))*(scale); + float forcey=fabsf(((en1->mass+en2->mass)/2)*((((en1->velocity.y)+(scale))+((en2->velocity.y)+(scale)))/2))*(scale); if(en1->position.x < en2->position.x){ - 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} - ); - } + ApplyForce( + en1, + (Vector2){-forcex, 0} + ); + ApplyForce( + en2, + (Vector2){forcex, 0} + ); } else{ - 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} - ); - } + ApplyForce( + en1, + (Vector2){forcex, 0} + ); + ApplyForce( + en2, + (Vector2){-forcex, 0} + ); } } } diff --git a/wrldboxMacOS b/wrldboxMacOS index e6f51bf9262f748b2083c13fda33dc6e55b2e4bc..d36617dbb8024ea7180dce3e30d3ae6bbeeddfd9 100755 GIT binary patch delta 1759 zcmah}eN0nV6hHUAVqdM;QYftgudP&pN#d4Q|ne_ube4&v~TaJ4&7SLE*pF_duo`*71Ojs zWN@M}u4`gB3H3!>y;w|AXQaGWoG{i`+u0uDLej#zj48=$ZLnd|*%c}46^UsFB(Px& zXkzi=QhFqwoiRDs7BT%mhndF;<>L^isGUODIKdS%JrcFLC2-D?I?+e$iYfwhi(BQ8 zKor%JnJ#rQkbK|4%eJ7qD0?I-VDeE4V#U2i1S56@9IdE$2b;NYQjq;Wo^R8bOU_;7C{0kqkwB zAk@H#s8LZ{v8px<9!Wu`3r7kDxD@rS04I|0m?y=eiCjp)7zd6-jB_aJD8@yFCpsS7 zbi|B)3l1~JSQPap#xS=z)%D7wM~=z%h;fk6iM`x_+(hHbu1ALm+iZSzPS6+n%>XBw zjm<@W;#!IW?@Kp)>kBcm(3wUzGfTaD-7LPBQooYf0Nebu>9#Q z^mq>YY5Ftts~l#rtfAvMY_sKcnw`t8TWaXxTvllHrK|=B;>`}3iQ=1zo2)VULnd6a ze#m8~teu7+c>Sy}VFeoN{fs3nM&q!b4aAHqekRy7MwD5ut=A9~v8=ysK{VQAb}Vr% z8fRs8J+VYLmL>&Cg5pIP3)cG;PxOA_FU5F3e$=Ae2Ro?RDd~3X@;%Pej#umT?5A_t zA4!Lmpg8hGd_ee*IP!E-+@z?)nk~Um;)-pM0NU*iii2|aQ+pM`TDQuq+?mD{M+Sn6 zGTY%uH3YK`;y*d6ypJo6+B4LL(%H2b^}1;sbKaJ;ysl zfnGBKnPvmHVFSU9cdaQ2NYD;o1u(#Rpy36ct5R6;_(*t)^7Fy$(L4~~_CkC#3W~~C z6fMgKQ(ay4zE!n5E4RUP0q$x3@g+Eo`k13%T6JL_+IKW|Xemxt7GY}5_FcubJF5e* z<<V_aizNuC< z3l1F@Xc+UWdHyEuAL9AjbX*Bn_=fd7A;1$}W;0;}3NKSUgkT@GQsk6Lfr$ z<8C|q_46`YDNl3aKWcR~xY(vk5RVOzF2jLe82g~d%G>OTA+4w%bk z9EXCNoBtERi|?sK#YXiINS2+hFY6_a2BQYtnnq@0{N` z=XXEed*fby+{?R1$a0hCYH6HX1mFNbU<3Z#BF*FMabAn+o>0Buwa|AsyRqG>x)*3} zh6&Bpo9Q@bHTG%IRxQe~67@@D7m0RW6LwAp?05Y6+^Laer|I{)LQ)&yCn4)dDo=i# zZr1lq2RP5^fMo#1By`HK2O0rxciK!J`Np)fm)=5v7WX8=%ms;em ztPHUWn{*)=5=ty^rgknF1eXX>o#+ds4zffm3R9XW0@LQiv6$^KNlwEW95%M$Y?~E? z{znDbP>>D9fZ*JOtE-($0s%2=xG!~(tr#M;9l;r_HZdf0-fqQeu~=FWmfYgwQwM$f zss}-`iM|rF`Rc)=CDnu3I_U7>Vts+?!C(={j1zQ#94wOL>kib4@dP|YAGTv0mLJU5 zcm>GIM_z#>o95S9q{bC)4ssUZMqba6J@ITlI&6FCorm*T48HIfNQ@klaB@~uY;Ma*j$jl2ltMN4uJ zc}zGR3rn$BXJ$;ZcUK63*lxV&dh|^gl2|6X|J_=ZsTHG^{s2};k*I=_%QW> z&+hpfZRLs<6A$2RVApq)2ee^Y;ef+W!#y0=O4AK>y35)9gnnRnk4O$0A9 z*9Q|wjB%o24?*4PSw?c|S>jR^KU?Z(wDcDkL1w$B+LAmQR~`(!TC-grkeu1A?9QUUt!HTku692x0%^X^}gx)ne7d#|rl~$DP4unavvLi3zk`gyR zOkDlH#B?f{EVJcP>1xw62sRP_A(K%c_{KeH$w(G-KnxMM+IWDN1mG);xB*7s&L;Zr zSZ<2`Q0dpU#ht~#gLf&uR?FAaIM)=HLD;r!jk`;mcDNcKiid6%?=8fk^J!`t5=$p? z(e^R#{uMY(vDB@vzOk-pM`Jxyzh1VZ>CLV64fRlmWf|)j8#>r9x(tV#3)t`kZ610# zvzK|@#hj8-vm5^4bkN#L&>2hw9k>;582WECed ztOMxQ;y5Ys-V`;ySi>pW$Eire6PU>Al{1X_KC6n?YjGh}#SJQU!Iai;yO!Y96838N zn1&B(xI@Fo7{*SU&1%7Z4cEu1_*)I%Or*EYZj5tlX-SyEboE;4`g0 z=aNENOv^Eg{kWaD`*lsbp4;Sl{v|ljSkh0fL>vfp3%XmOPvxzT9d8>e|3*scIJxv< z(W&!yi*H=1%3nA(VvE1{(btP_8(#S8U&D;~vr9RawM)uhs~Wmd_R7acPS}T!Ob!RD zep>6S=05MZx3{!8k{sOA^F#KDmfkO`n!fwppL-#R%N+Ue)4k!J%&fjvHZ)nYP%mE% V$#}n@;`%T-Xg80xP3EZz;XfdYO;i8?