ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-11-12 23:44:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bugs where some surfaces weren't merged and others were counted as merged in R_MergeLeafSurfaces().

Browse source
This commit is contained in:
James Canete 2012-11-09 08:13:38 +00:00
parent 86984eb536
commit b269acac94
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
code/rend2/tr_bsp.c
View file

@ -2924,6 +2924,30 @@ void R_MergeLeafSurfaces(void)
} }
} }
// don't add surfaces that don't merge to any others to the merged list
for (i = 0; i < numWorldSurfaces; i++)
{
qboolean merges = qfalse;
if (s_worldData.surfacesViewCount[i] != i)
continue;
for (j = 0; j < numWorldSurfaces; j++)
{
if (j == i)
continue;
if (s_worldData.surfacesViewCount[j] == i)
{
merges = qtrue;
break;
}
}
if (!merges)
s_worldData.surfacesViewCount[i] = -1;
}
// count merged/unmerged surfaces // count merged/unmerged surfaces
numMergedSurfaces = 0; numMergedSurfaces = 0;
numUnmergedSurfaces = 0; numUnmergedSurfaces = 0;
@ -2943,6 +2967,7 @@ void R_MergeLeafSurfaces(void)
s_worldData.mergedSurfaces = ri.Hunk_Alloc(sizeof(*s_worldData.mergedSurfaces) * numMergedSurfaces, h_low); s_worldData.mergedSurfaces = ri.Hunk_Alloc(sizeof(*s_worldData.mergedSurfaces) * numMergedSurfaces, h_low);
s_worldData.mergedSurfacesViewCount = ri.Hunk_Alloc(sizeof(*s_worldData.mergedSurfacesViewCount) * numMergedSurfaces, h_low); s_worldData.mergedSurfacesViewCount = ri.Hunk_Alloc(sizeof(*s_worldData.mergedSurfacesViewCount) * numMergedSurfaces, h_low);
s_worldData.mergedSurfacesDlightBits = ri.Hunk_Alloc(sizeof(*s_worldData.mergedSurfacesDlightBits) * numMergedSurfaces, h_low); s_worldData.mergedSurfacesDlightBits = ri.Hunk_Alloc(sizeof(*s_worldData.mergedSurfacesDlightBits) * numMergedSurfaces, h_low);
s_worldData.mergedSurfacesPshadowBits = ri.Hunk_Alloc(sizeof(*s_worldData.mergedSurfacesPshadowBits) * numMergedSurfaces, h_low);
s_worldData.numMergedSurfaces = numMergedSurfaces; s_worldData.numMergedSurfaces = numMergedSurfaces;
// view surfaces are like mark surfaces, except negative ones represent merged surfaces // view surfaces are like mark surfaces, except negative ones represent merged surfaces
@ -2981,7 +3006,7 @@ void R_MergeLeafSurfaces(void)
numSurfsToMerge = 0; numSurfsToMerge = 0;
numTriangles = 0; numTriangles = 0;
numVerts = 0; numVerts = 0;
for (j = i; j < numWorldSurfaces; j++) for (j = 0; j < numWorldSurfaces; j++)
{ {
msurface_t *surf2; msurface_t *surf2;
@ -3037,7 +3062,7 @@ void R_MergeLeafSurfaces(void)
// Merge surfaces (indexes) and calculate bounds // Merge surfaces (indexes) and calculate bounds
ClearBounds(bounds[0], bounds[1]); ClearBounds(bounds[0], bounds[1]);
firstIndex = numIboIndexes; firstIndex = numIboIndexes;
for (j = i; j < numWorldSurfaces; j++) for (j = 0; j < numWorldSurfaces; j++)
{ {
msurface_t *surf2; msurface_t *surf2;
@ -3140,7 +3165,7 @@ void R_MergeLeafSurfaces(void)
mergedSurf->shader = surf1->shader; mergedSurf->shader = surf1->shader;
// redirect view surfaces to this surf // redirect view surfaces to this surf
for (j = i; j < numWorldSurfaces; j++) for (j = 0; j < numWorldSurfaces; j++)
{ {
if (s_worldData.surfacesViewCount[j] != i) if (s_worldData.surfacesViewCount[j] != i)
continue; continue;