update

assets/shaders/phong-solid.fragment.glsl

@@ -4,32 +4,27 @@ out vec4 frag_color;
 uniform vec3 light_pos;
 uniform vec3 solid_color;
 
-in vec3 normal_cameraspace;
-in vec3 light_direction_cameraspace;
-in vec3 eye_direction_cameraspace;
-in vec3 position_worldspace;
+in vec3 normal;
+in vec3 frag_position;
 
 void main() {
-    vec4 material_diffuse_color = vec4(solid_color, 1); 
-    vec4 material_ambient_color = vec4(0.1, 0.1, 0.1, 1.0) * material_diffuse_color;
-    vec4 material_specular_color = vec4(1.0, 1.0, 1.0, 1.0); 
+    vec3 light_color = vec3(1, 1, 1);
+    vec3 light_direction_norm = normalize(light_pos - frag_position);
+    vec3 normal_norm = normalize(normal);
+    vec3 eyes = vec3(1, 1, 0);
 
-    vec3 normal = normalize(normal_cameraspace);
-    vec3 light_dir = normalize(light_direction_cameraspace);
-    float cos_theta = clamp(dot(normal, light_dir), 0, 1);
+    float ambient_strength = 0.1;
+    vec3 ambient = ambient_strength * light_color;
 
-    vec3 eye = normalize(eye_direction_cameraspace);
-    vec3 reflected = reflect(-light_dir, normal);
-    float cos_alpha = clamp(dot(eye, reflected), 0, 1);
+    float diff = max(dot(normal_norm, light_direction_norm), 0.0);
+    vec3 diffuse = diff * light_color;
 
-    vec4 light_color = vec4(1, 1, 1, 1);
-    float light_power = 60;
+    float specular_strength = 0.5;
+    vec3 view_direction_norm = normalize(eyes - frag_position);
+    vec3 reflect_dir = reflect(-light_direction_norm, normal_norm);
+    float spec = pow(max(dot(view_direction_norm, reflect_dir), 0.0), 32);
+    vec3 specular = specular_strength * spec * light_color;
 
-    float distance = length(light_pos - position_worldspace);
-    float dist_sq = pow(distance, 2);
-
-    vec4 diffuse = material_diffuse_color * light_color * light_power * cos_theta / dist_sq;
-    vec4 specular = material_specular_color * light_color * light_power * pow(cos_alpha, 10) / dist_sq;
-
-    frag_color = material_ambient_color + diffuse + specular; 
-};
+    vec3 result = (ambient + diffuse + specular) * solid_color;
+    frag_color = vec4(result, 1.0);
+}

assets/shaders/phong-solid.vertex.glsl

@@ -8,19 +8,13 @@ uniform mat4 view;
 uniform mat4 projection;
 uniform vec3 light_pos;
 
-out vec3 normal_cameraspace;
-out vec3 light_direction_cameraspace;
-out vec3 eye_direction_cameraspace;
-out vec3 position_worldspace;
+out vec3 normal;
+out vec3 frag_position;
 
 void main() {
-    vec3 vertex_cameraspace = (view * model * vec4(a_xyz, 1)).xyz;
-    vec3 light_pos_cameraspace = (view * vec4(light_pos, 1)).xyz;
+    vec4 a_xyz_vec4 = vec4(a_xyz, 1);
 
-    normal_cameraspace = (transpose(inverse(view * model)) * vec4(a_normal, 0)).xyz;
-    light_direction_cameraspace = light_pos_cameraspace + eye_direction_cameraspace;
-    eye_direction_cameraspace = vec3(0, 0, 0) - vertex_cameraspace;
-    position_worldspace = (model * vec4(a_xyz, 1)).xyz;
-
-    gl_Position = projection * view * model * vec4(a_xyz, 1);
+    frag_position = (model * a_xyz_vec4).xyz;
+    normal = mat3(transpose(inverse(model))) * a_normal;
+    gl_Position = projection * view * model * a_xyz_vec4;
 }