Changeset cf2d1e5 in opengl-game for color.frag

Timestamp:

Jun 14, 2018, 3:02:51 AM (7 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

885f0bb, 8d5e67b

Parents:

c8dc5c6

git-author:

Dmitry Portnoy <dmp1488@…> (06/14/18 02:58:13)

git-committer:

Dmitry Portnoy <dmp1488@…> (06/14/18 03:02:51)

Message:

-Stop rendering the triangle and square
-Place the player ship at the bottom center of screen, heading up and

into the screen

-Create a method for spawning asteroids and place several in the scene
-Allow the player to move the ship left and right and move the asteroids

towards the ship

File:

• color.frag (modified) (3 diffs)

color.frag

@@ -6 +6 @@
 
 // fixed point light properties
-vec3 Ls = vec3(1.0, 1.0, 1.0); // white specular colour
-vec3 Ld = vec3(0.7, 0.7, 0.7); // dull white diffuse light colour
-vec3 La = vec3(0.2, 0.2, 0.2); // grey ambient colour
+vec3 Ls = vec3(1.0, 1.0, 1.0);
+vec3 Ld = vec3(1.0, 1.0, 1.0);
+vec3 La = vec3(0.2, 0.2, 0.2);
 
 // surface reflectance
-vec3 Ks = vec3(1.0, 1.0, 1.0); // fully reflect specular light
-vec3 Kd = vec3(1.0, 0.5, 0.0); // orange diffuse surface reflectance
-vec3 Ka = vec3(0.2, 0.2, 0.2); // fully reflect ambient light
+vec3 Ks = vec3(1.0, 1.0, 1.0);
+vec3 Kd = vec3(1.0, 1.5, 1.0);
+vec3 Ka = vec3(0.2, 0.2, 0.2);
 float specular_exponent = 100.0; // specular 'power'
 
@@ -19 +19 @@
   // ambient intensity
   vec3 Ia = La * Ka;
+
+  // ambient intensity
+  vec3 Ia2 = La * Ka;
 
   vec3 direction_to_light_eye = normalize(light_position_eye - position_eye);
@@ -46 +49 @@
   vec3 Is2 = Ls * Ks * specular_factor2;
 
-  frag_color = vec4(Is + Id + Ia + Is2 + Id2, 1.0);
+  frag_color = vec4((Is + Id + Ia + Is2 + Id2 + Ia2)/2, 1.0);
 }