From c55d112f17d43520b18b0a494c5a2976bddf3c86 Mon Sep 17 00:00:00 2001
From: Ben <playsplane@gmail.com>
Date: Mon, 18 Feb 2019 16:15:54 +0000
Subject: [PATCH] Code change

---
 OpenGL/playground/output                      | Bin 1014688 -> 1014688 bytes
 .../playground/resources/shaders/phong.frag   |   7 +------
 OpenGL/playground/src/main.cpp                |   6 +++---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/OpenGL/playground/output b/OpenGL/playground/output
index 831eef82f7bf68b0eee6ec9b13e67a1a11ab2b27..fe61cb5cf65913f1e4414b141eb7d7891cac9c48 100755
GIT binary patch
delta 143
zcmZ4R-FCru+YMisL~L4TTy1i%lb&$(aL1t_E3O&OCFgJEU_LsL=QF<mulENAhBW^7
z2R7fF;`@QIpk2L{5r~<9m>Gy!fS47C*?^cGh&i^aw{qsOh>NiLajaorVqs!q(h_1-
dfv^gM+t+k*0x=g5a|1CC5c6(d)5-VcBLL$VG&BGJ

delta 143
zcmZ4R-FCru+YMisM9in(ODmV#vOKNlSmA+)x3i)(s=YRIFdv=Blg9u4<Y#^XR`(AK
z44ZFG@%_N4(5~Lf2*gZ4%nZaVK+FonY(UHo#2nkzTRHPs#D!V?IMy&Qu`sbQX$i5a
dKv)GL?Q1$YftU-3xq+Amh<UfK>E!$J5diOhG$a53

diff --git a/OpenGL/playground/resources/shaders/phong.frag b/OpenGL/playground/resources/shaders/phong.frag
index c7e0609..4a3fb51 100644
--- a/OpenGL/playground/resources/shaders/phong.frag
+++ b/OpenGL/playground/resources/shaders/phong.frag
@@ -12,9 +12,6 @@ vec3 objectColour = vec3(0.58, 0.61, 0.627);
 vec3 lightColour = vec3(1.0, 0.0, 1.0);
 
 void main() {
-    float ambientStrength = 0.5;
-    vec3 ambient = ambientStrength * lightColour;
-
     vec3 norm = normalize(Normal);
     vec3 lightDir = normalize(lightPos - FragPos);
 
@@ -22,7 +19,6 @@ void main() {
     vec3 diffuse = diff * lightColour;
 
 
-
     float specularStrength = 0.5;
 
     vec3 viewDir = normalize(viewPos - FragPos);
@@ -32,7 +28,6 @@ void main() {
     vec3 specular = specularStrength * spec * lightColour;
 
 
-
-    vec3 result = (ambient + diffuse + specular) * objectColour;
+    vec3 result = (diffuse + specular) * objectColour;
     outColour = vec4(result, 1.0);
 }
diff --git a/OpenGL/playground/src/main.cpp b/OpenGL/playground/src/main.cpp
index 1061f9c..cf459b1 100644
--- a/OpenGL/playground/src/main.cpp
+++ b/OpenGL/playground/src/main.cpp
@@ -113,7 +113,7 @@ int main(int argc, char** argv) {
 
 	// Model matrice
 	glm::mat4 model = glm::mat4(1.0f);
-	model = glm::translate(model, {-10.0f, -10.0f, -10.0f});
+	model = glm::translate(model, {-15.0f, -15.0f, -15.0f});
 	// Gets uniform for model matrice, to be used later
 	GLint uniTrans = glGetUniformLocation(simpleShader.getProgram(), "model");
 
@@ -143,8 +143,8 @@ int main(int argc, char** argv) {
 		// Update tick (60ups)
 		if (UPSTimer()) {
 			model = glm::rotate(model, glm::radians(0.5f), glm::vec3(0.0f, 0.0f, 1.0f));
-			model = glm::rotate(model, glm::radians(0.5f), glm::vec3(1.0f, 0.0f, 0.0f));
-			// model = glm::rotate(model, glm::radians(0.5f), glm::vec3(0.0f, 1.0f, 0.0f));
+			// model = glm::rotate(model, glm::radians(0.5f), glm::vec3(1.0f, 0.0f, 0.0f));
+			model = glm::rotate(model, glm::radians(0.5f), glm::vec3(0.0f, 1.0f, 0.0f));
 			glm::vec4 result = model * glm::vec4(1.0f, 0.0f, 0.0f, 1.0f);
 			glUniformMatrix4fv(uniTrans, 1, GL_FALSE, glm::value_ptr(model));