added IBR lighting from irradiance maps

[demo] / gl_shaders / default.f.glsl

diff --git a/gl_shaders/default.f.glsl b/gl_shaders/default.f.glsl
index f0f61d8..ad4b77a 100644 (file)
--- a/gl_shaders/default.f.glsl
+++ b/gl_shaders/default.f.glsl
@@ -1,15 +1,17 @@
 #version 450
 
 uniform sampler2D tex;
+uniform samplerCube dstex;
 
 uniform vec4 diffuse;
 uniform vec4 specular;
 uniform float shininess;
 
 varying vec3 pos;
-varying vec3 normal;
-varying vec3 ldir;
+// varying vec3 normal;
+// varying vec3 ldir;
 varying vec2 tex_coord;
+varying vec3 world_normal;
 
 // const float fog_density = 0.005;
 uniform float fog_density;
@@ -19,7 +21,9 @@ out vec4 color;
 
 void main()
 {
-       vec3 p = normalize(pos); // view space dir
+       vec4 itexel = textureCube(dstex, normalize(world_normal));
+
+/*     vec3 p = normalize(pos); // view space dir
        vec3 n = normalize(normal);
        vec3 l = normalize(ldir);
 
@@ -27,14 +31,15 @@ void main()
        vec3 vdir = normalize(-p);
 
        float cdiff = max(dot(l, n), 0.0);
-       float cspec = pow(max(dot(r, vdir), 0.0), shininess);
+       float cspec = pow(max(dot(r, vdir), 0.0), shininess); */
 
        float dist = -pos.z;
        float fog = clamp(exp(-fog_density * dist), 0.0, 1.0);
 
        vec4 texel = texture2D(tex, tex_coord);
 
-       vec3 object_color = diffuse.xyz * cdiff * texel.xyz + specular.xyz * cspec;
+       // vec3 object_color = (diffuse.xyz * cdiff * texel.xyz + specular.xyz * cspec) * itexel.xyz;
+       vec3 object_color = diffuse.xyz * texel.xyz * itexel.xyz;
 
        color.xyz = mix(sky_color, object_color, fog);
        color.w = 1.0;