lesson2.2

Author: levshx

lesson2.2/main.nim

@@ -110,6 +110,7 @@ proc main(): void =
   glEnableVertexAttribArray(0);
   glBindVertexArray(0);
 
+  var camera = newCamera(position = vec3(0.0f,0f,3f))
 
   var lightingShader = newShader(getAppDir()/"programs/vertex.glsl", getAppDir()/"programs/fragment.glsl")
 
@@ -118,8 +119,9 @@ proc main(): void =
   var lightPos: Vec3[GLfloat] = vec3(1.2f, 1.0f, 2.0f)
   var lightPosLoc = glGetUniformLocation(lightingShader.id, "lightPos")
   glUniform3f(lightPosLoc, lightPos.x, lightPos.y, lightPos.z) 
+  var viewPosLoc = glGetUniformLocation(lightingShader.id, "viewPos");
+  glUniform3f(viewPosLoc, camera.position.x, camera.position.y, camera.position.z)
 
-  var camera = newCamera(position = vec3(0.0f,0f,3f))
   glClearColor(0f, 0f, 0f, 1f)
   glEnable(GL_DEPTH_TEST)
 
@@ -152,6 +154,9 @@ proc main(): void =
     # Кубик
     lightingShader.use() 
 
+    viewPosLoc = glGetUniformLocation(lightingShader.id, "viewPos");
+    glUniform3f(viewPosLoc, camera.position.x, camera.position.y, camera.position.z)
+
     lightPos = vec3(1.2f, 1.0f, 2.0f)
     lightPosLoc = glGetUniformLocation(lightingShader.id, "lightPos")
     glUniform3f(lightPosLoc, lightPos.x, lightPos.y, lightPos.z) 

lesson2.2/programs/fragment.glsl

@@ -8,17 +8,26 @@ in vec3 FragPos;
 uniform vec3 objectColor;
 uniform vec3 lightColor;
 uniform vec3 lightPos;
+uniform vec3 viewPos;
 
 void main()
 {
+    // Const
+    float specularStrength = 0.5f;
     float ambientStrength = 0.1f;
+
     vec3 ambient = ambientStrength * lightColor;
 
     vec3 norm = normalize(Normal);
     vec3 lightDir = normalize(lightPos - FragPos);
     float diff = max(dot(norm, lightDir), 0.0);
     vec3 diffuse = diff * lightColor;
 
-    vec3 result = (ambient + diffuse) * objectColor;
+    vec3 viewDir = normalize(viewPos - FragPos);
+    vec3 reflectDir = reflect(-lightDir, norm);
+    float spec = pow(max(dot(viewDir, reflectDir), 0.0), 32);
+    vec3 specular = specularStrength * spec * lightColor;
+
+    vec3 result = (ambient + diffuse + specular) * objectColor;
     color = vec4(result, 1.0f);
 }

lesson2.2/programs/vertex.glsl

@@ -13,5 +13,5 @@ void main()
 {
     gl_Position = projection * view * model * vec4(position, 1.0f);
     FragPos = vec3(model * vec4(position, 1.0f));
-    Normal = normal;
+    Normal = mat3(transpose(inverse(model))) * normal;
 }