tenebrae/tenebrae2
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed redundant code

Browse source
This commit is contained in:
jpaana 2004-04-22 22:10:48 +00:00
parent 4b58596d00
commit f5802b705a
5 changed files with 17 additions and 339 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
gl_bumpgeneric.c
View file

@ -157,69 +157,6 @@ void GL_DisableGenericDiffuseShader (void)
}
/************************
Shader utility routines
*************************/
void Generic_SetupTcMod(tcmod_t *tc)
{
switch (tc->type)
{
case TCMOD_ROTATE:
glTranslatef(0.5,0.5,0.0);
glRotatef(realtime * tc->params[0],0,0,1);
glTranslatef(-0.5, -0.5, 0.0);
break;
case TCMOD_SCROLL:
glTranslatef(realtime * tc->params[0], realtime * tc->params[1], 0.0);
break;
case TCMOD_SCALE:
glScalef(tc->params[0],tc->params[1],1.0);
break;
case TCMOD_STRETCH:
//PENTA: fixme
glScalef(1.0, 1.0, 1.0);
break;
}
}
void Generic_SetupSimpleStage(stage_t *s)
{
tcmod_t *tc;
int i;
if (s->type != STAGE_SIMPLE)
{
Con_Printf("Non simple stage, in simple stage list");
return;
}
glMatrixMode(GL_TEXTURE);
glPushMatrix();
for (i=0; i<s->numtcmods; i++)
{
Generic_SetupTcMod(&s->tcmods[i]);
}
if (s->src_blend > -1)
{
glBlendFunc(s->src_blend, s->dst_blend);
glEnable(GL_BLEND);
}
if (s->alphatresh > 0)
{
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, s->alphatresh);
}
if ((s->numtextures > 0) && (s->texture[0]))
GL_BindAdvanced(s->texture[0]);
}
/************************

62
gl_bumpgf.c
View file

@ -90,7 +90,7 @@ void GL_EnableDiffuseShaderGF3(const transform_t *tr, const lightobject_t *lo, i
1.0f/(currentshadowlight->radiusv[2]));
}
GF3_SetupTcMods(&currentshadowlight->shader->stages[stageIndex]);
SH_SetupTcMods(&currentshadowlight->shader->stages[stageIndex]);
GL_SetupCubeMapMatrix(tr);
} else {
glEnable(GL_TEXTURE_3D);
@ -254,7 +254,7 @@ void GL_EnableSpecularShaderGF3(const transform_t *tr, const lightobject_t *lo,
1.0f/(currentshadowlight->radiusv[1]),
1.0f/(currentshadowlight->radiusv[2]));
}
GF3_SetupTcMods(&currentshadowlight->shader->stages[stageIndex]);
SH_SetupTcMods(&currentshadowlight->shader->stages[stageIndex]);
GL_SetupCubeMapMatrix(tr);
} else {
glEnable(GL_TEXTURE_3D);
@ -450,60 +450,6 @@ Shader utitlity routines
void FormatError(void); // in gl_bumparb.c
void GF3_SetupTcMod(tcmod_t *tc) {
switch (tc->type) {
case TCMOD_ROTATE:
glTranslatef(0.5,0.5,0.0);
glRotatef(realtime * tc->params[0],0,0,1);
glTranslatef(-0.5, -0.5, 0.0);
break;
case TCMOD_SCROLL:
glTranslatef(realtime * tc->params[0], realtime * tc->params[1], 0.0);
break;
case TCMOD_SCALE:
glScalef(tc->params[0],tc->params[1],1.0);
break;
case TCMOD_STRETCH:
//PENTA: fixme
glScalef(1.0, 1.0, 1.0);
break;
}
}
void GF3_SetupTcMods(stage_t *s) {
int i;
for (i=0; i<s->numtcmods; i++) {
GF3_SetupTcMod(&s->tcmods[i]);
}
}
void GF3_SetupSimpleStage(stage_t *s) {
if (s->type != STAGE_SIMPLE) {
Con_Printf("Non simple stage, in simple stage list");
return;
}
glMatrixMode(GL_TEXTURE);
glPushMatrix();
GF3_SetupTcMods(s);
if (s->src_blend > -1) {
glBlendFunc(s->src_blend, s->dst_blend);
glEnable(GL_BLEND);
}
if (s->alphatresh > 0) {
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, s->alphatresh);
}
if ((s->numtextures > 0) && (s->texture[0]))
GL_BindAdvanced(s->texture[0]);
}
/************************
@ -642,7 +588,7 @@ void GF3_drawTriangleListBase (vertexdef_t *verts, int *indecies, int numIndecie
glColor3ub(255,255,255);
for (i=0; i<shader->numstages; i++) {
GF3_SetupSimpleStage(&shader->stages[i]);
SH_SetupSimpleStage(&shader->stages[i]);
glDrawElements(GL_TRIANGLES,numIndecies,GL_UNSIGNED_INT,indecies);
glPopMatrix();
}
@ -1073,7 +1019,7 @@ void GF3_drawSurfaceListBase (vertexdef_t *verts, msurface_t **surfs, int numSur
GL_SelectTexture(GL_TEXTURE0_ARB);
for (i=0; i<shader->numstages; i++) {
GF3_SetupSimpleStage(&shader->stages[i]);
SH_SetupSimpleStage(&shader->stages[i]);
GF3_sendSurfacesBase(surfs, numSurfaces, false);
glPopMatrix();
}

79
gl_bumpgl2.c
View file

@ -640,7 +640,7 @@ void GL2_EnableBumpShader(const transform_t *tr, const lightobject_t *lo,
if (currentshadowlight->shader->stages[0].texture[0]->gltype == GL_TEXTURE_CUBE_MAP_ARB)
{
GL2_SetupTcMods(&currentshadowlight->shader->stages[0]);
SH_SetupTcMods(&currentshadowlight->shader->stages[0]);
GL_SetupCubeMapMatrix(tr);
glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, currentshadowlight->shader->stages[0].texture[0]->texnum);
@ -670,7 +670,7 @@ void GL2_EnableBumpShader(const transform_t *tr, const lightobject_t *lo,
glScalef(1.0f/(currentshadowlight->radiusv[0]),
1.0f/(currentshadowlight->radiusv[1]),
1.0f/(currentshadowlight->radiusv[2]));
GL2_SetupTcMods(&currentshadowlight->shader->stages[0]);
SH_SetupTcMods(&currentshadowlight->shader->stages[0]);
GL_SetupCubeMapMatrix(tr);
if ( shader->glossstages[0].type == STAGE_GLOSS )
@ -744,77 +744,6 @@ void GL2_DisableDeluxShader(shader_t* shader)
}
/************************
Shader utility routines
*************************/
void GL2_SetupTcMod(tcmod_t *tc)
{
switch (tc->type)
{
case TCMOD_ROTATE:
glTranslatef(0.5,0.5,0.0);
glRotatef(realtime * tc->params[0],0,0,1);
glTranslatef(-0.5, -0.5, 0.0);
break;
case TCMOD_SCROLL:
glTranslatef(realtime * tc->params[0], realtime * tc->params[1], 0.0);
break;
case TCMOD_SCALE:
glScalef(tc->params[0],tc->params[1],1.0);
break;
case TCMOD_STRETCH:
//PENTA: fixme
glScalef(1.0, 1.0, 1.0);
break;
}
}
void GL2_SetupTcMods(stage_t *s)
{
int i;
for (i = 0; i < s->numtcmods; i++)
GL2_SetupTcMod(&s->tcmods[i]);
}
void GL2_SetupSimpleStage(stage_t *s)
{
tcmod_t *tc;
int i;
if (s->type != STAGE_SIMPLE)
{
Con_Printf("Non simple stage, in simple stage list");
return;
}
glMatrixMode(GL_TEXTURE);
glPushMatrix();
for (i=0; i<s->numtcmods; i++)
{
GL2_SetupTcMod(&s->tcmods[i]);
}
if (s->src_blend > -1)
{
glBlendFunc(s->src_blend, s->dst_blend);
glEnable(GL_BLEND);
}
if (s->alphatresh > 0)
{
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, s->alphatresh);
}
if ((s->numtextures > 0) && (s->texture[0]))
GL_BindAdvanced(s->texture[0]);
}
/************************
Generic triangle list routines
@ -907,7 +836,7 @@ void GL2_drawTriangleListBase (vertexdef_t *verts, int *indecies,
for ( i = 0; i < shader->numstages; i++)
{
GL2_SetupSimpleStage(&shader->stages[i]);
SH_SetupSimpleStage(&shader->stages[i]);
glDrawElements(GL_TRIANGLES,numIndecies,GL_UNSIGNED_INT,indecies);
glPopMatrix();
}
@ -1254,7 +1183,7 @@ void GL2_drawSurfaceListBase (vertexdef_t* verts, msurface_t** surfs,
for (i = 0; i < shader->numstages; i++)
{
GL2_SetupSimpleStage(&shader->stages[i]);
SH_SetupSimpleStage(&shader->stages[i]);
GL2_sendSurfacesBase(surfs, numSurfaces, false);
glPopMatrix();
}

67
gl_bumpparhelia.c
View file

@ -1093,69 +1093,6 @@ void Parhelia_DisableAttentShader()
}
/************************
Shader utility routines
*************************/
void Parhelia_SetupTcMod(tcmod_t *tc)
{
switch (tc->type)
{
case TCMOD_ROTATE:
glTranslatef(0.5,0.5,0.0);
glRotatef(realtime * tc->params[0],0,0,1);
glTranslatef(-0.5, -0.5, 0.0);
break;
case TCMOD_SCROLL:
glTranslatef(realtime * tc->params[0], realtime * tc->params[1], 0.0);
break;
case TCMOD_SCALE:
glScalef(tc->params[0],tc->params[1],1.0);
break;
case TCMOD_STRETCH:
//PENTA: fixme
glScalef(1.0, 1.0, 1.0);
break;
}
}
void Parhelia_SetupSimpleStage(stage_t *s)
{
tcmod_t *tc;
int i;
if (s->type != STAGE_SIMPLE)
{
Con_Printf("Non simple stage, in simple stage list");
return;
}
glMatrixMode(GL_TEXTURE);
glPushMatrix();
for (i=0; i<s->numtcmods; i++)
{
Parhelia_SetupTcMod(&s->tcmods[i]);
}
if (s->src_blend > -1)
{
glBlendFunc(s->src_blend, s->dst_blend);
glEnable(GL_BLEND);
}
if (s->alphatresh > 0)
{
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, s->alphatresh);
}
if ((s->numtextures > 0) && (s->texture[0]))
GL_Bind(s->texture[0]->texnum);
}
/************************
@ -1294,7 +1231,7 @@ void Parhelia_drawTriangleListBase (vertexdef_t *verts, int *indecies,
for ( i = 0; i < shader->numstages; i++)
{
Parhelia_SetupSimpleStage(&shader->stages[i]);
SH_SetupSimpleStage(&shader->stages[i]);
glDrawElements(GL_TRIANGLES,numIndecies,GL_UNSIGNED_INT,indecies);
glPopMatrix();
}
@ -1422,7 +1359,7 @@ void Parhelia_drawSurfaceListBase (vertexdef_t* verts, msurface_t** surfs,
for (i = 0; i < shader->numstages; i++)
{
Parhelia_SetupSimpleStage(&shader->stages[i]);
SH_SetupSimpleStage(&shader->stages[i]);
Parhelia_sendSurfacesBase(surfs, numSurfaces, false);
glPopMatrix();
}

85
gl_bumpradeon.c
View file

@ -764,7 +764,7 @@ void Radeon_DisableBumpShader(shader_t* shader)
void Radeon_SetupTcMods(stage_t *s);
void Radeon_EnableBumpShader(const transform_t *tr, vec3_t lightOrig,
void Radeon_EnableBumpShader(const transform_t *tr, const lightobject_t* lightOrig,
qboolean alias, shader_t* shader)
{
GLfloat temp[4];
@ -818,7 +818,7 @@ void Radeon_EnableBumpShader(const transform_t *tr, vec3_t lightOrig,
1.0f/(currentshadowlight->radiusv[1]),
1.0f/(currentshadowlight->radiusv[2]));
}
Radeon_SetupTcMods(&currentshadowlight->shader->stages[0]);
SH_SetupTcMods(&currentshadowlight->shader->stages[0]);
GL_SetupCubeMapMatrix(tr);
GL_SelectTexture(GL_TEXTURE5_ARB);
@ -907,76 +907,6 @@ void Radeon_DisableAttentShader() {
}
/************************
Shader utility routines
*************************/
void Radeon_SetupTcMod(tcmod_t *tc)
{
switch (tc->type)
{
case TCMOD_ROTATE:
glTranslatef(0.5,0.5,0.0);
glRotatef(realtime * tc->params[0],0,0,1);
glTranslatef(-0.5, -0.5, 0.0);
break;
case TCMOD_SCROLL:
glTranslatef(realtime * tc->params[0], realtime * tc->params[1], 0.0);
break;
case TCMOD_SCALE:
glScalef(tc->params[0],tc->params[1],1.0);
break;
case TCMOD_STRETCH:
//PENTA: fixme
glScalef(1.0, 1.0, 1.0);
break;
}
}
void Radeon_SetupTcMods(stage_t *s)
{
int i;
for (i = 0; i < s->numtcmods; i++)
Radeon_SetupTcMod(&s->tcmods[i]);
}
void Radeon_SetupSimpleStage(stage_t *s)
{
tcmod_t *tc;
int i;
if (s->type != STAGE_SIMPLE)
{
Con_Printf("Non simple stage, in simple stage list");
return;
}
glMatrixMode(GL_TEXTURE);
glPushMatrix();
for (i=0; i<s->numtcmods; i++)
{
Radeon_SetupTcMod(&s->tcmods[i]);
}
if (s->src_blend > -1)
{
glBlendFunc(s->src_blend, s->dst_blend);
glEnable(GL_BLEND);
}
if (s->alphatresh > 0)
{
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, s->alphatresh);
}
if ((s->numtextures > 0) && (s->texture[0]))
GL_BindAdvanced(s->texture[0]);
}
/************************
@ -1068,7 +998,7 @@ void Radeon_drawTriangleListBump (const vertexdef_t *verts, int *indecies,
}
glColor3fv(&currentshadowlight->color[0]);
Radeon_EnableBumpShader(tr,currentshadowlight->origin, true, shader);
Radeon_EnableBumpShader(tr, lo, true, shader);
//bind the correct texture
GL_SelectTexture(GL_TEXTURE0_ARB);
if (shader->numbumpstages > 0)
@ -1083,7 +1013,6 @@ void Radeon_drawTriangleListBump (const vertexdef_t *verts, int *indecies,
void Radeon_drawTriangleListBase (vertexdef_t *verts, int *indecies,
int numIndecies, shader_t *shader,
int lightMapIndex)
{
int i;
@ -1101,12 +1030,12 @@ void Radeon_drawTriangleListBase (vertexdef_t *verts, int *indecies,
}
//PENTA: Added fix
glColor3ub(255,255,255);
//PENTA: Added fix
glColor3ub(255,255,255);
for ( i = 0; i < shader->numstages; i++)
{
Radeon_SetupSimpleStage(&shader->stages[i]);
SH_SetupSimpleStage(&shader->stages[i]);
glDrawElements(GL_TRIANGLES,numIndecies,GL_UNSIGNED_INT,indecies);
glPopMatrix();
}
@ -1235,7 +1164,7 @@ void Radeon_drawSurfaceListBase (vertexdef_t* verts, msurface_t** surfs,
for (i = 0; i < shader->numstages; i++)
{
Radeon_SetupSimpleStage(&shader->stages[i]);
SH_SetupSimpleStage(&shader->stages[i]);
Radeon_sendSurfacesBase(surfs, numSurfaces, false);
glPopMatrix();
}