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: make global variable Root local

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

Former-commit-id: f21c3d4bb0b45ed3bd8ca453daaf64f73c25fc12
Former-commit-id: b3385e60b86098e09b3728398ee55b11f2af56f9
This commit is contained in:
iobyte 2022-09-12 17:25:20 +00:00
parent 931e0d2632
commit fb1b6f9fa0
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,6 @@
static char path[1024];
static char buf[1024];
static ssgRoot *Root = nullptr;
static ssgRoot *GroupRoot = nullptr;
struct group
@ -242,7 +241,7 @@ InitObjects(tTrack *track, void *TrackHandle)
/* Prune the group tree */
static void
AddToRoot(ssgEntity *node)
AddToRoot(ssgRoot *Root, ssgEntity *node)
{
if (node->isAKindOf(ssgTypeLeaf()))
{
@ -254,13 +253,13 @@ AddToRoot(ssgEntity *node)
for (int i = 0; i < br->getNumKids(); i++)
{
AddToRoot(br->getKid(i));
AddToRoot(Root, br->getKid(i));
}
}
}
static void
AddObject(tTrack *track, void *TrackHandle, ssgRoot *TrackRoot, unsigned int clr, tdble x, tdble y)
AddObject(tTrack *track, void *TrackHandle, ssgRoot *TrackRoot, ssgRoot *Root, unsigned int clr, tdble x, tdble y)
{
for (struct objdef *curObj = GF_TAILQ_FIRST(&objhead); curObj; curObj = GF_TAILQ_NEXT(curObj, link))
{
@ -331,7 +330,7 @@ AddObject(tTrack *track, void *TrackHandle, ssgRoot *TrackRoot, unsigned int clr
sgMakeTransMat4(m, x, y, z);
ApplyTransform(m, obj);
AddToRoot(obj);
AddToRoot(Root, obj);
return;
}
@ -527,7 +526,7 @@ InsertInner(ssgEntity *ent)
static void
Group(tTrack *track, void *TrackHandle, ssgEntity *ent)
Group(tTrack *track, void *TrackHandle, ssgRoot *Root)
{
tdble Margin;
@ -599,7 +598,7 @@ GenerateObjects(tTrack *track, void *TrackHandle, void *CfgHandle, FILE *save_fd
index = 0;
do
{
Root = new ssgRoot();
ssgRoot *Root = new ssgRoot();
index++;
const char *map = GfParmGetCurStr(TrackHandle, path, TRK_ATT_OBJMAP, "");
@ -627,7 +626,7 @@ GenerateObjects(tTrack *track, void *TrackHandle, void *CfgHandle, FILE *save_fd
if (clr)
{
printf("found color: 0x%X x: %d y: %d\n", clr, i, j);
AddObject(track, TrackHandle, TrackRoot, clr, i * kX + dX, j * kY + dY);
AddObject(track, TrackHandle, TrackRoot, Root, clr, i * kX + dX, j * kY + dY);
}
}
}