stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-29 07:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve LINKDRAW with multiple objects

Browse source 
Multiple objects with MF2_LINKDRAW will get sorted between each other, instead of purely done with dispoffset.
This commit is contained in:
Sally Coolatta 2022-11-01 17:56:52 -04:00
parent 88667400ee
commit ee9ebe6c54
1 changed files with 40 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/r_things.c
View file

@ -1817,6 +1817,11 @@ static void R_ProjectSprite(mobj_t *thing)
ang = (viewangle >> ANGLETOFINESHIFT); ang = (viewangle >> ANGLETOFINESHIFT);
sort_x = FixedMul(FixedMul(FixedMul(spritexscale, this_scale), sort_z), FINECOSINE(ang)); sort_x = FixedMul(FixedMul(FixedMul(spritexscale, this_scale), sort_z), FINECOSINE(ang));
sort_y = FixedMul(FixedMul(FixedMul(spriteyscale, this_scale), sort_z), FINESINE(ang)); sort_y = FixedMul(FixedMul(FixedMul(spriteyscale, this_scale), sort_z), FINESINE(ang));
tr_x = (interp.x + sort_x) - viewx;
tr_y = (interp.y + sort_y) - viewy;
sort_z = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
sortscale = FixedDiv(projectiony, sort_z);
} }
if ((thing->flags2 & MF2_LINKDRAW) && thing->tracer) // toast 16/09/16 (SYMMETRY) if ((thing->flags2 & MF2_LINKDRAW) && thing->tracer) // toast 16/09/16 (SYMMETRY)
@ -1849,16 +1854,11 @@ static void R_ProjectSprite(mobj_t *thing)
if (sortscale < linkscale) if (sortscale < linkscale)
dispoffset *= -1; // if it's physically behind, make sure it's ordered behind (if dispoffset > 0) dispoffset *= -1; // if it's physically behind, make sure it's ordered behind (if dispoffset > 0)
sortscale = linkscale; // now make sure it's linked //sortscale = linkscale; // now make sure it's linked
// No need to do that, linkdraw already excludes it from regular sorting.
cut |= SC_LINKDRAW; cut |= SC_LINKDRAW;
} }
else if (splat)
{
tr_x = (interp.x + sort_x) - viewx;
tr_y = (interp.y + sort_y) - viewy;
sort_z = FixedMul(tr_x, viewcos) + FixedMul(tr_y, viewsin);
sortscale = FixedDiv(projectiony, sort_z);
}
// Calculate the splat's sortscale // Calculate the splat's sortscale
if (splat) if (splat)
@ -2414,6 +2414,21 @@ void R_AddSprites(sector_t *sec, INT32 lightlevel)
} }
} }
static boolean R_SortVisSpriteFunc(vissprite_t *ds, fixed_t bestscale, INT32 bestdispoffset)
{
if (ds->sortscale < bestscale)
{
return true;
}
// order visprites of same scale by dispoffset, smallest first
else if (ds->sortscale == bestscale && ds->dispoffset < bestdispoffset)
{
return true;
}
return false;
}
// //
// R_SortVisSprites // R_SortVisSprites
// //
@ -2504,7 +2519,7 @@ static void R_SortVisSprites(vissprite_t* vsprsortedhead, UINT32 start, UINT32 e
// reusing dsnext... // reusing dsnext...
dsnext = dsfirst->linkdraw; dsnext = dsfirst->linkdraw;
if (!dsnext || ds->dispoffset < dsnext->dispoffset) if (dsnext == NULL || R_SortVisSpriteFunc(ds, dsnext->sortscale, dsnext->dispoffset) == true)
{ {
ds->next = dsnext; ds->next = dsnext;
dsfirst->linkdraw = ds; dsfirst->linkdraw = ds;
@ -2512,8 +2527,13 @@ static void R_SortVisSprites(vissprite_t* vsprsortedhead, UINT32 start, UINT32 e
else else
{ {
for (; dsnext->next != NULL; dsnext = dsnext->next) for (; dsnext->next != NULL; dsnext = dsnext->next)
if (ds->dispoffset < dsnext->next->dispoffset) {
if (R_SortVisSpriteFunc(ds, dsnext->next->sortscale, dsnext->next->dispoffset) == true)
{
break; break;
}
}
ds->next = dsnext->next; ds->next = dsnext->next;
dsnext->next = ds; dsnext->next = ds;
} }
@ -2532,18 +2552,12 @@ static void R_SortVisSprites(vissprite_t* vsprsortedhead, UINT32 start, UINT32 e
I_Error("R_SortVisSprites: no link or discardal made for linkdraw!"); I_Error("R_SortVisSprites: no link or discardal made for linkdraw!");
#endif #endif
if (ds->sortscale < bestscale) if (R_SortVisSpriteFunc(ds, bestscale, bestdispoffset) == true)
{ {
bestscale = ds->sortscale; bestscale = ds->sortscale;
bestdispoffset = ds->dispoffset; bestdispoffset = ds->dispoffset;
best = ds; best = ds;
} }
// order visprites of same scale by dispoffset, smallest first
else if (ds->sortscale == bestscale && ds->dispoffset < bestdispoffset)
{
bestdispoffset = ds->dispoffset;
best = ds;
}
} }
best->next->prev = best->prev; best->next->prev = best->prev;
best->prev->next = best->next; best->prev->next = best->next;
@ -3289,14 +3303,20 @@ static void R_DrawMaskedList (drawnode_t* head)
vissprite_t *ds = r2->sprite->linkdraw; vissprite_t *ds = r2->sprite->linkdraw;
for (; for (;
(ds != NULL && r2->sprite->dispoffset > ds->dispoffset); (ds != NULL && r2->sprite->dispoffset > ds->dispoffset);
ds = ds->next) ds = ds->next)
{
R_DrawSprite(ds); R_DrawSprite(ds);
}
R_DrawSprite(r2->sprite); R_DrawSprite(r2->sprite);
for (; ds != NULL; ds = ds->next) for (;
ds != NULL;
ds = ds->next)
{
R_DrawSprite(ds); R_DrawSprite(ds);
}
} }
R_DoneWithNode(r2); R_DoneWithNode(r2);