speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix the same pit wall crashes in simu2.1

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8856 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 1c176c6bde6ae5b000e0f4c52918cd07924f0ef4
Former-commit-id: 63e34be6e7129fe1f483b33443abc01861f5e435
This commit is contained in:
iobyte 2023-03-30 22:06:30 +00:00
parent b55bb40df5
commit 4439ce4c90
1 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/modules/simu/simuv2.1/collide.cpp
View file

@ -345,10 +345,31 @@ static void SimCarCollideResponse(void * /*dummy*/, DtObjectRef obj1, DtObjectRe
}
// Static object and shape list.
// TODO: Dynamic implementation.
static DtShapeRef fixedobjects[100];
// Id to the next free slot in fixedobjects.
static size_t fixedid;
static bool isFixedObject(DtObjectRef obj)
{
for (size_t i = 0; i < fixedid; i++)
{
if (obj == &(fixedobjects[i]))
return true;
}
return false;
}
// Collision response for walls.
// TODO: Separate common code with car-car collision response.
static void SimCarWallCollideResponse(void *clientdata, DtObjectRef obj1, DtObjectRef obj2, const DtCollData *collData)
{
// ignore wall with wall collision
if (isFixedObject(obj1) && isFixedObject(obj2))
return;
tCar* car; // The car colliding with the wall.
float nsign; // Normal direction correction for collision plane.
sgVec2 p; // Cars collision point delivered by solid.
@ -482,18 +503,9 @@ void SimCollideRemoveCar(tCar *car, int nbcars)
}
// Static object and shape list.
// TODO: Dynamic implementation.
static DtShapeRef fixedobjects[100];
// Id to the next free slot in fixedobjects.
static unsigned int fixedid;
void SimCarCollideShutdown(int nbcars)
{
int i;
for (i = 0; i < nbcars; i++) {
for (int i = 0; i < nbcars; i++) {
// Check if car has not been removed already (wrecked).
if (SimCarTable[i].shape != NULL) {
dtDeleteObject(&(SimCarTable[i]));
@ -501,8 +513,7 @@ void SimCarCollideShutdown(int nbcars)
}
}
unsigned int j;
for (j = 0; j < fixedid; j++) {
for (size_t j = 0; j < fixedid; j++) {
dtClearObjectResponse(&fixedobjects[j]);
dtDeleteObject(&fixedobjects[j]);
dtDeleteShape(fixedobjects[j]);
@ -547,6 +558,15 @@ static tTrackSeg *getFirstWallStart(tTrackSeg *start, int side)
}
static tdble distance(const t3Dd &p1, const t3Dd &p2)
{
tdble dx = p1.x - p2.x;
tdble dy = p1.y - p2.y;
tdble dz = p1.z - p2.z;
return sqrt(dx * dx + dy * dy + dz * dz);
}
// Create the left walls, start must point to a segment with a wall on the left and a leading
// non wall segment.
// FIXME: Does not work for a closed ring "by design".
@ -577,8 +597,8 @@ void buildWalls(tTrackSeg *start, int side) {
// Close the start with a ploygon?
if (p == NULL || p->style != TR_WALL ||
(fabs(p->vertex[TR_EL].x - svl.x) > weps) ||
(fabs(p->vertex[TR_ER].x - svr.x) > weps) ||
(distance(p->vertex[TR_EL], svl) > weps) ||
(distance(p->vertex[TR_ER], svr) > weps) ||
(fabs(h - p->height) > weps) ||
fixedid == 0)
{
@ -638,8 +658,8 @@ void buildWalls(tTrackSeg *start, int side) {
// Close the end with a ploygon?
if (n == NULL || n->style != TR_WALL ||
(fabs(n->vertex[TR_SL].x - evl.x) > weps) ||
(fabs(n->vertex[TR_SR].x - evr.x) > weps) ||
(distance(n->vertex[TR_SL], evl) > weps) ||
(distance(n->vertex[TR_SR], evr) > weps) ||
(fabs(h - n->height) > weps))
{
if (close == true) {
@ -704,8 +724,7 @@ SimCarCollideInit(tTrack *track)
buildWalls(firstleft, TR_SIDE_LFT);
buildWalls(firstright, TR_SIDE_RGT);
unsigned int i;
for (i = 0; i < fixedid; i++) {
for (size_t i = 0; i < fixedid; i++) {
dtCreateObject(&fixedobjects[i], fixedobjects[i]);
dtSetObjectResponse(&fixedobjects[i], SimCarWallCollideResponse, DT_SMART_RESPONSE, &fixedobjects[i]);
}