teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-02-21 11:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- render voxels as triangles instead of quads.

Browse source 
Quads are not available in the core profile which is required to run GL 3.3 on macOS.
This commit is contained in:
Christoph Oelckers 2020-01-03 18:09:05 +01:00
parent 07754b3255
commit f743b22661
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/build/src/voxmodel.cpp
View file

@ -1137,7 +1137,7 @@ int32_t polymost_voxdraw(voxmodel_t *m, tspriteptr_t const tspr)
GLInterface.UseDetailMapping(false); GLInterface.UseDetailMapping(false);
#endif #endif
auto data = GLInterface.AllocVertices(m->qcnt * 4); auto data = GLInterface.AllocVertices(m->qcnt * 6);
auto vt = data.second; auto vt = data.second;
int qstart = 0; int qstart = 0;
@ -1149,8 +1149,8 @@ int32_t polymost_voxdraw(voxmodel_t *m, tspriteptr_t const tspr)
f = 1 /*clut[fi++]*/; f = 1 /*clut[fi++]*/;
if (qdone > 0) if (qdone > 0)
{ {
GLInterface.Draw(DT_QUADS, qstart, qdone * 4); GLInterface.Draw(DT_TRIANGLES, qstart, qdone * 6);
qstart += qdone * 4; qstart += qdone * 6;
qdone = 0; qdone = 0;
} }
GLInterface.SetColor(pc[0]*f, pc[1]*f, pc[2]*f, pc[3]*f); GLInterface.SetColor(pc[0]*f, pc[1]*f, pc[2]*f, pc[3]*f);
@ -1162,8 +1162,10 @@ int32_t polymost_voxdraw(voxmodel_t *m, tspriteptr_t const tspr)
const int32_t yy = vptr[0].y + vptr[2].y; const int32_t yy = vptr[0].y + vptr[2].y;
const int32_t zz = vptr[0].z + vptr[2].z; const int32_t zz = vptr[0].z + vptr[2].z;
for (bssize_t j=0; j<4; j++, vt++) for (bssize_t jj=0; jj<6; jj++, vt++)
{ {
static uint8_t trix[] = { 0, 1, 2, 0, 2, 3 };
int j = trix[jj];
#if (VOXBORDWIDTH == 0) #if (VOXBORDWIDTH == 0)
vt->SetTexCoord(((float)vptr[j].u)*ru + uhack[vptr[j].u!=vptr[0].u], vt->SetTexCoord(((float)vptr[j].u)*ru + uhack[vptr[j].u!=vptr[0].u],
((float)vptr[j].v)*rv + vhack[vptr[j].v!=vptr[0].v]); ((float)vptr[j].v)*rv + vhack[vptr[j].v!=vptr[0].v]);
@ -1177,7 +1179,7 @@ int32_t polymost_voxdraw(voxmodel_t *m, tspriteptr_t const tspr)
qdone++; qdone++;
} }
GLInterface.Draw(DT_QUADS, qstart, qdone * 4); GLInterface.Draw(DT_TRIANGLES, qstart, qdone * 6);
GLInterface.SetClamp(prevClamp); GLInterface.SetClamp(prevClamp);
//------------ //------------
GLInterface.SetCull(Cull_None); GLInterface.SetCull(Cull_None);

1
source/glbackend/glbackend.cpp
View file

@ -225,7 +225,6 @@ static GLint primtypes[] =
GL_TRIANGLES, GL_TRIANGLES,
GL_TRIANGLE_STRIP, GL_TRIANGLE_STRIP,
GL_TRIANGLE_FAN, GL_TRIANGLE_FAN,
GL_QUADS,
GL_LINES GL_LINES
}; };

1
source/glbackend/glbackend.h
View file

@ -128,7 +128,6 @@ enum EDrawType
DT_TRIANGLES, DT_TRIANGLES,
DT_TRIANGLE_STRIP, DT_TRIANGLE_STRIP,
DT_TRIANGLE_FAN, DT_TRIANGLE_FAN,
DT_QUADS,
DT_LINES DT_LINES
}; };