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

Reorganize a little code so that lightmaps can be used when a spotlight isn't currently casting a shadow. This fixes the problem where the window lights in the E1L1 apartment secret would jump between square and circle-shaped depending on the shadowcount and the view angle.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1674 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2010-07-25 02:16:22 +00:00
parent 8a3dd08b14
commit abbe41e97d
2 changed files with 166 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,7 @@ typedef enum {
PR_BIT_MIRROR_MAP, PR_BIT_MIRROR_MAP,
PR_BIT_FOG, PR_BIT_FOG,
PR_BIT_GLOW_MAP, PR_BIT_GLOW_MAP,
PR_BIT_PROJECTION_MAP,
PR_BIT_SHADOW_MAP, PR_BIT_SHADOW_MAP,
PR_BIT_LIGHT_MAP, PR_BIT_LIGHT_MAP,
PR_BIT_SPOT_LIGHT, PR_BIT_SPOT_LIGHT,
@ -137,9 +138,10 @@ typedef struct s_prrograminfo {
GLint uniform_mirrorMap; GLint uniform_mirrorMap;
// PR_BIT_GLOW_MAP // PR_BIT_GLOW_MAP
GLint uniform_glowMap; GLint uniform_glowMap;
// PR_BIT_PROJECTION_MAP
GLint uniform_shadowProjMatrix;
// PR_BIT_SHADOW_MAP // PR_BIT_SHADOW_MAP
GLint uniform_shadowMap; GLint uniform_shadowMap;
GLint uniform_shadowProjMatrix;
// PR_BIT_LIGHT_MAP // PR_BIT_LIGHT_MAP
GLint uniform_lightMap; GLint uniform_lightMap;
// PR_BIT_SPOT_LIGHT // PR_BIT_SPOT_LIGHT

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

@ -380,7 +380,7 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
"\n", "\n",
}, },
{ {
1 << PR_BIT_SHADOW_MAP, 1 << PR_BIT_PROJECTION_MAP,
// vert_def // vert_def
"uniform mat4 shadowProjMatrix;\n" "uniform mat4 shadowProjMatrix;\n"
"\n", "\n",
@ -388,6 +388,17 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
" gl_TexCoord[2] = shadowProjMatrix * curVertex;\n" " gl_TexCoord[2] = shadowProjMatrix * curVertex;\n"
"\n", "\n",
// frag_def // frag_def
"",
// frag_prog
"",
},
{
1 << PR_BIT_SHADOW_MAP,
// vert_def
"",
// vert_prog
"",
// frag_def
"uniform sampler2DShadow shadowMap;\n" "uniform sampler2DShadow shadowMap;\n"
"\n", "\n",
// frag_prog // frag_prog
@ -3785,7 +3796,7 @@ static void polymer_getscratchmaterial(_prmaterial* material)
material->mirrormap = 0; material->mirrormap = 0;
// PR_BIT_GLOW_MAP // PR_BIT_GLOW_MAP
material->glowmap = 0; material->glowmap = 0;
// PR_BIT_SHADOW_MAP // PR_BIT_PROJECTION_MAP
material->mdspritespace = GL_FALSE; material->mdspritespace = GL_FALSE;
} }
@ -3934,9 +3945,12 @@ static int32_t polymer_bindmaterial(_prmaterial material, int16_t* lights,
// PR_BIT_SHADOW_MAP // PR_BIT_SHADOW_MAP
if (prlights[lights[curlight]].rtindex != -1) { if (prlights[lights[curlight]].rtindex != -1) {
programbits |= prprogrambits[PR_BIT_SHADOW_MAP].bit; programbits |= prprogrambits[PR_BIT_SHADOW_MAP].bit;
programbits |= prprogrambits[PR_BIT_PROJECTION_MAP].bit;
}
// PR_BIT_LIGHT_MAP // PR_BIT_LIGHT_MAP
if (prlights[lights[curlight]].lightmap) if (prlights[lights[curlight]].lightmap) {
programbits |= prprogrambits[PR_BIT_LIGHT_MAP].bit; programbits |= prprogrambits[PR_BIT_LIGHT_MAP].bit;
programbits |= prprogrambits[PR_BIT_PROJECTION_MAP].bit;
} }
} }
} }
@ -4163,8 +4177,8 @@ static int32_t polymer_bindmaterial(_prmaterial material, int16_t* lights,
bglUniform3fvARB(prprograms[programbits].uniform_spotDir, 1, dir); bglUniform3fvARB(prprograms[programbits].uniform_spotDir, 1, dir);
bglUniform2fvARB(prprograms[programbits].uniform_spotRadius, 1, indir); bglUniform2fvARB(prprograms[programbits].uniform_spotRadius, 1, indir);
// PR_BIT_SHADOW_MAP // PR_BIT_PROJECTION_MAP
if (programbits & prprogrambits[PR_BIT_SHADOW_MAP].bit) if (programbits & prprogrambits[PR_BIT_PROJECTION_MAP].bit)
{ {
GLfloat matrix[16]; GLfloat matrix[16];
@ -4178,13 +4192,18 @@ static int32_t polymer_bindmaterial(_prmaterial material, int16_t* lights,
bglLoadIdentity(); bglLoadIdentity();
bglMatrixMode(GL_MODELVIEW); bglMatrixMode(GL_MODELVIEW);
bglUniformMatrix4fvARB(prprograms[programbits].uniform_shadowProjMatrix, 1, GL_FALSE, matrix);
// PR_BIT_SHADOW_MAP
if (programbits & prprogrambits[PR_BIT_SHADOW_MAP].bit)
{
bglActiveTextureARB(texunit + GL_TEXTURE0_ARB); bglActiveTextureARB(texunit + GL_TEXTURE0_ARB);
bglBindTexture(prrts[prlights[lights[curlight]].rtindex].target, prrts[prlights[lights[curlight]].rtindex].z); bglBindTexture(prrts[prlights[lights[curlight]].rtindex].target, prrts[prlights[lights[curlight]].rtindex].z);
bglUniform1iARB(prprograms[programbits].uniform_shadowMap, texunit); bglUniform1iARB(prprograms[programbits].uniform_shadowMap, texunit);
bglUniformMatrix4fvARB(prprograms[programbits].uniform_shadowProjMatrix, 1, GL_FALSE, matrix);
texunit++; texunit++;
}
// PR_BIT_LIGHT_MAP // PR_BIT_LIGHT_MAP
if (programbits & prprogrambits[PR_BIT_LIGHT_MAP].bit) if (programbits & prprogrambits[PR_BIT_LIGHT_MAP].bit)
@ -4388,11 +4407,16 @@ static void polymer_compileprogram(int32_t programbits)
prprograms[programbits].uniform_glowMap = bglGetUniformLocationARB(program, "glowMap"); prprograms[programbits].uniform_glowMap = bglGetUniformLocationARB(program, "glowMap");
} }
// PR_BIT_PROJECTION_MAP
if (programbits & prprogrambits[PR_BIT_PROJECTION_MAP].bit)
{
prprograms[programbits].uniform_shadowProjMatrix = bglGetUniformLocationARB(program, "shadowProjMatrix");
}
// PR_BIT_SHADOW_MAP // PR_BIT_SHADOW_MAP
if (programbits & prprogrambits[PR_BIT_SHADOW_MAP].bit) if (programbits & prprogrambits[PR_BIT_SHADOW_MAP].bit)
{ {
prprograms[programbits].uniform_shadowMap = bglGetUniformLocationARB(program, "shadowMap"); prprograms[programbits].uniform_shadowMap = bglGetUniformLocationARB(program, "shadowMap");
prprograms[programbits].uniform_shadowProjMatrix = bglGetUniformLocationARB(program, "shadowProjMatrix");
} }
// PR_BIT_LIGHT_MAP // PR_BIT_LIGHT_MAP