zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- don't use r_viewpoint directly when sorting translucent geometry. 

Better store the view Z in a member variable and use that.
This commit is contained in:
Christoph Oelckers 2018-06-19 10:50:48 +02:00
parent ae7053ee98
commit 86975a71e8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hwrenderer/scene/hw_drawlist.cpp
View File

@ -269,7 +269,7 @@ void HWDrawList::SortWallIntoPlane(SortNode * head, SortNode * sort)
GLFlat * fh = flats[drawitems[head->itemindex].index]; GLFlat * fh = flats[drawitems[head->itemindex].index];
GLWall * ws = walls[drawitems[sort->itemindex].index]; GLWall * ws = walls[drawitems[sort->itemindex].index];
bool ceiling = fh->z > r_viewpoint.Pos.Z; bool ceiling = fh->z > SortZ;
if ((ws->ztop[0] > fh->z || ws->ztop[1] > fh->z) && (ws->zbottom[0] < fh->z || ws->zbottom[1] < fh->z)) if ((ws->ztop[0] > fh->z || ws->ztop[1] > fh->z) && (ws->zbottom[0] < fh->z || ws->zbottom[1] < fh->z))
{ {
@ -327,7 +327,7 @@ void HWDrawList::SortSpriteIntoPlane(SortNode * head, SortNode * sort)
GLFlat * fh = flats[drawitems[head->itemindex].index]; GLFlat * fh = flats[drawitems[head->itemindex].index];
GLSprite * ss = sprites[drawitems[sort->itemindex].index]; GLSprite * ss = sprites[drawitems[sort->itemindex].index];
bool ceiling = fh->z > r_viewpoint.Pos.Z; bool ceiling = fh->z > SortZ;
auto hiz = ss->z1 > ss->z2 ? ss->z1 : ss->z2; auto hiz = ss->z1 > ss->z2 ? ss->z1 : ss->z2;
auto loz = ss->z1 < ss->z2 ? ss->z1 : ss->z2; auto loz = ss->z1 < ss->z2 ? ss->z1 : ss->z2;
@ -688,6 +688,7 @@ SortNode * HWDrawList::DoSort(HWDrawInfo *di, SortNode * head)
//========================================================================== //==========================================================================
void HWDrawList::Sort(HWDrawInfo *di) void HWDrawList::Sort(HWDrawInfo *di)
{ {
SortZ = r_viewpoint.Pos.Z;
MakeSortList(); MakeSortList();
sorted = DoSort(di, SortNodes[SortNodeStart]); sorted = DoSort(di, SortNodes[SortNodeStart]);
} }

1
src/hwrenderer/scene/hw_drawlist.h
View File

@ -61,6 +61,7 @@ struct HWDrawList
TArray<GLSprite*> sprites; TArray<GLSprite*> sprites;
TArray<GLDrawItem> drawitems; TArray<GLDrawItem> drawitems;
int SortNodeStart; int SortNodeStart;
float SortZ;
SortNode * sorted; SortNode * sorted;
public: public: