im sick of making commit titles- fixing stuff
Some checks failed
Build Project / build (push) Failing after 6m56s
Some checks failed
Build Project / build (push) Failing after 6m56s
This commit is contained in:
@@ -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))
|
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 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*1.5))+((en2->velocity.y)+(scale*1.5)))/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){
|
if(en1->position.x < en2->position.x){
|
||||||
ApplyForce(
|
if(en1->position.y < en2->position.y){
|
||||||
en1,
|
ApplyForce(
|
||||||
(Vector2){-forcex, -forcey}
|
en1,
|
||||||
);
|
(Vector2){-forcex, -forcey}
|
||||||
ApplyForce(
|
);
|
||||||
en2,
|
ApplyForce(
|
||||||
(Vector2){forcex, forcey}
|
en2,
|
||||||
);
|
(Vector2){forcex, forcey}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
ApplyForce(
|
||||||
|
en1,
|
||||||
|
(Vector2){-forcex, forcey}
|
||||||
|
);
|
||||||
|
ApplyForce(
|
||||||
|
en2,
|
||||||
|
(Vector2){forcex, -forcey}
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
ApplyForce(
|
if(en1->position.y < en2->position.y){
|
||||||
en1,
|
ApplyForce(
|
||||||
(Vector2){forcex, -forcey}
|
en1,
|
||||||
);
|
(Vector2){forcex, -forcey}
|
||||||
ApplyForce(
|
);
|
||||||
en2,
|
ApplyForce(
|
||||||
(Vector2){-forcex, forcey}
|
en2,
|
||||||
);
|
(Vector2){-forcex, forcey}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
ApplyForce(
|
||||||
|
en1,
|
||||||
|
(Vector2){forcex, forcey}
|
||||||
|
);
|
||||||
|
ApplyForce(
|
||||||
|
en2,
|
||||||
|
(Vector2){-forcex, -forcey}
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
wrldboxMacOS
BIN
wrldboxMacOS
Binary file not shown.
Reference in New Issue
Block a user