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

Very tentative attempt at backwards-compatible multi-lights.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1219 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-01-23 10:59:18 +00:00
parent c7d54527ca
commit 03b6403312
4 changed files with 35 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/build/include/glbuild.h
View file

@ -107,6 +107,7 @@ extern void (APIENTRY * bglNormal3f)( GLfloat x, GLfloat y, GLfloat z );
// Lighting // Lighting
extern void (APIENTRY * bglShadeModel)( GLenum mode ); extern void (APIENTRY * bglShadeModel)( GLenum mode );
extern void (APIENTRY * bglLightfv)( GLenum light, GLenum pname, const GLfloat * params );
// Raster funcs // Raster funcs
extern void (APIENTRY * bglReadPixels)( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels ); extern void (APIENTRY * bglReadPixels)( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels );

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

@ -85,9 +85,6 @@ typedef struct s_prrograminfo {
GLint uniform_detailScale; GLint uniform_detailScale;
// PR_BIT_POINT_LIGHT // PR_BIT_POINT_LIGHT
GLint uniform_lightCount; GLint uniform_lightCount;
GLint uniform_pointLightPosition;
GLint uniform_pointLightColor;
GLint uniform_pointLightRange;
// PR_BIT_DIFFUSE_GLOW_MAP // PR_BIT_DIFFUSE_GLOW_MAP
GLint uniform_glowMap; GLint uniform_glowMap;
} _prprograminfo; } _prprograminfo;

3
polymer/eduke32/build/src/glbuild.c
View file

@ -74,6 +74,7 @@ void (APIENTRY * bglNormal3f)(GLfloat x, GLfloat y, GLfloat z);
// Lighting // Lighting
void (APIENTRY * bglShadeModel)(GLenum mode); void (APIENTRY * bglShadeModel)(GLenum mode);
void (APIENTRY * bglLightfv)( GLenum light, GLenum pname, const GLfloat * params );
// Raster funcs // Raster funcs
void (APIENTRY * bglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); void (APIENTRY * bglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
@ -417,6 +418,7 @@ int32_t loadgldriver(const char *driver)
// Lighting // Lighting
bglShadeModel = GETPROC("glShadeModel"); bglShadeModel = GETPROC("glShadeModel");
bglLightfv = GETPROC("glLightfv");
// Raster funcs // Raster funcs
bglReadPixels = GETPROC("glReadPixels"); bglReadPixels = GETPROC("glReadPixels");
@ -690,6 +692,7 @@ int32_t unloadgldriver(void)
// Lighting // Lighting
bglShadeModel = NULL; bglShadeModel = NULL;
bglLightfv = NULL;
// Raster funcs // Raster funcs
bglReadPixels = NULL; bglReadPixels = NULL;

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

@ -200,17 +200,16 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
" vertexPos = vec3(gl_ModelViewMatrix * gl_Vertex);\n" " vertexPos = vec3(gl_ModelViewMatrix * gl_Vertex);\n"
"\n", "\n",
// frag_def // frag_def
"#define MAX_LIGHTS 32\n"
"uniform int lightCount;\n" "uniform int lightCount;\n"
"uniform vec3 pointLightPosition[MAX_LIGHTS];\n"
"uniform vec3 pointLightColor[MAX_LIGHTS];\n"
"uniform vec2 pointLightRange[MAX_LIGHTS];\n"
"varying vec3 vertexNormal;\n" "varying vec3 vertexNormal;\n"
"varying vec3 vertexPos;\n" "varying vec3 vertexPos;\n"
"\n", "\n",
// frag_prog // frag_prog
" vec3 lightVector;\n"
" vec3 fragmentNormal;\n" " vec3 fragmentNormal;\n"
" vec3 lightPos;\n"
" vec3 lightDiffuse;\n"
" vec2 lightRange;\n"
" vec3 lightVector;\n"
" float dotNormalLightDir;\n" " float dotNormalLightDir;\n"
" float lightAttenuation;\n" " float lightAttenuation;\n"
" float pointLightDistance;\n" " float pointLightDistance;\n"
@ -218,18 +217,23 @@ _prprogrambit prprogrambits[PR_BIT_COUNT] = {
" fragmentNormal = normalize(vertexNormal);\n" " fragmentNormal = normalize(vertexNormal);\n"
"\n" "\n"
" while (l < lightCount) {\n" " while (l < lightCount) {\n"
" lightVector = pointLightPosition[l] - vertexPos;\n" " lightPos = gl_LightSource[l].ambient.rgb;\n"
" lightDiffuse = gl_LightSource[l].diffuse.rgb;\n"
" lightRange.x = gl_LightSource[l].constantAttenuation;\n"
" lightRange.y = gl_LightSource[l].linearAttenuation;\n"
"\n"
" lightVector = lightPos - vertexPos;\n"
" pointLightDistance = length(lightVector);\n" " pointLightDistance = length(lightVector);\n"
" dotNormalLightDir = max(dot(fragmentNormal, normalize(lightVector)), 0.0);\n" " dotNormalLightDir = max(dot(fragmentNormal, normalize(lightVector)), 0.0);\n"
" if (pointLightDistance < pointLightRange[l].y)\n" " if (pointLightDistance < lightRange.y)\n"
" {\n" " {\n"
" if (pointLightDistance < pointLightRange[l].x)\n" " if (pointLightDistance < lightRange.x)\n"
" lightAttenuation = 1.0;\n" " lightAttenuation = 1.0;\n"
" else {\n" " else {\n"
" lightAttenuation = 1.0 - (pointLightDistance - pointLightRange[l].x) /\n" " lightAttenuation = 1.0 - (pointLightDistance - lightRange.x) /\n"
" (pointLightRange[l].y - pointLightRange[l].x);\n" " (lightRange.y - lightRange.x);\n"
" }\n" " }\n"
" result += vec4(lightAttenuation * dotNormalLightDir * pointLightColor[l], 0.0);\n" " result += vec4(lightAttenuation * dotNormalLightDir * lightDiffuse, 0.0);\n"
" float specular = pow( max(dot(reflect(-normalize(lightVector), fragmentNormal), normalize(-vertexPos)), 0.0), 60.0);\n" " float specular = pow( max(dot(reflect(-normalize(lightVector), fragmentNormal), normalize(-vertexPos)), 0.0), 60.0);\n"
" result += vec4(lightAttenuation * specular * vec3(1.0, 0.5, 0.5), 0.0);\n" " result += vec4(lightAttenuation * specular * vec3(1.0, 0.5, 0.5), 0.0);\n"
" }\n" " }\n"
@ -2703,9 +2707,9 @@ static int32_t polymer_bindmaterial(_prmaterial material)
{ {
int lightCount; int lightCount;
float range[4]; float range[4];
float color[6]; float color[8];
float pos[6]; float pos[6];
float lightpos[6]; float lightpos[8];
lightCount = 2; lightCount = 2;
@ -2737,32 +2741,37 @@ static int32_t polymer_bindmaterial(_prmaterial material)
pos[4] = -globalposz / 16.0; pos[4] = -globalposz / 16.0;
pos[5] = -globalposx; pos[5] = -globalposx;
lightpos[3] = pos[3] * rootmodelviewmatrix[0] + lightpos[4] = pos[3] * rootmodelviewmatrix[0] +
pos[4] * rootmodelviewmatrix[4] + pos[4] * rootmodelviewmatrix[4] +
pos[5] * rootmodelviewmatrix[8] + pos[5] * rootmodelviewmatrix[8] +
+ rootmodelviewmatrix[12]; + rootmodelviewmatrix[12];
lightpos[4] = pos[3] * rootmodelviewmatrix[1] + lightpos[5] = pos[3] * rootmodelviewmatrix[1] +
pos[4] * rootmodelviewmatrix[5] + pos[4] * rootmodelviewmatrix[5] +
pos[5] * rootmodelviewmatrix[9] + pos[5] * rootmodelviewmatrix[9] +
+ rootmodelviewmatrix[13]; + rootmodelviewmatrix[13];
lightpos[5] = pos[3] * rootmodelviewmatrix[2] + lightpos[6] = pos[3] * rootmodelviewmatrix[2] +
pos[4] * rootmodelviewmatrix[6] + pos[4] * rootmodelviewmatrix[6] +
pos[5] * rootmodelviewmatrix[10] + pos[5] * rootmodelviewmatrix[10] +
+ rootmodelviewmatrix[14]; + rootmodelviewmatrix[14];
color[3] = 0.5f;
color[4] = 0.5f; color[4] = 0.5f;
color[5] = 0.5f; color[5] = 0.5f;
color[6] = 0.5f;
range[2] = 5000.0f / 1000.0; range[2] = 5000.0f / 1000.0;
range[3] = 10000.0f / 1000.0; range[3] = 10000.0f / 1000.0;
/* bglUniform3fARB(prprograms[programbits].uniform_pointLightPosition, 62208, 42000 / 16.0, -6919); bglLightfv(GL_LIGHT0, GL_AMBIENT, lightpos);
bglUniform3fARB(prprograms[programbits].uniform_pointLightPosition, globalposy, -globalposz / 16.0, -globalposx);*/ bglLightfv(GL_LIGHT0, GL_DIFFUSE, color);
bglLightfv(GL_LIGHT0, GL_CONSTANT_ATTENUATION, &range[0]);
bglLightfv(GL_LIGHT0, GL_LINEAR_ATTENUATION, &range[1]);
bglLightfv(GL_LIGHT1, GL_AMBIENT, &lightpos[4]);
bglLightfv(GL_LIGHT1, GL_DIFFUSE, &color[4]);
bglLightfv(GL_LIGHT1, GL_CONSTANT_ATTENUATION, &range[2]);
bglLightfv(GL_LIGHT1, GL_LINEAR_ATTENUATION, &range[3]);
bglUniform1iARB(prprograms[programbits].uniform_lightCount, lightCount); bglUniform1iARB(prprograms[programbits].uniform_lightCount, lightCount);
bglUniform3fvARB(prprograms[programbits].uniform_pointLightPosition, lightCount, lightpos);
bglUniform3fvARB(prprograms[programbits].uniform_pointLightColor, lightCount, color);
bglUniform2fvARB(prprograms[programbits].uniform_pointLightRange, lightCount, range);
} }
// PR_BIT_DIFFUSE_GLOW_MAP // PR_BIT_DIFFUSE_GLOW_MAP
@ -2890,9 +2899,6 @@ static void polymer_compileprogram(int32_t programbits)
if (programbits & prprogrambits[PR_BIT_POINT_LIGHT].bit) if (programbits & prprogrambits[PR_BIT_POINT_LIGHT].bit)
{ {
prprograms[programbits].uniform_lightCount = bglGetUniformLocationARB(program, "lightCount"); prprograms[programbits].uniform_lightCount = bglGetUniformLocationARB(program, "lightCount");
prprograms[programbits].uniform_pointLightPosition = bglGetUniformLocationARB(program, "pointLightPosition");
prprograms[programbits].uniform_pointLightColor = bglGetUniformLocationARB(program, "pointLightColor");
prprograms[programbits].uniform_pointLightRange = bglGetUniformLocationARB(program, "pointLightRange");
} }
// PR_BIT_DIFFUSE_GLOW_MAP // PR_BIT_DIFFUSE_GLOW_MAP