speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests Projects Releases 1 Packages Wiki Activity Actions 5

fix collision detection for bug in Solid when two walls touch

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

Former-commit-id: 750b4f352f16be29861e571cff325411ffd9842d
Former-commit-id: 5b0a0a3512e9be15e5dfac4e286870d7e1cee3eb
This commit is contained in:
iobyte 2023-06-14 19:14:46 +00:00
parent 53a25ab2aa
commit a4088ae3c3
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/modules/simu/simuv4/collide.cpp
View file

@ -625,9 +625,10 @@ static tdble distance(const t3Dd &p1, const t3Dd &p2)
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".
// Create the walls, start must point to a segment with a wall.
//
// Solid has problems when 2 walls touch so we nolonger break up walls that have changes
// in height or width. This should not be a problem as long as cars stay on the ground.
void buildWalls(tTrackSeg *start, int side) {
if (start == NULL) {
@ -653,12 +654,8 @@ void buildWalls(tTrackSeg *start, int side) {
t3Dd evr = s->vertex[TR_ER];
static float weps = 0.01f;
// Close the start with a ploygon?
if (p == NULL || p->style != TR_WALL ||
(distance(p->vertex[TR_EL], svl) > weps) ||
(distance(p->vertex[TR_ER], svr) > weps) ||
(fabs(h - p->height) > weps) ||
fixedid == 0)
// Close the wall start with a ploygon?
if (p == NULL || p->style != TR_WALL || fixedid == 0)
{
// Enough space in array?
if (fixedid >= sizeof(fixedobjects)/sizeof(fixedobjects[0]))
@ -686,6 +683,13 @@ void buildWalls(tTrackSeg *start, int side) {
dtEnd();
}
// fill in hole if width changes
if (p != NULL && p->style == TR_WALL && (distance(p->vertex[TR_EL], svl) > weps || distance(p->vertex[TR_ER], svr) > weps))
{
// TODO: we can get away with not adding this polygon if the change of width
// is small but it will be a problem if the hole is bigger than a car.
}
// Build sides, left, top, right. Depending on how we want to use it we
// can remove top perhaps.
// TODO: do we want the top poly?
@ -720,10 +724,7 @@ void buildWalls(tTrackSeg *start, int side) {
}
// Close the end with a ploygon?
if (n == NULL || n->style != TR_WALL ||
(distance(n->vertex[TR_SL], evl) > weps) ||
(distance(n->vertex[TR_SR], evr) > weps) ||
(fabs(h - n->height) > weps))
if (n == NULL || n->style != TR_WALL)
{
if (close == true)
{