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

Sanitize terminology a bit.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1277 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-03-28 11:43:16 +00:00
parent 2742f17290
commit df26ab3c7d
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,8 +52,8 @@ typedef enum {
PR_BIT_DIFFUSE_MAP,
PR_BIT_DIFFUSE_DETAIL_MAP,
PR_BIT_DIFFUSE_MODULATION,
PR_BIT_DIFFUSE_MIRROR_MAP,
PR_BIT_DIFFUSE_GLOW_MAP,
PR_BIT_MIRROR_MAP,
PR_BIT_GLOW_MAP,
PR_BIT_SHADOW_MAP,
PR_BIT_SPOT_LIGHT,
PR_BIT_POINT_LIGHT,
@ -76,9 +76,9 @@ typedef struct s_prmaterial {
GLfloat detailscale[2];
// PR_BIT_DIFFUSE_MODULATION
GLfloat diffusemodulation[4];
// PR_BIT_DIFFUSE_MIRROR_MAP
// PR_BIT_MIRROR_MAP
GLuint mirrormap;
// PR_BIT_DIFFUSE_GLOW_MAP
// PR_BIT_GLOW_MAP
GLuint glowmap;
// PR_BIT_SHADOW_MAP
GLboolean mdspritespace;
@ -101,9 +101,9 @@ typedef struct s_prrograminfo {
// PR_BIT_DIFFUSE_DETAIL_MAP
GLint uniform_detailMap;
GLint uniform_detailScale;
// PR_BIT_DIFFUSE_MIRROR_MAP
// PR_BIT_MIRROR_MAP
GLint uniform_mirrorMap;
// PR_BIT_DIFFUSE_GLOW_MAP
// PR_BIT_GLOW_MAP
GLint uniform_glowMap;
// PR_BIT_SHADOW_MAP
GLint uniform_shadowMap;

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

@ -260,7 +260,7 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
"\n",
},
{
1 << PR_BIT_DIFFUSE_MIRROR_MAP,
1 << PR_BIT_MIRROR_MAP,
// vert_def
"",
// vert_prog
@ -281,7 +281,7 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
"\n",
},
{
1 << PR_BIT_DIFFUSE_GLOW_MAP,
1 << PR_BIT_GLOW_MAP,
// vert_def
"",
// vert_prog
@ -1096,7 +1096,7 @@ static void polymer_displayrooms(int16_t dacursectnum)
if (wall[sec->wallptr + i].cstat & 48)
localmaskwall[localmaskwallcnt++] = sec->wallptr + i;
if (!depth && (overridematerial & prprogrambits[PR_BIT_DIFFUSE_MIRROR_MAP].bit) &&
if (!depth && (overridematerial & prprogrambits[PR_BIT_MIRROR_MAP].bit) &&
wall[sec->wallptr + i].overpicnum == 560 &&
wall[sec->wallptr + i].cstat & 64)
{
@ -3037,9 +3037,9 @@ static void polymer_getscratchmaterial(_prmaterial* material)
material->diffusemodulation[1] =
material->diffusemodulation[2] =
material->diffusemodulation[3] = 1.0f;
// PR_BIT_DIFFUSE_MIRROR_MAP
// PR_BIT_MIRROR_MAP
material->mirrormap = 0;
// PR_BIT_DIFFUSE_GLOW_MAP
// PR_BIT_GLOW_MAP
material->glowmap = 0;
// PR_BIT_SHADOW_MAP
material->mdspritespace = GL_FALSE;
@ -3114,7 +3114,7 @@ static void polymer_getbuildmaterial(_prmaterial* material, int16_t tile
material->diffusemodulation[2] *= (float)hictinting[pal].b / 255.0;
}
// PR_BIT_DIFFUSE_GLOW_MAP
// PR_BIT_GLOW_MAP
if (r_fullbrights && pth && pth->flags & 16)
material->glowmap = pth->ofb->glpic;
@ -3160,13 +3160,13 @@ static int32_t polymer_bindmaterial(_prmaterial material, char* lights, int
// PR_BIT_DIFFUSE_MODULATION
programbits |= prprogrambits[PR_BIT_DIFFUSE_MODULATION].bit;
// PR_BIT_DIFFUSE_MIRROR_MAP
// PR_BIT_MIRROR_MAP
if (!curlight && material.mirrormap)
programbits |= prprogrambits[PR_BIT_DIFFUSE_MIRROR_MAP].bit;
programbits |= prprogrambits[PR_BIT_MIRROR_MAP].bit;
// PR_BIT_DIFFUSE_GLOW_MAP
// PR_BIT_GLOW_MAP
if (!curlight && material.glowmap)
programbits |= prprogrambits[PR_BIT_DIFFUSE_GLOW_MAP].bit;
programbits |= prprogrambits[PR_BIT_GLOW_MAP].bit;
// PR_BIT_POINT_LIGHT
if (lightcount) {
@ -3264,8 +3264,8 @@ static int32_t polymer_bindmaterial(_prmaterial material, char* lights, int
material.diffusemodulation[3]);
}
// PR_BIT_DIFFUSE_MIRROR_MAP
if (programbits & prprogrambits[PR_BIT_DIFFUSE_MIRROR_MAP].bit)
// PR_BIT_MIRROR_MAP
if (programbits & prprogrambits[PR_BIT_MIRROR_MAP].bit)
{
bglActiveTextureARB(texunit + GL_TEXTURE0_ARB);
bglBindTexture(GL_TEXTURE_RECTANGLE, material.mirrormap);
@ -3275,8 +3275,8 @@ static int32_t polymer_bindmaterial(_prmaterial material, char* lights, int
texunit++;
}
// PR_BIT_DIFFUSE_GLOW_MAP
if (programbits & prprogrambits[PR_BIT_DIFFUSE_GLOW_MAP].bit)
// PR_BIT_GLOW_MAP
if (programbits & prprogrambits[PR_BIT_GLOW_MAP].bit)
{
bglActiveTextureARB(texunit + GL_TEXTURE0_ARB);
bglBindTexture(GL_TEXTURE_2D, material.glowmap);
@ -3496,14 +3496,14 @@ static void polymer_compileprogram(int32_t programbits)
prprograms[programbits].uniform_detailScale = bglGetUniformLocationARB(program, "detailScale");
}
// PR_BIT_DIFFUSE_MIRROR_MAP
if (programbits & prprogrambits[PR_BIT_DIFFUSE_MIRROR_MAP].bit)
// PR_BIT_MIRROR_MAP
if (programbits & prprogrambits[PR_BIT_MIRROR_MAP].bit)
{
prprograms[programbits].uniform_mirrorMap = bglGetUniformLocationARB(program, "mirrorMap");
}
// PR_BIT_DIFFUSE_GLOW_MAP
if (programbits & prprogrambits[PR_BIT_DIFFUSE_GLOW_MAP].bit)
// PR_BIT_GLOW_MAP
if (programbits & prprogrambits[PR_BIT_GLOW_MAP].bit)
{
prprograms[programbits].uniform_glowMap = bglGetUniformLocationARB(program, "glowMap");
}