zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 19:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

I have the fire... I have the force... I have the power to make my evil take its course (it's not like anyone will read this anyway). In other news, sprites are done.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@667 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2008-03-30 11:16:21 +00:00
parent e9ec2f5f70
commit e2db8921e2
1 changed files with 105 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -211,8 +211,14 @@ void polymer_drawrooms(int daposx, int daposy, int daposz, short
updatesectors = 0; updatesectors = 0;
} }
cursectnum = dacursectnum;
updatesector(daposx, daposy, &cursectnum);
if ((cursectnum >= 0) && (cursectnum < numsectors))
dacursectnum = cursectnum;
// external view (editor) // external view (editor)
if (dacursectnum == -1) if ((dacursectnum < 0) || (dacursectnum >= numsectors))
{ {
i = 0; i = 0;
while (i < numsectors) while (i < numsectors)
@ -244,12 +250,6 @@ void polymer_drawrooms(int daposx, int daposy, int daposz, short
i++; i++;
} }
cursectnum = dacursectnum;
updatesector(daposx, daposy, &cursectnum);
if (cursectnum >= 0)
dacursectnum = cursectnum;
// GO // GO
front = 0; front = 0;
back = 0; back = 0;
@ -423,7 +423,7 @@ void polymer_drawsprite(int snum)
int i, j, curpicnum, glpic, xsize, ysize; int i, j, curpicnum, glpic, xsize, ysize;
spritetype *tspr; spritetype *tspr;
pthtyp* pth; pthtyp* pth;
float color[3], xratio; float color[4], xratio, ang, xref, yref;
if (pr_verbosity >= 3) OSD_Printf("PR : Sprite %i...\n", snum); if (pr_verbosity >= 3) OSD_Printf("PR : Sprite %i...\n", snum);
@ -432,6 +432,9 @@ void polymer_drawsprite(int snum)
curpicnum = tspr->picnum; curpicnum = tspr->picnum;
if (picanm[curpicnum]&192) curpicnum += animateoffs(curpicnum,tspr->owner+32768); if (picanm[curpicnum]&192) curpicnum += animateoffs(curpicnum,tspr->owner+32768);
if (!waloff[curpicnum])
loadtile(curpicnum);
pth = gltexcache(curpicnum, tspr->pal, 0); pth = gltexcache(curpicnum, tspr->pal, 0);
color[0] = color[1] = color[2] = ((float)(numpalookups-min(max(tspr->shade,0),numpalookups)))/((float)numpalookups); color[0] = color[1] = color[2] = ((float)(numpalookups-min(max(tspr->shade,0),numpalookups)))/((float)numpalookups);
@ -443,6 +446,16 @@ void polymer_drawsprite(int snum)
color[2] *= (float)hictinting[tspr->pal].b / 255.0; color[2] *= (float)hictinting[tspr->pal].b / 255.0;
} }
if (tspr->cstat & 2)
{
if (tspr->cstat & 512)
color[3] = 0.33f;
else
color[3] = 0.66f;
}
else
color[3] = 1.0f;
glpic = (pth) ? pth->glpic : 0; glpic = (pth) ? pth->glpic : 0;
if (((tspr->cstat>>4) & 3) == 0) if (((tspr->cstat>>4) & 3) == 0)
@ -459,6 +472,9 @@ void polymer_drawsprite(int snum)
spos[1] = -tspr->z; spos[1] = -tspr->z;
spos[2] = -tspr->x; spos[2] = -tspr->x;
switch ((tspr->cstat>>4) & 3)
{
case 0:
bglMatrixMode(GL_MODELVIEW); bglMatrixMode(GL_MODELVIEW);
bglPushMatrix(); bglPushMatrix();
@ -481,26 +497,77 @@ void polymer_drawsprite(int snum)
} }
bglLoadMatrixd(modelviewmatrix); bglLoadMatrixd(modelviewmatrix);
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);
break;
case 1:
bglMatrixMode(GL_MODELVIEW);
bglPushMatrix();
ang = (float)((tspr->ang + 1024) & 2047) / (2048.0f / 360.0f);
bglTranslatef(spos[0], spos[1], spos[2]);
bglRotatef(-ang, 0.0f, 1.0f, 0.0f);
break;
case 2:
bglMatrixMode(GL_MODELVIEW);
bglPushMatrix();
ang = (float)((tspr->ang + 1024) & 2047) / (2048.0f / 360.0f);
bglTranslatef(spos[0], spos[1], spos[2]);
bglRotatef(-ang, 0.0f, 1.0f, 0.0f);
ysize /= 32;
break;
}
if ((tspr->cstat & 4) || (((tspr->cstat>>4) & 3) == 2))
xref = 1.0f;
else
xref = 0.0f;
if (tspr->cstat & 8)
yref = 1.0f;
else
yref = 0.0f;
bglEnable(GL_ALPHA_TEST); bglEnable(GL_ALPHA_TEST);
bglEnable(GL_BLEND);
bglBindTexture(GL_TEXTURE_2D, glpic); bglBindTexture(GL_TEXTURE_2D, glpic);
bglColor4f(color[0], color[1], color[2], 1.0f); bglColor4f(color[0], color[1], color[2], color[3]);
bglBegin(GL_QUADS); bglBegin(GL_QUADS);
bglTexCoord2f(0.0f, 1.0f);
bglTexCoord2f(fabs(xref - 0.0f), fabs(yref - 1.0f));
if (((tspr->cstat>>4) & 3) == 2)
bglVertex3f(-xsize,0,-ysize);
else
bglVertex3f(-xsize,0,0); bglVertex3f(-xsize,0,0);
bglTexCoord2f(1.0f, 1.0f);
bglTexCoord2f(fabs(xref - 1.0f), fabs(yref - 1.0f));
if (((tspr->cstat>>4) & 3) == 2)
bglVertex3f(xsize,0,-ysize);
else
bglVertex3f(xsize,0,0); bglVertex3f(xsize,0,0);
bglTexCoord2f(1.0f, 0.0f);
bglTexCoord2f(fabs(xref - 1.0f), fabs(yref - 0.0f));
if (((tspr->cstat>>4) & 3) == 2)
bglVertex3f(xsize,0,ysize);
else
bglVertex3f(xsize,ysize,0); bglVertex3f(xsize,ysize,0);
bglTexCoord2f(0.0f, 0.0f);
bglTexCoord2f(fabs(xref - 0.0f), fabs(yref - 0.0f));
if (((tspr->cstat>>4) & 3) == 2)
bglVertex3f(-xsize,0,ysize);
else
bglVertex3f(-xsize,ysize,0); bglVertex3f(-xsize,ysize,0);
bglEnd(); bglEnd();
bglDisable(GL_BLEND);
bglDisable(GL_ALPHA_TEST); bglDisable(GL_ALPHA_TEST);
bglPopMatrix(); bglPopMatrix();
} }