Sara/fencer
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

modified hardcoded values for collision forces

Browse source
This commit is contained in:
Sara 2023-10-18 13:49:54 +02:00
parent 19daff6ddd
commit 2b1014e603
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/rigidbody.c
View file

@ -102,10 +102,10 @@ Vector _internal_calculate_contact_force(Contact* contact) {
if(vsqrmagnitudef(hit.separation_force) < powf(0.01f, 2)) if(vsqrmagnitudef(hit.separation_force) < powf(0.01f, 2))
return ZeroVector; return ZeroVector;
const float warming = 100.f * fminf(1.f, contact->warming); const float warming = fminf(1.f, contact->warming * 100.f);
const float d = 1.0f; const float d = 1.0f;
const float k = 0.0f * warming; const float k = 0.001f;
const float b = 1.0f; const float b = 1.0f * warming;
const Vector damping = vmulff(hit.normal, k * d); const Vector damping = vmulff(hit.normal, k * d);
const Vector bounce = vprojectf(vmulff(hit.normal, -b), hit.velocity); const Vector bounce = vprojectf(vmulff(hit.normal, -b), hit.velocity);
@ -118,8 +118,8 @@ void _internal_rigidbody_solve_contact(RigidBody* self, Contact* contact, Vector
Collision hit = contact->hit; Collision hit = contact->hit;
if(vdotf(hit.normal, self->linear_velocity) > 0.0) if(vdotf(hit.normal, self->linear_velocity) > 0.0)
return; return;
if (vsqrmagnitudef(contact->hit.separation_force) < 0.001f*0.001f) // if (vsqrmagnitudef(contact->hit.separation_force) < 0.001f*0.001f)
return; // return;
float normalmag = vmagnitudef(contact->hit.normal); float normalmag = vmagnitudef(contact->hit.normal);
ASSERT_RETURN(fabsf(normalmag - 1.f) < 0.99999f,, "Normal of collision not one"); ASSERT_RETURN(fabsf(normalmag - 1.f) < 0.99999f,, "Normal of collision not one");