From 02b16dbaa0049c8eeec074f5738f4f7aa3e33c6e Mon Sep 17 00:00:00 2001 From: iobyte Date: Sun, 9 Jul 2023 22:01:02 +0000 Subject: [PATCH] trackgen: fix track object positions git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9092 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 18ae9d2b501f527d3fb1dedf05e0c8bdb5b2f099 Former-commit-id: b1bef7704222de40584141c1494f604a5f38be82 --- src/tools/trackgen/main.cpp | 2 +- src/tools/trackgen/objects.cpp | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/tools/trackgen/main.cpp b/src/tools/trackgen/main.cpp index 39f6cdc3f..e8f18ad02 100644 --- a/src/tools/trackgen/main.cpp +++ b/src/tools/trackgen/main.cpp @@ -98,7 +98,7 @@ public: //! Constructor. Application::Application() -: GfApplication("TrackGen", "1.6.0.28", "Terrain generator for tracks") +: GfApplication("TrackGen", "1.6.0.29", "Terrain generator for tracks") , HeightSteps(30) , Bump(false) , Raceline(false) diff --git a/src/tools/trackgen/objects.cpp b/src/tools/trackgen/objects.cpp index 911303199..7046fadcc 100644 --- a/src/tools/trackgen/objects.cpp +++ b/src/tools/trackgen/objects.cpp @@ -501,16 +501,6 @@ GenerateObjects(tTrack *track, void *TrackHandle, void *CfgHandle, Ac3d &allAc3d if (GfParmGetEltNb(TrackHandle, TRK_SECT_TERRAIN_OBJECTS) != 0) { - tTrkLocPos trkpos; - - trkpos.type = TR_LPOS_MAIN; - trkpos.toStart = 0; - trkpos.toRight = 0; - trkpos.seg = track->seg->next; - tdble zeroX; - tdble zeroY; - RtTrackLocal2Global(&trkpos, &zeroX, &zeroY, TR_TORIGHT); - GfParmListSeekFirst(TrackHandle, TRK_SECT_TERRAIN_OBJECTS); Ac3d ObjectsRoot; @@ -524,7 +514,7 @@ GenerateObjects(tTrack *track, void *TrackHandle, void *CfgHandle, Ac3d &allAc3d const unsigned int color = (unsigned int)GfParmGetCurNum(TrackHandle, TRK_SECT_TERRAIN_OBJECTS, TRK_ATT_COLOR, nullptr, 0); printf("found color: 0x%X x: %f y: %f\n", color, x, y); - AddObject(track, TrackHandle, TerrainRoot, TrackRoot, ObjectsRoot, color, x + zeroX, y + zeroY, multipleMaterials, true); + AddObject(track, TrackHandle, TerrainRoot, TrackRoot, ObjectsRoot, color, x + trackOffsetX, y + trackOffsetY, multipleMaterials, true); } while (!GfParmListSeekNext(TrackHandle, TRK_SECT_TERRAIN_OBJECTS)); Ac3d GroupRoot;