1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-10-31 19:36:16 +00:00

some fixes

This commit is contained in:
Zeno Rogue 2018-09-04 23:50:50 +02:00
parent 78fc8e04b0
commit f9d0a90ac9
2 changed files with 7 additions and 2 deletions

View File

@ -402,6 +402,10 @@ void init_glfont(int size) {
SDL_Color white; SDL_Color white;
white.r = white.g = white.b = 255; white.r = white.g = white.b = 255;
#endif #endif
#if CAP_TABFONT
resetTabFont();
#endif
// glListBase(0); // glListBase(0);
@ -436,7 +440,6 @@ void init_glfont(int size) {
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR); glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
printf("for size %d, texture height is %d\n", size, cury + theight);
theight = next_p2(cury + theight); theight = next_p2(cury + theight);
glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, FONTTEXTURESIZE, theight, 0, glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, FONTTEXTURESIZE, theight, 0,

View File

@ -1126,7 +1126,9 @@ bool drawVertex(const transmatrix &V, cell *c, shmup::monster *m) {
} }
if(hilite || hiliteclick) alpha = (alpha + 256) / 2; if(hilite || hiliteclick) alpha = (alpha + 256) / 2;
if(svg::in && alpha < 16) continue; if((svg::in || ISWEB) && alpha < 16) continue;
if(ISWEB) alpha |= 15;
transmatrix gm1 = transmatrix gm1 =
multidraw ? V * memo_relative_matrix(vd1.m->base, c) : multidraw ? V * memo_relative_matrix(vd1.m->base, c) :