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

- split off the vertex creation from RenderWall.

This commit is contained in:
Christoph Oelckers 2016-08-25 22:54:08 +02:00
parent 4ab8ca63ce
commit 8cf53f04e8
2 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gl/scene/gl_wall.h
View File

@ -195,6 +195,7 @@ private:
void SetupLights(); void SetupLights();
bool PrepareLight(ADynamicLight * light, int pass); bool PrepareLight(ADynamicLight * light, int pass);
void MakeVertices(bool nosplit);
void RenderWall(int textured, unsigned int *store = NULL); void RenderWall(int textured, unsigned int *store = NULL);
void RenderTextured(int rflags); void RenderTextured(int rflags);

53
src/gl/scene/gl_walls_draw.cpp
View File

@ -167,6 +167,36 @@ void GLWall::SetupLights()
dynlightindex = GLRenderer->mLights->UploadLights(lightdata); dynlightindex = GLRenderer->mLights->UploadLights(lightdata);
} }
//==========================================================================
//
// build the vertices for this wall
//
//==========================================================================
void GLWall::MakeVertices(bool nosplit)
{
if (vertcount == 0)
{
bool split = (gl_seamless && !nosplit && seg->sidedef != NULL && !(seg->sidedef->Flags & WALLF_POLYOBJ) && !(flags & GLWF_NOSPLIT));
FFlatVertex *ptr = GLRenderer->mVBO->GetBuffer();
ptr->Set(glseg.x1, zbottom[0], glseg.y1, tcs[LOLFT].u, tcs[LOLFT].v);
ptr++;
if (split && glseg.fracleft == 0) SplitLeftEdge(ptr);
ptr->Set(glseg.x1, ztop[0], glseg.y1, tcs[UPLFT].u, tcs[UPLFT].v);
ptr++;
if (split && !(flags & GLWF_NOSPLITUPPER)) SplitUpperEdge(ptr);
ptr->Set(glseg.x2, ztop[1], glseg.y2, tcs[UPRGT].u, tcs[UPRGT].v);
ptr++;
if (split && glseg.fracright == 1) SplitRightEdge(ptr);
ptr->Set(glseg.x2, zbottom[1], glseg.y2, tcs[LORGT].u, tcs[LORGT].v);
ptr++;
if (split && !(flags & GLWF_NOSPLITLOWER)) SplitLowerEdge(ptr);
vertcount = GLRenderer->mVBO->GetCount(ptr, &vertindex);
}
}
//========================================================================== //==========================================================================
// //
@ -177,31 +207,18 @@ void GLWall::SetupLights()
void GLWall::RenderWall(int textured, unsigned int *store) void GLWall::RenderWall(int textured, unsigned int *store)
{ {
bool split = (gl_seamless && !(textured&RWF_NOSPLIT) && seg->sidedef != NULL && !(seg->sidedef->Flags & WALLF_POLYOBJ) && !(flags & GLWF_NOSPLIT));
if (!(textured & RWF_NORENDER)) if (!(textured & RWF_NORENDER))
{ {
gl_RenderState.Apply(); gl_RenderState.Apply();
gl_RenderState.ApplyLightIndex(dynlightindex); gl_RenderState.ApplyLightIndex(dynlightindex);
} }
// the rest of the code is identical for textured rendering and lights if (gl.buffermethod != BM_DEFERRED)
FFlatVertex *ptr = GLRenderer->mVBO->GetBuffer(); {
unsigned int count, offset; MakeVertices(!(textured&RWF_NOSPLIT));
}
ptr->Set(glseg.x1, zbottom[0], glseg.y1, tcs[LOLFT].u, tcs[LOLFT].v); unsigned int count = vertcount, offset = vertindex;
ptr++;
if (split && glseg.fracleft == 0) SplitLeftEdge(ptr);
ptr->Set(glseg.x1, ztop[0], glseg.y1, tcs[UPLFT].u, tcs[UPLFT].v);
ptr++;
if (split && !(flags & GLWF_NOSPLITUPPER)) SplitUpperEdge(ptr);
ptr->Set(glseg.x2, ztop[1], glseg.y2, tcs[UPRGT].u, tcs[UPRGT].v);
ptr++;
if (split && glseg.fracright == 1) SplitRightEdge(ptr);
ptr->Set(glseg.x2, zbottom[1], glseg.y2, tcs[LORGT].u, tcs[LORGT].v);
ptr++;
if (split && !(flags & GLWF_NOSPLITLOWER)) SplitLowerEdge(ptr);
count = GLRenderer->mVBO->GetCount(ptr, &offset);
if (!(textured & RWF_NORENDER)) if (!(textured & RWF_NORENDER))
{ {
GLRenderer->mVBO->RenderArray(GL_TRIANGLE_FAN, offset, count); GLRenderer->mVBO->RenderArray(GL_TRIANGLE_FAN, offset, count);