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

trackgen: fix regression from last patch and regenerate barrier-testtrack

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

Former-commit-id: 68a4d523ee1e657cf57c5e9d46431b62bf8a72da
Former-commit-id: 6d083f18af876862a58fb24b1bb719f3b85af645
This commit is contained in:
iobyte 2023-07-02 22:46:29 +00:00
parent 7c947d9231
commit ac3f222f00
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tools/trackgen/main.cpp
View file

@ -98,7 +98,7 @@ public:
//! Constructor. //! Constructor.
Application::Application() Application::Application()
: GfApplication("TrackGen", "1.6.0.25", "Terrain generator for tracks") : GfApplication("TrackGen", "1.6.0.26", "Terrain generator for tracks")
, HeightSteps(30) , HeightSteps(30)
, Bump(false) , Bump(false)
, Raceline(false) , Raceline(false)

1
src/tools/trackgen/testtrackgen.sh
View file

@ -46,6 +46,7 @@ check () {
# add tracks here as they are updated # add tracks here as they are updated
check circuit tuna check circuit tuna
check development barrier-testtrack
check development border-testtrack check development border-testtrack
check development no-barrier-testtrack check development no-barrier-testtrack
check development showroom check development showroom

14
src/tools/trackgen/track.cpp
View file

@ -2021,11 +2021,12 @@ int InitScene(tTrack *Track, void *TrackHandle, bool bump, bool raceline, bool b
startNeeded = true; startNeeded = true;
else if (lastBarrier->style == curBarrier->style) else if (lastBarrier->style == curBarrier->style)
{ {
if (std::fabs(xprev - seg->vertex[TR_SR].x) > 0.001 || std::fabs(yprev - seg->vertex[TR_SR].y) > 0.001) tTrackSeg *prevSide = mseg->prev;
{ while (prevSide->rside)
prevSide = prevSide->rside;
startPolygonNeeded = std::fabs(seg->vertex[TR_SR].x - prevSide->vertex[TR_ER].x) > 0.001 || std::fabs(seg->vertex[TR_SR].y - prevSide->vertex[TR_ER].y) > 0.001;
if (startPolygonNeeded)
startNeeded = true; startNeeded = true;
startPolygonNeeded = true;
}
} }
} }
@ -2391,10 +2392,11 @@ int InitScene(tTrack *Track, void *TrackHandle, bool bump, bool raceline, bool b
startNeeded = true; startNeeded = true;
else if (lastBarrier->style == curBarrier->style) else if (lastBarrier->style == curBarrier->style)
{ {
tTrackSeg *prevSide = mseg->next; tTrackSeg *prevSide = mseg->prev;
while (prevSide->lside) while (prevSide->lside)
prevSide = prevSide->rside; prevSide = prevSide->lside;
startPolygonNeeded = std::fabs(seg->vertex[TR_SL].x - prevSide->vertex[TR_EL].x) > 0.001 || std::fabs(seg->vertex[TR_SL].y - prevSide->vertex[TR_EL].y) > 0.001; startPolygonNeeded = std::fabs(seg->vertex[TR_SL].x - prevSide->vertex[TR_EL].x) > 0.001 || std::fabs(seg->vertex[TR_SL].y - prevSide->vertex[TR_EL].y) > 0.001;
if (startPolygonNeeded)
startNeeded = true; startNeeded = true;
} }
} }