Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not spend value resources shading the backsides of polygons or setting irrelevant GL states.

master
Per Inge Mathisen 2010-12-27 16:53:13 +01:00
parent f5ea79ed3c
commit af59954767
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ivis_common/piestate.h
View File

@ -101,10 +101,6 @@ void pie_SetShaderStretchDepth(float stretch);
/* Actually in piedraw.c */
// Lighting cotrols
extern void pie_SetLightingState(bool);
extern bool pie_GetLightingState(void);
/* Errors control routine */
#define glErrors() \
_glerrors(__FUNCTION__, __FILE__, __LINE__)

32
lib/ivis_opengl/piedraw.cpp
View File

@ -55,7 +55,7 @@ static unsigned int pieCount = 0;
static unsigned int tileCount = 0;
static unsigned int polyCount = 0;
static bool shadows = false;
static GLfloat lighting0[LIGHT_MAX][4] = {{0.0f, 0.0f, 0.0f, 0.0f}, {0.6f, 0.6f, 0.6f, 1.0f}, {0.8f, 0.8f, 0.8f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}};
static GLfloat lighting0[LIGHT_MAX][4] = {{0.0f, 0.0f, 0.0f, 1.0f}, {0.5f, 0.5f, 0.5f, 1.0f}, {0.8f, 0.8f, 0.8f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}};
/*
* Source
@ -92,10 +92,6 @@ bool pie_GetLightingState(void)
return true;
}
void pie_SetLightingState(bool val)
{
}
void pie_EndLighting(void)
{
shadows = false;
@ -176,13 +172,12 @@ static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, PIELI
if (light)
{
glEnable(GL_LIGHTING);
glEnable(GL_NORMALIZE);
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, shape->material[LIGHT_AMBIENT]);
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, shape->material[LIGHT_DIFFUSE]);
glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, shape->material[LIGHT_SPECULAR]);
glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shape->shininess);
glMaterialfv(GL_FRONT, GL_AMBIENT, shape->material[LIGHT_AMBIENT]);
glMaterialfv(GL_FRONT, GL_DIFFUSE, shape->material[LIGHT_DIFFUSE]);
glMaterialfv(GL_FRONT, GL_SPECULAR, shape->material[LIGHT_SPECULAR]);
glMaterialf(GL_FRONT, GL_SHININESS, shape->shininess);
glMaterialfv(GL_FRONT, GL_EMISSION, shape->material[LIGHT_EMISSIVE]);
pie_ActivateShader_TCMask(teamcolour, shape->tcmaskpage);
}
if (pieFlag & pie_HEIGHT_SCALED) // construct
@ -197,8 +192,6 @@ static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, PIELI
glColor4ubv(colour.vector); // Only need to set once for entire model
pie_SetTexturePage(shape->texpage);
pie_ActivateShader_TCMask(teamcolour, shape->tcmaskpage);
frame %= MAX(1, shape->numFrames);
for (pPolys = shape->polys; pPolys < shape->polys + shape->npolys; pPolys++)
@ -235,18 +228,15 @@ static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, PIELI
glEnd();
}
pie_DeactivateShader();
if (light)
{
pie_DeactivateShader();
}
if (pieFlag & pie_BUTTON)
{
pie_SetDepthBufferStatus(DEPTH_CMP_ALWAYS_WRT_ON);
}
if (light)
{
glDisable(GL_LIGHTING);
glDisable(GL_NORMALIZE);
}
}
/// returns true if the edges are adjacent