From bc718162b14dd7f28b8040b805713ee0bb9bc1dd Mon Sep 17 00:00:00 2001
From: Joey de Vries <joey.d.vries@gmail.com>
Date: Sun, 28 May 2017 08:58:38 +0200
Subject: [PATCH] Another shader tab/whitespace fix.

---
 includes/learnopengl/shader.h   | 45 ++++++++++++++++-----------------
 includes/learnopengl/shader_m.h |  3 +--
 includes/learnopengl/shader_s.h |  5 ++--
 3 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/includes/learnopengl/shader.h b/includes/learnopengl/shader.h
index 97b6420..7ae00dc 100644
--- a/includes/learnopengl/shader.h
+++ b/includes/learnopengl/shader.h
@@ -43,15 +43,15 @@ public:
             // convert stream into string
             vertexCode = vShaderStream.str();
             fragmentCode = fShaderStream.str();			
-			// if geometry shader path is present, also load a geometry shader
-			if(geometryPath != nullptr)
-			{
+            // if geometry shader path is present, also load a geometry shader
+            if(geometryPath != nullptr)
+            {
                 gShaderFile.open(geometryPath);
                 std::stringstream gShaderStream;
-				gShaderStream << gShaderFile.rdbuf();
-				gShaderFile.close();
-				geometryCode = gShaderStream.str();
-			}
+                gShaderStream << gShaderFile.rdbuf();
+                gShaderFile.close();
+                geometryCode = gShaderStream.str();
+            }
         }
         catch (std::ifstream::failure e)
         {
@@ -72,30 +72,30 @@ public:
         fragment = glCreateShader(GL_FRAGMENT_SHADER);
         glShaderSource(fragment, 1, &fShaderCode, NULL);
         glCompileShader(fragment);
-		checkCompileErrors(fragment, "FRAGMENT");
-		// if geometry shader is given, compile geometry shader
-		unsigned int geometry;
-		if(geometryPath != nullptr)
-		{
-			const char * gShaderCode = geometryCode.c_str();
-			geometry = glCreateShader(GL_GEOMETRY_SHADER);
-			glShaderSource(geometry, 1, &gShaderCode, NULL);
-			glCompileShader(geometry);
-			checkCompileErrors(geometry, "GEOMETRY");
-		}
+        checkCompileErrors(fragment, "FRAGMENT");
+        // if geometry shader is given, compile geometry shader
+        unsigned int geometry;
+        if(geometryPath != nullptr)
+        {
+            const char * gShaderCode = geometryCode.c_str();
+            geometry = glCreateShader(GL_GEOMETRY_SHADER);
+            glShaderSource(geometry, 1, &gShaderCode, NULL);
+            glCompileShader(geometry);
+            checkCompileErrors(geometry, "GEOMETRY");
+        }
         // shader Program
         ID = glCreateProgram();
         glAttachShader(ID, vertex);
         glAttachShader(ID, fragment);
-		if(geometryPath != nullptr)
-			glAttachShader(ID, geometry);
+        if(geometryPath != nullptr)
+            glAttachShader(ID, geometry);
         glLinkProgram(ID);
         checkCompileErrors(ID, "PROGRAM");
         // delete the shaders as they're linked into our program now and no longer necessery
         glDeleteShader(vertex);
         glDeleteShader(fragment);
-		if(geometryPath != nullptr)
-			glDeleteShader(geometry);
+        if(geometryPath != nullptr)
+            glDeleteShader(geometry);
 
     }
     // activate the shader
@@ -190,5 +190,4 @@ private:
         }
     }
 };
-
 #endif
\ No newline at end of file
diff --git a/includes/learnopengl/shader_m.h b/includes/learnopengl/shader_m.h
index 88bdcba..c6e28cc 100644
--- a/includes/learnopengl/shader_m.h
+++ b/includes/learnopengl/shader_m.h
@@ -60,7 +60,7 @@ public:
         fragment = glCreateShader(GL_FRAGMENT_SHADER);
         glShaderSource(fragment, 1, &fShaderCode, NULL);
         glCompileShader(fragment);
-		checkCompileErrors(fragment, "FRAGMENT");
+        checkCompileErrors(fragment, "FRAGMENT");
         // shader Program
         ID = glCreateProgram();
         glAttachShader(ID, vertex);
@@ -164,5 +164,4 @@ private:
         }
     }
 };
-
 #endif
\ No newline at end of file
diff --git a/includes/learnopengl/shader_s.h b/includes/learnopengl/shader_s.h
index 44d6f68..93906d3 100644
--- a/includes/learnopengl/shader_s.h
+++ b/includes/learnopengl/shader_s.h
@@ -59,7 +59,7 @@ public:
         fragment = glCreateShader(GL_FRAGMENT_SHADER);
         glShaderSource(fragment, 1, &fShaderCode, NULL);
         glCompileShader(fragment);
-		checkCompileErrors(fragment, "FRAGMENT");
+        checkCompileErrors(fragment, "FRAGMENT");
         // shader Program
         ID = glCreateProgram();
         glAttachShader(ID, vertex);
@@ -120,5 +120,4 @@ private:
         }
     }
 };
-
-#endif
+#endif
\ No newline at end of file