commit 6591b2054554012a073bd20e3d1823ea97e37ec6
parent fb137e83bb103e25e325cbcb3486654438d355e2
Author: William Casarin <jb55@jb55.com>
Date: Wed, 31 Oct 2018 12:27:15 -0700
shiny world
Diffstat:
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc/shaders/lighting.glsl b/etc/shaders/lighting.glsl
@@ -21,9 +21,9 @@ vec3 standard_light(vec3 color, vec3 position) {
vec4 trans_normal = normal_matrix * v4_normal;
const float pi = 3.14159265;
- const float shiny = 8.0;
+ const float shiny = 6.0;
float ambient_str = 0.2;
- float spec_str = 0.5 * light_intensity;
+ float spec_str = 1.0 * light_intensity;
vec3 ray = camera_position - position;
vec3 view_dir = normalize(ray);
@@ -42,7 +42,7 @@ vec3 standard_light(vec3 color, vec3 position) {
vec3 ambient = ambient_str * sun_color;
float spec;
- bool blinn = true;
+ bool blinn = false;
if (blinn) {
const float energy_conservation = ( 8.0 + shiny ) / ( 8.0 * pi );
vec3 halfway_dir = normalize(light_dir + view_dir); // blinn-phong