edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from cinaera/pr_gpu_batch

Browse source 
Change the way quads are split into triangle splits
This commit is contained in:
Dennis Felsing 2015-03-31 16:21:11 +02:00
parent 49f96852e6 2d3202862b
commit 913d709bb2
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/engine/client/graphics.cpp
View file

@ -685,16 +685,16 @@ void CGraphics_OpenGL::QuadsDrawTL(const CQuadItem *pArray, int Num)
m_aVertices[m_NumVertices + 6*i + 1].m_Tex = m_aTexture[1]; m_aVertices[m_NumVertices + 6*i + 1].m_Tex = m_aTexture[1];
m_aVertices[m_NumVertices + 6*i + 1].m_Color = m_aColor[1]; m_aVertices[m_NumVertices + 6*i + 1].m_Color = m_aColor[1];
m_aVertices[m_NumVertices + 6*i + 2].m_Pos.x = pArray[i].m_X; m_aVertices[m_NumVertices + 6*i + 2].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
m_aVertices[m_NumVertices + 6*i + 2].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height; m_aVertices[m_NumVertices + 6*i + 2].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
m_aVertices[m_NumVertices + 6*i + 2].m_Tex = m_aTexture[3]; m_aVertices[m_NumVertices + 6*i + 2].m_Tex = m_aTexture[2];
m_aVertices[m_NumVertices + 6*i + 2].m_Color = m_aColor[3]; m_aVertices[m_NumVertices + 6*i + 2].m_Color = m_aColor[2];
// second triangle // second triangle
m_aVertices[m_NumVertices + 6*i + 3].m_Pos.x = pArray[i].m_X + pArray[i].m_Width; m_aVertices[m_NumVertices + 6*i + 3].m_Pos.x = pArray[i].m_X;
m_aVertices[m_NumVertices + 6*i + 3].m_Pos.y = pArray[i].m_Y; m_aVertices[m_NumVertices + 6*i + 3].m_Pos.y = pArray[i].m_Y;
m_aVertices[m_NumVertices + 6*i + 3].m_Tex = m_aTexture[1]; m_aVertices[m_NumVertices + 6*i + 3].m_Tex = m_aTexture[0];
m_aVertices[m_NumVertices + 6*i + 3].m_Color = m_aColor[1]; m_aVertices[m_NumVertices + 6*i + 3].m_Color = m_aColor[0];
m_aVertices[m_NumVertices + 6*i + 4].m_Pos.x = pArray[i].m_X + pArray[i].m_Width; m_aVertices[m_NumVertices + 6*i + 4].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
m_aVertices[m_NumVertices + 6*i + 4].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height; m_aVertices[m_NumVertices + 6*i + 4].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
@ -772,15 +772,15 @@ void CGraphics_OpenGL::QuadsDrawFreeform(const CFreeformItem *pArray, int Num)
m_aVertices[m_NumVertices + 6*i + 1].m_Tex = m_aTexture[1]; m_aVertices[m_NumVertices + 6*i + 1].m_Tex = m_aTexture[1];
m_aVertices[m_NumVertices + 6*i + 1].m_Color = m_aColor[1]; m_aVertices[m_NumVertices + 6*i + 1].m_Color = m_aColor[1];
m_aVertices[m_NumVertices + 6*i + 2].m_Pos.x = pArray[i].m_X2; m_aVertices[m_NumVertices + 6*i + 2].m_Pos.x = pArray[i].m_X3;
m_aVertices[m_NumVertices + 6*i + 2].m_Pos.y = pArray[i].m_Y2; m_aVertices[m_NumVertices + 6*i + 2].m_Pos.y = pArray[i].m_Y3;
m_aVertices[m_NumVertices + 6*i + 2].m_Tex = m_aTexture[2]; m_aVertices[m_NumVertices + 6*i + 2].m_Tex = m_aTexture[3];
m_aVertices[m_NumVertices + 6*i + 2].m_Color = m_aColor[2]; m_aVertices[m_NumVertices + 6*i + 2].m_Color = m_aColor[3];
m_aVertices[m_NumVertices + 6*i + 3].m_Pos.x = pArray[i].m_X1; m_aVertices[m_NumVertices + 6*i + 3].m_Pos.x = pArray[i].m_X0;
m_aVertices[m_NumVertices + 6*i + 3].m_Pos.y = pArray[i].m_Y1; m_aVertices[m_NumVertices + 6*i + 3].m_Pos.y = pArray[i].m_Y0;
m_aVertices[m_NumVertices + 6*i + 3].m_Tex = m_aTexture[1]; m_aVertices[m_NumVertices + 6*i + 3].m_Tex = m_aTexture[0];
m_aVertices[m_NumVertices + 6*i + 3].m_Color = m_aColor[1]; m_aVertices[m_NumVertices + 6*i + 3].m_Color = m_aColor[0];
m_aVertices[m_NumVertices + 6*i + 4].m_Pos.x = pArray[i].m_X3; m_aVertices[m_NumVertices + 6*i + 4].m_Pos.x = pArray[i].m_X3;
m_aVertices[m_NumVertices + 6*i + 4].m_Pos.y = pArray[i].m_Y3; m_aVertices[m_NumVertices + 6*i + 4].m_Pos.y = pArray[i].m_Y3;

28
src/engine/client/graphics_threaded.cpp
View file

@ -611,16 +611,16 @@ void CGraphics_Threaded::QuadsDrawTL(const CQuadItem *pArray, int Num)
m_aVertices[m_NumVertices + 6*i + 1].m_Tex = m_aTexture[1]; m_aVertices[m_NumVertices + 6*i + 1].m_Tex = m_aTexture[1];
m_aVertices[m_NumVertices + 6*i + 1].m_Color = m_aColor[1]; m_aVertices[m_NumVertices + 6*i + 1].m_Color = m_aColor[1];
m_aVertices[m_NumVertices + 6*i + 2].m_Pos.x = pArray[i].m_X; m_aVertices[m_NumVertices + 6*i + 2].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
m_aVertices[m_NumVertices + 6*i + 2].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height; m_aVertices[m_NumVertices + 6*i + 2].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
m_aVertices[m_NumVertices + 6*i + 2].m_Tex = m_aTexture[3]; m_aVertices[m_NumVertices + 6*i + 2].m_Tex = m_aTexture[2];
m_aVertices[m_NumVertices + 6*i + 2].m_Color = m_aColor[3]; m_aVertices[m_NumVertices + 6*i + 2].m_Color = m_aColor[2];
// second triangle // second triangle
m_aVertices[m_NumVertices + 6*i + 3].m_Pos.x = pArray[i].m_X + pArray[i].m_Width; m_aVertices[m_NumVertices + 6*i + 3].m_Pos.x = pArray[i].m_X;
m_aVertices[m_NumVertices + 6*i + 3].m_Pos.y = pArray[i].m_Y; m_aVertices[m_NumVertices + 6*i + 3].m_Pos.y = pArray[i].m_Y;
m_aVertices[m_NumVertices + 6*i + 3].m_Tex = m_aTexture[1]; m_aVertices[m_NumVertices + 6*i + 3].m_Tex = m_aTexture[0];
m_aVertices[m_NumVertices + 6*i + 3].m_Color = m_aColor[1]; m_aVertices[m_NumVertices + 6*i + 3].m_Color = m_aColor[0];
m_aVertices[m_NumVertices + 6*i + 4].m_Pos.x = pArray[i].m_X + pArray[i].m_Width; m_aVertices[m_NumVertices + 6*i + 4].m_Pos.x = pArray[i].m_X + pArray[i].m_Width;
m_aVertices[m_NumVertices + 6*i + 4].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height; m_aVertices[m_NumVertices + 6*i + 4].m_Pos.y = pArray[i].m_Y + pArray[i].m_Height;
@ -698,15 +698,15 @@ void CGraphics_Threaded::QuadsDrawFreeform(const CFreeformItem *pArray, int Num)
m_aVertices[m_NumVertices + 6*i + 1].m_Tex = m_aTexture[1]; m_aVertices[m_NumVertices + 6*i + 1].m_Tex = m_aTexture[1];
m_aVertices[m_NumVertices + 6*i + 1].m_Color = m_aColor[1]; m_aVertices[m_NumVertices + 6*i + 1].m_Color = m_aColor[1];
m_aVertices[m_NumVertices + 6*i + 2].m_Pos.x = pArray[i].m_X2; m_aVertices[m_NumVertices + 6*i + 2].m_Pos.x = pArray[i].m_X3;
m_aVertices[m_NumVertices + 6*i + 2].m_Pos.y = pArray[i].m_Y2; m_aVertices[m_NumVertices + 6*i + 2].m_Pos.y = pArray[i].m_Y3;
m_aVertices[m_NumVertices + 6*i + 2].m_Tex = m_aTexture[2]; m_aVertices[m_NumVertices + 6*i + 2].m_Tex = m_aTexture[3];
m_aVertices[m_NumVertices + 6*i + 2].m_Color = m_aColor[2]; m_aVertices[m_NumVertices + 6*i + 2].m_Color = m_aColor[3];
m_aVertices[m_NumVertices + 6*i + 3].m_Pos.x = pArray[i].m_X1; m_aVertices[m_NumVertices + 6*i + 3].m_Pos.x = pArray[i].m_X0;
m_aVertices[m_NumVertices + 6*i + 3].m_Pos.y = pArray[i].m_Y1; m_aVertices[m_NumVertices + 6*i + 3].m_Pos.y = pArray[i].m_Y0;
m_aVertices[m_NumVertices + 6*i + 3].m_Tex = m_aTexture[1]; m_aVertices[m_NumVertices + 6*i + 3].m_Tex = m_aTexture[0];
m_aVertices[m_NumVertices + 6*i + 3].m_Color = m_aColor[1]; m_aVertices[m_NumVertices + 6*i + 3].m_Color = m_aColor[0];
m_aVertices[m_NumVertices + 6*i + 4].m_Pos.x = pArray[i].m_X3; m_aVertices[m_NumVertices + 6*i + 4].m_Pos.x = pArray[i].m_X3;
m_aVertices[m_NumVertices + 6*i + 4].m_Pos.y = pArray[i].m_Y3; m_aVertices[m_NumVertices + 6*i + 4].m_Pos.y = pArray[i].m_Y3;