xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trackgen: use object name and type in messages 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9336 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2024-02-22 17:07:55 +00:00
parent 78c0b12210
commit 4c1487a974
2 changed files with 11 additions and 6 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.37", "Terrain generator for tracks") : GfApplication("TrackGen", "1.6.0.38", "Terrain generator for tracks")
, HeightSteps(30) , HeightSteps(30)
, Bump(false) , Bump(false)
, Raceline(false) , Raceline(false)

15
src/tools/trackgen/objects.cpp
View File

@ -70,6 +70,7 @@ struct objdef
tdble scaleMin = 0; tdble scaleMin = 0;
tdble scaleMax = 0; tdble scaleMax = 0;
std::string fileName; std::string fileName;
std::string name;
}; };
std::vector<objdef> objects; std::vector<objdef> objects;
@ -115,6 +116,8 @@ InitObjects(tTrack *track, void *TrackHandle)
exit(1); exit(1);
} }
curObj->name = GfParmListGetCurEltName(TrackHandle, TRK_SECT_OBJECTS);
char filename[1024]; char filename[1024];
if (!GetFilename(objName, modelPath.c_str(), filename, sizeof(filename))) if (!GetFilename(objName, modelPath.c_str(), filename, sizeof(filename)))
{ {
@ -225,6 +228,8 @@ AddObject(tTrack *track, void *trackHandle, const Ac3d &terrainRoot, const Ac3d
height = GfParmGetCurNum(trackHandle, TRK_SECT_TERRAIN_OBJECTS, TRK_ATT_HEIGHT, "m", 0); height = GfParmGetCurNum(trackHandle, TRK_SECT_TERRAIN_OBJECTS, TRK_ATT_HEIGHT, "m", 0);
name = GfParmListGetCurEltName(trackHandle, TRK_SECT_TERRAIN_OBJECTS); name = GfParmListGetCurEltName(trackHandle, TRK_SECT_TERRAIN_OBJECTS);
} }
else
name = curObj.name;
Ac3d obj(curObj.ac3d); Ac3d obj(curObj.ac3d);
@ -288,13 +293,13 @@ AddObject(tTrack *track, void *trackHandle, const Ac3d &terrainRoot, const Ac3d
{ {
if (individual) if (individual)
{ {
printf("WARNING: failed to find elevation object: %s x: %g y: %g (track x: %g track y: %g)\n", printf("WARNING: failed to find elevation for individual object: %s x: %g y: %g (track x: %g track y: %g)\n",
name.c_str(), x, y, x - trackOffsetX, y - trackOffsetY); name.c_str(), x, y, x - trackOffsetX, y - trackOffsetY);
} }
else else
{ {
printf("WARNING: failed to find elevation object: %s x: %g y: %g (track x: %g track y: %g)\n", printf("WARNING: failed to find elevation for object map object: %s x: %g y: %g (track x: %g track y: %g)\n",
curObj.fileName.c_str(), x, y, x - trackOffsetX, y - trackOffsetY); name.c_str(), x, y, x - trackOffsetX, y - trackOffsetY);
} }
return; return;
} }
@ -302,9 +307,9 @@ AddObject(tTrack *track, void *trackHandle, const Ac3d &terrainRoot, const Ac3d
} }
if (individual) if (individual)
printf("placing object: %s x: %g y: %g z: %g \n", name.c_str(), x, y, z); printf("placing individual object: %s x: %g y: %g z: %g \n", name.c_str(), x, y, z);
else else
printf("placing object: %s x: %g y: %g z: %g \n", curObj.fileName.c_str(), x, y, z); printf("placing object map object: %s x: %g y: %g z: %g \n", name.c_str(), x, y, z);
m.makeRotation(angle + orientation, dv / 2.0 - dv * rand() / (RAND_MAX + 1.0), dv / 2.0 - dv * rand() / (RAND_MAX + 1.0)); m.makeRotation(angle + orientation, dv / 2.0 - dv * rand() / (RAND_MAX + 1.0), dv / 2.0 - dv * rand() / (RAND_MAX + 1.0));
obj.transform(m); obj.transform(m);