zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Even less flickering.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@670 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2008-03-30 14:22:03 +00:00
parent f01a8f5b2b
commit d576ee5c40
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
polymer/build/include/polymer.h
View file

@ -69,6 +69,9 @@ typedef struct s_prsector {
GLushort* ceilindices; GLushort* ceilindices;
short curindice; short curindice;
int indicescount; int indicescount;
// stuff
float wallsproffset;
float floorsproffset;
char controlstate; // bit 1: up-to-date, bit 2: geometry invalidated char controlstate; // bit 1: up-to-date, bit 2: geometry invalidated
char drawingstate; // 0: fcuk, 1: in queue, 2: todraw, 3: drawn char drawingstate; // 0: fcuk, 1: in queue, 2: todraw, 3: drawn

28
polymer/build/src/polymer.c
View file

@ -241,6 +241,8 @@ void polymer_drawrooms(int daposx, int daposy, int daposz, short
while (i < numsectors) while (i < numsectors)
{ {
prsectors[i]->drawingstate = 0; prsectors[i]->drawingstate = 0;
prsectors[i]->wallsproffset = 0.0f;
prsectors[i]->floorsproffset = 0.0f;
i++; i++;
} }
i = 0; i = 0;
@ -391,10 +393,18 @@ void polymer_drawrooms(int daposx, int daposy, int daposz, short
void polymer_drawmasks(void) void polymer_drawmasks(void)
{ {
bglEnable(GL_ALPHA_TEST);
bglEnable(GL_BLEND);
bglEnable(GL_POLYGON_OFFSET_FILL);
while (spritesortcnt) while (spritesortcnt)
{ {
polymer_drawsprite(--spritesortcnt); polymer_drawsprite(--spritesortcnt);
} }
bglDisable(GL_POLYGON_OFFSET_FILL);
bglDisable(GL_BLEND);
bglDisable(GL_ALPHA_TEST);
} }
void polymer_rotatesprite(int sx, int sy, int z, short a, short picnum, signed char dashade, char dapalnum, char dastat, int cx1, int cy1, int cx2, int cy2) void polymer_rotatesprite(int sx, int sy, int z, short a, short picnum, signed char dashade, char dapalnum, char dastat, int cx1, int cy1, int cx2, int cy2)
@ -499,6 +509,7 @@ void polymer_drawsprite(int snum)
bglLoadMatrixd(modelviewmatrix); bglLoadMatrixd(modelviewmatrix);
bglRotatef((gtang * 90.0f), 0.0f, 0.0f, -1.0f); bglRotatef((gtang * 90.0f), 0.0f, 0.0f, -1.0f);
bglScalef(1.0f / 1000.0f, 1.0f / 16000.0f, 1.0f / 1000.0f); bglScalef(1.0f / 1000.0f, 1.0f / 16000.0f, 1.0f / 1000.0f);
bglPolygonOffset(0.0f, 0.0f);
break; break;
case 1: case 1:
bglMatrixMode(GL_MODELVIEW); bglMatrixMode(GL_MODELVIEW);
@ -508,6 +519,10 @@ void polymer_drawsprite(int snum)
bglTranslatef(spos[0], spos[1], spos[2]); bglTranslatef(spos[0], spos[1], spos[2]);
bglRotatef(-ang, 0.0f, 1.0f, 0.0f); bglRotatef(-ang, 0.0f, 1.0f, 0.0f);
prsectors[tspr->sectnum]->wallsproffset += 0.5f;
bglPolygonOffset(-prsectors[tspr->sectnum]->wallsproffset,
-prsectors[tspr->sectnum]->wallsproffset);
break; break;
case 2: case 2:
bglMatrixMode(GL_MODELVIEW); bglMatrixMode(GL_MODELVIEW);
@ -519,6 +534,10 @@ void polymer_drawsprite(int snum)
bglRotatef(-ang, 0.0f, 1.0f, 0.0f); bglRotatef(-ang, 0.0f, 1.0f, 0.0f);
ysize /= 32; ysize /= 32;
prsectors[tspr->sectnum]->floorsproffset += 0.5f;
bglPolygonOffset(-prsectors[tspr->sectnum]->floorsproffset,
-prsectors[tspr->sectnum]->floorsproffset);
break; break;
} }
@ -532,8 +551,6 @@ void polymer_drawsprite(int snum)
else else
yref = 0.0f; yref = 0.0f;
bglEnable(GL_ALPHA_TEST);
bglEnable(GL_BLEND);
bglBindTexture(GL_TEXTURE_2D, glpic); bglBindTexture(GL_TEXTURE_2D, glpic);
bglColor4f(color[0], color[1], color[2], color[3]); bglColor4f(color[0], color[1], color[2], color[3]);
@ -565,9 +582,6 @@ void polymer_drawsprite(int snum)
bglEnd(); bglEnd();
bglDisable(GL_BLEND);
bglDisable(GL_ALPHA_TEST);
bglPopMatrix(); bglPopMatrix();
} }
@ -1320,7 +1334,7 @@ int polymer_portalinfrustum(short wallnum)
w = prwalls[wallnum]; w = prwalls[wallnum];
i = 0; i = 0;
while (i < 5) while (i < 4)
{ {
j = k = 0; j = k = 0;
while (j < 4) while (j < 4)