fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

ODE: pass valid trace_endpos and trace_plane_normal on contact

Browse source
This commit is contained in:
Marco Cawthorne 2024-11-30 16:58:26 -08:00
parent 7c50a8a269
commit 4f1553d97d
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
engine/common/com_phys_ode.c
View file

@ -2595,13 +2595,22 @@ static void VARGS nearCallback (void *data, dGeomID o1, dGeomID o2)
numcontacts = dCollide(o1, o2, MAX_CONTACTS, &(contact[0].geom), sizeof(contact[0]));
if (numcontacts)
{
trace_t contactTrace;
memset ( &contactTrace, 0, sizeof ( trace_t ) );
contactTrace.endpos[0] = contact[0].geom.pos[0];
contactTrace.endpos[1] = contact[0].geom.pos[1];
contactTrace.endpos[2] = contact[0].geom.pos[2];
contactTrace.plane.normal[0] = contact[0].geom.normal[0];
contactTrace.plane.normal[1] = contact[0].geom.normal[1];
contactTrace.plane.normal[2] = contact[0].geom.normal[2];
if(ed1 && ed1->v->touch)
{ //no trace info here. you'll have to figure it out yourself or something.
world->Event_Touch(world, ed1, ed2, NULL);
{
world->Event_Touch(world, ed1, ed2, &contactTrace);
}
if(ed2 && ed2->v->touch)
{
world->Event_Touch(world, ed2, ed1, NULL);
world->Event_Touch(world, ed2, ed1, &contactTrace);
}
/* if either ent killed itself, don't collide */