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

More lighting improvements

Browse Source
This commit is contained in:
Luke Benstead 2020-02-19 09:30:26 +00:00
parent 24fe33358c
commit a502f92ded
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
GL/lighting.c
View File

@ -5,11 +5,13 @@
#include <dc/vec3f.h> #include <dc/vec3f.h>
#include "private.h" #include "private.h"
#define _MIN(x, y) (x < y) ? x : y
/* Lighting will not be calculated if the attenuation /* Lighting will not be calculated if the attenuation
* multiplier ends up less than this value */ * multiplier ends up less than this value */
#define ATTENUATION_THRESHOLD 0.01f #define ATTENUATION_THRESHOLD 0.01f
static GLfloat SCENE_AMBIENT [] = {0.2, 0.2, 0.2, 1.0}; static GLfloat SCENE_AMBIENT [] = {0.2f, 0.2f, 0.2f, 1.0f};
static GLboolean VIEWER_IN_EYE_COORDINATES = GL_TRUE; static GLboolean VIEWER_IN_EYE_COORDINATES = GL_TRUE;
static GLenum COLOR_CONTROL = GL_SINGLE_COLOR; static GLenum COLOR_CONTROL = GL_SINGLE_COLOR;
static GLboolean TWO_SIDED_LIGHTING = GL_FALSE; static GLboolean TWO_SIDED_LIGHTING = GL_FALSE;
@ -181,7 +183,7 @@ void APIENTRY glMaterialf(GLenum face, GLenum pname, const GLfloat param) {
return; return;
} }
MATERIAL.exponent = param; MATERIAL.exponent = _MIN(param, 128); /* 128 is the max according to the GL spec */
} }
void APIENTRY glMateriali(GLenum face, GLenum pname, const GLint param) { void APIENTRY glMateriali(GLenum face, GLenum pname, const GLint param) {
@ -279,10 +281,10 @@ GL_FORCE_INLINE float FEXP(float y) {
#define LOGBODGE 0.346607f #define LOGBODGE 0.346607f
#define POWBODGE 0.33971f #define POWBODGE 0.33971f
const static float FINT_MAX = (float) INT_MAX; const static float FINT_MAX = ((float) INT_MAX) + 1.0f;
GL_FORCE_INLINE float FFLOOR(float x) { GL_FORCE_INLINE float FFLOOR(float x) {
return (int)(x + FINT_MAX) - INT_MAX; return ((int)(x + FINT_MAX) + INT_MIN);
} }
GL_FORCE_INLINE float FLOG2(float i) { GL_FORCE_INLINE float FLOG2(float i) {
@ -331,21 +333,18 @@ GL_FORCE_INLINE float vec3_dot_limited(
return (ret < 0) ? 0 : ret; return (ret < 0) ? 0 : ret;
} }
#define _MIN(x, y) (x < y) ? x : y
GL_FORCE_INLINE void _glLightVertexDirectional(uint8_t* final, int8_t lid, float LdotN, float NdotH) { GL_FORCE_INLINE void _glLightVertexDirectional(uint8_t* final, int8_t lid, float LdotN, float NdotH) {
float F; float F;
float FI = (LdotN != 0.0f);
uint8_t FO; uint8_t FO;
float FI = (LdotN != 0.0f);
FI = (MATERIAL.exponent) ? FPOW(FI * NdotH, MATERIAL.exponent) : 1.0f;
#define _PROCESS_COMPONENT(T, X) \ #define _PROCESS_COMPONENT(T, X) \
F = (MATERIAL.ambient[X] * LIGHTS[lid].ambient[X]); \ F = (MATERIAL.ambient[X] * LIGHTS[lid].ambient[X]); \
F += (LdotN * MATERIAL.diffuse[X] * LIGHTS[lid].diffuse[X]); \ F += (LdotN * MATERIAL.diffuse[X] * LIGHTS[lid].diffuse[X]); \
FI = (MATERIAL.exponent) ? FPOW(FI * NdotH, MATERIAL.exponent) : 1.0f; \
F += FI * MATERIAL.specular[X] * LIGHTS[lid].specular[X]; \ F += FI * MATERIAL.specular[X] * LIGHTS[lid].specular[X]; \
FO = (uint8_t) (_MIN(F * 255.0f, 255.0f)); \ FO = (uint8_t) (_MIN(F * 255.0f, 255.0f)); \
\ final[T] += _MIN(FO, 255 - final[T]);
final[T] += _MIN(FO, 255 - final[T]); \
_PROCESS_COMPONENT(R8IDX, 0); _PROCESS_COMPONENT(R8IDX, 0);
_PROCESS_COMPONENT(G8IDX, 1); _PROCESS_COMPONENT(G8IDX, 1);
@ -356,13 +355,13 @@ GL_FORCE_INLINE void _glLightVertexDirectional(uint8_t* final, int8_t lid, float
GL_FORCE_INLINE void _glLightVertexPoint(uint8_t* final, int8_t lid, float LdotN, float NdotH, float att) { GL_FORCE_INLINE void _glLightVertexPoint(uint8_t* final, int8_t lid, float LdotN, float NdotH, float att) {
float F; float F;
float FI = (LdotN != 0.0f);
uint8_t FO; uint8_t FO;
float FI = (LdotN != 0.0f);
FI = (MATERIAL.exponent) ? FPOW(FI * NdotH, MATERIAL.exponent) : 1.0f;
#define _PROCESS_COMPONENT(T, X) \ #define _PROCESS_COMPONENT(T, X) \
F = (MATERIAL.ambient[X] * LIGHTS[lid].ambient[X]); \ F = (MATERIAL.ambient[X] * LIGHTS[lid].ambient[X]); \
F += (LdotN * MATERIAL.diffuse[X] * LIGHTS[lid].diffuse[X]); \ F += (LdotN * MATERIAL.diffuse[X] * LIGHTS[lid].diffuse[X]); \
FI = (MATERIAL.exponent) ? FPOW(FI * NdotH, MATERIAL.exponent) : 1.0f; \
F += FI * MATERIAL.specular[X] * LIGHTS[lid].specular[X]; \ F += FI * MATERIAL.specular[X] * LIGHTS[lid].specular[X]; \
FO = (uint8_t) (_MIN(F * att * 255.0f, 255.0f)); \ FO = (uint8_t) (_MIN(F * att * 255.0f, 255.0f)); \
\ \