mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace custom glKosLightAmbientX functions with glLightModelfv

Browse Source
This commit is contained in:
Luke Benstead 2017-07-23 18:58:57 +01:00
parent 08417324eb
commit 4bf579f7bc
2 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gl-light.c
View File

@ -107,33 +107,16 @@ void glNormal3fv(const GLfloat *xyz) {
GL_VERTEX_NORMAL[2] = xyz[2];
}
/* Global Ambient Light Parameters */
void glKosLightAmbient4fv(const float *rgba) {
GL_GLOBAL_AMBIENT[0] = rgba[0];
GL_GLOBAL_AMBIENT[1] = rgba[1];
GL_GLOBAL_AMBIENT[2] = rgba[2];
GL_GLOBAL_AMBIENT[3] = rgba[3];
}
void glLightModelfv(GLenum pname, const GLfloat *params) {
if(pname != GL_LIGHT_MODEL_AMBIENT) {
_glKosThrowError(GL_INVALID_ENUM, "glLightModelfv");
return;
}
void glKosLightAmbient4f(float r, float g, float b, float a) {
GL_GLOBAL_AMBIENT[0] = r;
GL_GLOBAL_AMBIENT[1] = g;
GL_GLOBAL_AMBIENT[2] = b;
GL_GLOBAL_AMBIENT[3] = a;
}
void glKosLightAmbient3fv(const float *rgb) {
GL_GLOBAL_AMBIENT[0] = rgb[0];
GL_GLOBAL_AMBIENT[1] = rgb[1];
GL_GLOBAL_AMBIENT[2] = rgb[2];
GL_GLOBAL_AMBIENT[3] = 1.0f;
}
void glKosLightAmbient3f(float r, float g, float b) {
GL_GLOBAL_AMBIENT[0] = r;
GL_GLOBAL_AMBIENT[1] = g;
GL_GLOBAL_AMBIENT[2] = b;
GL_GLOBAL_AMBIENT[3] = 1.0f;
GL_GLOBAL_AMBIENT[0] = params[0];
GL_GLOBAL_AMBIENT[1] = params[1];
GL_GLOBAL_AMBIENT[2] = params[2];
GL_GLOBAL_AMBIENT[3] = params[3];
}
/* Misc Lighting Functions ************************************/

7
include/gl.h
View File

@ -629,15 +629,10 @@ GLAPI void APIENTRY glFogfv(GLenum pname, const GLfloat *params);
/* Lighting Functions - client must enable GL_LIGHTING for this to take effect */
/* Set Global Ambient Light Color */
GLAPI void APIENTRY glKosLightAmbient3f(GLfloat r, GLfloat g, GLfloat b);
GLAPI void APIENTRY glKosLightAmbient4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);
GLAPI void APIENTRY glKosLightAmbient3fv(const GLfloat *rgb);
GLAPI void APIENTRY glKosLightAmbient4fv(const GLfloat *rgba);
/* Set Individual Light Parameters */
GLAPI void APIENTRY glLightfv(GLenum light, GLenum pname, const GLfloat *params);
GLAPI void APIENTRY glLightf(GLenum light, GLenum pname, GLfloat param);
GLAPI void APIENTRY glLightModelfv(GLenum pname, const GLfloat *params);
/* Set Global Material Parameters */
GLAPI void APIENTRY glMateriali(GLenum face, GLenum pname, const GLint param);