mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-05-06 17:24:06 +00:00
Code Issues Releases Wiki Activity

fixed VARCOLOR without shaders

Browse Source
This commit is contained in:
Zeno Rogue 2018-03-02 13:08:14 +01:00
parent 68423425ef
commit 7f9aaccc3c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shaders.cpp
View File

@ -35,10 +35,7 @@ static const flagtype GF_TEXTURE = 1;
static const flagtype GF_VARCOLOR = 2; static const flagtype GF_VARCOLOR = 2;
static const flagtype GF_LIGHTFOG = 4; static const flagtype GF_LIGHTFOG = 4;
flagtype flags[gmMAX] = { 0, GF_TEXTURE, GF_VARCOLOR, GF_TEXTURE | GF_LIGHTFOG flagtype flags[gmMAX] = { 0, GF_TEXTURE, GF_VARCOLOR, GF_TEXTURE | GF_LIGHTFOG | GF_VARCOLOR
#if CAP_SHADER
| GF_VARCOLOR
#endif
}; };
eMode mode; eMode mode;
@ -407,6 +404,7 @@ void switch_mode(eMode m) {
if(oldflags & GF_LIGHTFOG) { if(oldflags & GF_LIGHTFOG) {
#if !CAP_SHADER #if !CAP_SHADER
glDisable(GL_FOG); glDisable(GL_FOG);
/* /*
glDisable(GL_LIGHTING); */ glDisable(GL_LIGHTING); */
#endif #endif
@ -652,7 +650,7 @@ void prepare(vector<ct_vertex>& v) {
#else #else
glVertexPointer(3, GL_FLOAT, sizeof(ct_vertex), &v[0].coords); glVertexPointer(3, GL_FLOAT, sizeof(ct_vertex), &v[0].coords);
glTexCoordPointer(3, GL_FLOAT, sizeof(ct_vertex), &v[0].texture); glTexCoordPointer(3, GL_FLOAT, sizeof(ct_vertex), &v[0].texture);
glColorPointer(3, GL_FLOAT, sizeof(ct_vertex), &v[0].color); glColorPointer(4, GL_FLOAT, sizeof(ct_vertex), &v[0].color);
#endif #endif
#endif #endif
} }