zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 08:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cast light on models and self-shadowing.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1273 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-03-27 12:56:42 +00:00
parent 1d2a7c2982
commit 0cd0afa945
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/build/include/polymer.h
View file

@ -80,6 +80,8 @@ typedef struct s_prmaterial {
GLuint mirrormap; GLuint mirrormap;
// PR_BIT_DIFFUSE_GLOW_MAP // PR_BIT_DIFFUSE_GLOW_MAP
GLuint glowmap; GLuint glowmap;
// PR_BIT_SHADOW_MAP
GLboolean mdspritespace;
} _prmaterial; } _prmaterial;
typedef struct s_prrograminfo { typedef struct s_prrograminfo {

23
polymer/eduke32/build/src/polymer.c
View file

@ -2690,7 +2690,6 @@ static void polymer_drawmdsprite(spritetype *tspr)
float sradius, lradius; float sradius, lradius;
char modellights[PR_MAXLIGHTS]; char modellights[PR_MAXLIGHTS];
char modellightcount; char modellightcount;
int32_t oldoverridematerial;
m = (md3model_t*)models[tile2model[Ptile2tile(tspr->picnum,sprite[tspr->owner].pal)].modelid]; m = (md3model_t*)models[tile2model[Ptile2tile(tspr->picnum,sprite[tspr->owner].pal)].modelid];
updateanimation((md2model_t *)m,tspr); updateanimation((md2model_t *)m,tspr);
@ -2708,11 +2707,9 @@ static void polymer_drawmdsprite(spritetype *tspr)
if (((tspr->cstat>>4) & 3) == 2) if (((tspr->cstat>>4) & 3) == 2)
ang -= 90.0f; ang -= 90.0f;
oldoverridematerial = overridematerial;
overridematerial &= ~prprogrambits[PR_BIT_SHADOW_MAP].bit;
bglMatrixMode(GL_MODELVIEW); bglMatrixMode(GL_MODELVIEW);
bglPushMatrix(); bglPushMatrix();
bglLoadIdentity();
scale = (1.0/4.0); scale = (1.0/4.0);
scale *= m->scale; scale *= m->scale;
scale *= m->bscale; scale *= m->bscale;
@ -2743,6 +2740,9 @@ static void polymer_drawmdsprite(spritetype *tspr)
bglTranslatef(0.0f, 0.0, m->zadd * 64); bglTranslatef(0.0f, 0.0, m->zadd * 64);
bglGetFloatv(GL_MODELVIEW_MATRIX, spritemodelview); bglGetFloatv(GL_MODELVIEW_MATRIX, spritemodelview);
bglPopMatrix();
bglPushMatrix();
bglMultMatrixf(spritemodelview);
// debug code for drawing the model bounding sphere // debug code for drawing the model bounding sphere
// bglDisable(GL_TEXTURE_2D); // bglDisable(GL_TEXTURE_2D);
@ -2807,6 +2807,8 @@ static void polymer_drawmdsprite(spritetype *tspr)
if (pr_gpusmoothing) if (pr_gpusmoothing)
mdspritematerial.frameprogress = m->interpol; mdspritematerial.frameprogress = m->interpol;
mdspritematerial.mdspritespace = GL_TRUE;
modellightcount = 0; modellightcount = 0;
// light culling // light culling
@ -2826,6 +2828,7 @@ static void polymer_drawmdsprite(spritetype *tspr)
(m->head.frames[m->nframe].cen.z * m->interpol); (m->head.frames[m->nframe].cen.z * m->interpol);
polymer_transformpoint(spos, tspos, spritemodelview); polymer_transformpoint(spos, tspos, spritemodelview);
polymer_transformpoint(tspos, spos, rootmodelviewmatrix);
i = 0; i = 0;
while (i < lightcount) while (i < lightcount)
@ -2838,11 +2841,11 @@ static void polymer_drawmdsprite(spritetype *tspr)
polymer_transformpoint(lpos, tlpos, rootmodelviewmatrix); polymer_transformpoint(lpos, tlpos, rootmodelviewmatrix);
vec[0] = tlpos[0] - tspos[0]; vec[0] = tlpos[0] - spos[0];
vec[0] *= vec[0]; vec[0] *= vec[0];
vec[1] = tlpos[1] - tspos[1]; vec[1] = tlpos[1] - spos[1];
vec[1] *= vec[1]; vec[1] *= vec[1];
vec[2] = tlpos[2] - tspos[2]; vec[2] = tlpos[2] - spos[2];
vec[2] *= vec[2]; vec[2] *= vec[2];
if ((vec[0] + vec[1] + vec[2]) <= if ((vec[0] + vec[1] + vec[2]) <=
@ -2965,8 +2968,6 @@ static void polymer_drawmdsprite(spritetype *tspr)
bglPopMatrix(); bglPopMatrix();
overridematerial = oldoverridematerial;
globalnoeffect=0; globalnoeffect=0;
} }
@ -3031,6 +3032,8 @@ static void polymer_getscratchmaterial(_prmaterial* material)
material->mirrormap = 0; material->mirrormap = 0;
// PR_BIT_DIFFUSE_GLOW_MAP // PR_BIT_DIFFUSE_GLOW_MAP
material->glowmap = 0; material->glowmap = 0;
// PR_BIT_SHADOW_MAP
material->mdspritespace = GL_FALSE;
} }
static void polymer_getbuildmaterial(_prmaterial* material, int16_t tilenum, char pal, int8_t shade) static void polymer_getbuildmaterial(_prmaterial* material, int16_t tilenum, char pal, int8_t shade)
@ -3324,6 +3327,8 @@ static int32_t polymer_bindmaterial(_prmaterial material, char* lights, int
bglLoadMatrixf(shadowBias); bglLoadMatrixf(shadowBias);
bglMultMatrixf(prlights[lights[curlight]].proj); bglMultMatrixf(prlights[lights[curlight]].proj);
bglMultMatrixf(prlights[lights[curlight]].transform); bglMultMatrixf(prlights[lights[curlight]].transform);
if (material.mdspritespace == GL_TRUE)
bglMultMatrixf(spritemodelview);
bglGetFloatv(GL_TEXTURE_MATRIX, matrix); bglGetFloatv(GL_TEXTURE_MATRIX, matrix);
bglLoadIdentity(); bglLoadIdentity();
bglMatrixMode(GL_MODELVIEW); bglMatrixMode(GL_MODELVIEW);