iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

trackgen: use ssg search path when needed

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

Former-commit-id: 37d911ef90e3aab82ea195de35861c32eb10ff35
Former-commit-id: bbdccaa41d791478f03c073692c6b66a6d07d80f
This commit is contained in:
iobyte 2022-09-12 15:00:37 +00:00
parent b89f932996
commit 45a53ebded
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/tools/trackgen/objects.cpp
View file

@ -129,7 +129,6 @@ static void scaleObject(ssgEntity *obj, tdble scale)
static void
InitObjects(tTrack *track, void *TrackHandle)
{
static char *search;
ssgLoaderOptionsEx options ;
ObjUniqId = 0;
@ -144,12 +143,11 @@ InitObjects(tTrack *track, void *TrackHandle)
inputPath.resize(inputPath.find_last_of("/"));
snprintf(buf, sizeof(buf), "%s;%sdata/objects", inputPath.c_str(), GfDataDir());
search = strdup(buf);
ssgModelPath(buf);
snprintf(path, sizeof(path), "%s;%sdata/objects;%sdata/textures;.", inputPath.c_str(), GfDataDir(), GfDataDir());
ssgTexturePath(path);
ssgModelPath(path);
int objnb = GfParmGetEltNb(TrackHandle, TRK_SECT_OBJECTS);
GfParmListSeekFirst(TrackHandle, TRK_SECT_OBJECTS);
@ -165,7 +163,6 @@ InitObjects(tTrack *track, void *TrackHandle)
exit(1);
}
GetFilename(objName, search, buf);
curObj->obj = ssgLoadAC(buf);
if (!curObj->obj)
@ -242,8 +239,6 @@ InitObjects(tTrack *track, void *TrackHandle)
GF_TAILQ_INSERT_HEAD(&objhead, curObj, link);
GfParmListSeekNext(TrackHandle, TRK_SECT_OBJECTS);
}
free(search);
}
/* Prune the group tree */
@ -581,7 +576,7 @@ GenerateObjects(tTrack *track, void *TrackHandle, void *CfgHandle, FILE *save_fd
snprintf(buf, sizeof(buf), "%s;%s/data/objects;%sdata/textures;%sdata/img;.", inputPath.c_str(), GfDataDir(), GfDataDir(), GfDataDir());
ssgTexturePath(buf);
snprintf(buf, sizeof(buf), ".;%s;%sdata/objects", inputPath.c_str(), GfDataDir());
ssgModelPath(buf);
ssgModelPath(""); // don't need a search path because meshFile has a full path
TrackRoot = (ssgRoot*)ssgLoadAC(meshFile.c_str());
InitObjects(track, TrackHandle);