Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 22:49:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adding a prototype of ambient lighting with spherical harmonics

Browse source
This commit is contained in:
Sam Gateau 2015-01-15 11:54:01 -08:00
parent 2c8aa91e64
commit 067483fce2
3 changed files with 56 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/render-utils/src/Material.slh
View file

@ -60,4 +60,4 @@ Material getMaterial() {
<@endif@>
<@endif@>

16
libraries/render-utils/src/Model.cpp
View file

@ -2388,26 +2388,16 @@ int Model::renderMeshesFromList(QVector<int>& list, gpu::Batch& batch, RenderMod
qDebug() << "part INDEX:" << j;
qDebug() << "NEW part.materialID:" << part.materialID;
}
glm::vec4 diffuse = glm::vec4(material->getDiffuse(), material->getOpacity());
if (locations->glowIntensity >= 0) {
GLBATCH(glUniform1f)(locations->glowIntensity, glowEffect->getIntensity());
}
if (!(translucent && alphaThreshold == 0.0f)) {
GLBATCH(glAlphaFunc)(GL_EQUAL, diffuse.a = glowEffect->getIntensity());
GLBATCH(glAlphaFunc)(GL_EQUAL, glowEffect->getIntensity());
}
glm::vec4 specular = glm::vec4(material->getSpecular(), 1.0f);
float shininess = material->getShininess();
shininess = (shininess > 128.0f ? 128.0f: shininess);
if (locations->materialBufferUnit >= 0) {
batch.setUniformBuffer(locations->materialBufferUnit, material->getSchemaBuffer());
} else {
GLBATCH(glMaterialfv)(GL_FRONT, GL_AMBIENT, (const float*)&diffuse);
GLBATCH(glMaterialfv)(GL_FRONT, GL_DIFFUSE, (const float*)&diffuse);
GLBATCH(glMaterialfv)(GL_FRONT, GL_SPECULAR, (const float*)&specular);
GLBATCH(glMaterialf)(GL_FRONT, GL_SHININESS, shininess);
}
Texture* diffuseMap = networkPart.diffuseTexture.data();

53
libraries/render-utils/src/directional_light_shadow_map.slf
View file

@ -18,6 +18,40 @@
// Everything about shadow
<@include Shadow.slh@>
struct SphericalHarmonics {
vec4 L00;
vec4 L1m1;
vec4 L10;
vec4 L11;
vec4 L2m2;
vec4 L2m1;
vec4 L20;
vec4 L21;
vec4 L22;
};
vec4 evalSphericalLight(SphericalHarmonics sh, vec3 direction ) {
const float C1 = 0.429043;
const float C2 = 0.511664;
const float C3 = 0.743125;
const float C4 = 0.886227;
const float C5 = 0.247708;
vec4 value = C1 * sh.L22 * (direction.x * direction.x - direction.y * direction.y) +
C3 * sh.L20 * direction.z * direction.z +
C4 * sh.L00 - C5 * sh.L20 +
2.0 * C1 * ( sh.L2m2 * direction.x * direction.y +
sh.L21 * direction.x * direction.z +
sh.L2m1 * direction.y * direction.z ) +
2.0 * C2 * ( sh.L11 * direction.x +
sh.L1m1 * direction.y +
sh.L10 * direction.z ) ;
return value;
}
void main(void) {
DeferredFragment frag = unpackDeferredFragment(gl_TexCoord[0].st);
vec4 normalVal = frag.normalVal;
@ -31,6 +65,17 @@ void main(void) {
// how much this fragment faces the light direction
float diffuse = dot(frag.normal, gl_LightSource[0].position.xyz);
SphericalHarmonics sh;
sh.L00 = vec4( 0.79, 0.44, 0.54, 1.0);
sh.L1m1 = vec4( 0.39, 0.35, 0.60, 1.0);
sh.L10 = vec4(-0.34, -0.18, -0.27, 1.0);
sh.L11 = vec4(-0.29, -0.06, 0.01, 1.0);
sh.L2m2 = vec4(-0.11, -0.05, -0.12, 1.0);
sh.L2m1 = vec4(-0.26, -0.22, -0.47, 1.0);
sh.L20 = vec4(-0.16, -0.09, -0.15, 1.0);
sh.L21 = vec4( 0.56, 0.21, 0.14, 1.0);
sh.L22 = vec4( 0.21, -0.05, -0.30, 1.0);
// Light mapped or not ?
if ((normalVal.a >= 0.45) && (normalVal.a <= 0.55)) {
normalVal.a = 0.0;
@ -53,9 +98,15 @@ void main(void) {
// average values from the shadow map
float facingLight = step(0.0, diffuse) * shadowAttenuation;
vec4 ambienTerm = 0.5 * evalSphericalLight(sh, frag.normal);
if (gl_FragCoord.x > 1024) {
ambienTerm = gl_FrontLightProduct[0].ambient.rgba;
}
// compute the base color based on OpenGL lighting model
vec3 baseColor = diffuseVal.rgb * (gl_FrontLightModelProduct.sceneColor.rgb +
gl_FrontLightProduct[0].ambient.rgb + gl_FrontLightProduct[0].diffuse.rgb * (diffuse * facingLight));
ambienTerm.rgb + gl_FrontLightProduct[0].diffuse.rgb * (diffuse * facingLight));
// compute the specular multiplier (sans exponent)
float specular = facingLight * max(0.0, dot(normalize(gl_LightSource[0].position.xyz - normalize(frag.position.xyz)),