Typo; fixes #36

Calvin1602 · Calvin1602 · commit 35cd0db95d01 · 2017-07-16T18:02:24.000+02:00
diff --git a/common/text2D.cpp b/common/text2D.cpp
@@ -84,7 +84,7 @@ void printText2D(const char * text, int x, int y, int size){
 	// Bind texture
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, Text2DTextureID);
-	// Set our "myTextureSampler" sampler to user Texture Unit 0
+	// Set our "myTextureSampler" sampler to use Texture Unit 0
 	glUniform1i(Text2DUniformID, 0);
 
 	// 1rst attribute buffer : vertices
diff --git a/misc05_picking/misc05_picking_BulletPhysics.cpp b/misc05_picking/misc05_picking_BulletPhysics.cpp
@@ -368,7 +368,7 @@ int main( void )
 			// Bind our texture in Texture Unit 0
 			glActiveTexture(GL_TEXTURE0);
 			glBindTexture(GL_TEXTURE_2D, Texture);
-			// Set our "myTextureSampler" sampler to user Texture Unit 0
+			// Set our "myTextureSampler" sampler to use Texture Unit 0
 			glUniform1i(TextureID, 0);
 
 			// 1rst attribute buffer : vertices
diff --git a/misc05_picking/misc05_picking_custom.cpp b/misc05_picking/misc05_picking_custom.cpp
@@ -209,7 +209,7 @@ int main( void )
 	glfwWindowHint(GLFW_SAMPLES, 4);
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-	glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); // To make MacOS happy; should not be needed
+	glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); // To make MacOS happy; should not be needed
 	glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
 	// Open a window and create its OpenGL context
@@ -440,7 +440,7 @@ int main( void )
 			// Bind our texture in Texture Unit 0
 			glActiveTexture(GL_TEXTURE0);
 			glBindTexture(GL_TEXTURE_2D, Texture);
-			// Set our "myTextureSampler" sampler to user Texture Unit 0
+			// Set our "myTextureSampler" sampler to use Texture Unit 0
 			glUniform1i(TextureID, 0);
 
 			// 1rst attribute buffer : vertices
diff --git a/misc05_picking/misc05_picking_slow_easy.cpp b/misc05_picking/misc05_picking_slow_easy.cpp
@@ -40,7 +40,7 @@ int main( void )
 	glfwWindowHint(GLFW_SAMPLES, 4);
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-	glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); // To make MacOS happy; should not be needed
+	glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); // To make MacOS happy; should not be needed
 	glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 
 	// Open a window and create its OpenGL context
@@ -321,7 +321,7 @@ int main( void )
 			// Bind our texture in Texture Unit 0
 			glActiveTexture(GL_TEXTURE0);
 			glBindTexture(GL_TEXTURE_2D, Texture);
-			// Set our "myTextureSampler" sampler to user Texture Unit 0
+			// Set our "myTextureSampler" sampler to use Texture Unit 0
 			glUniform1i(TextureID, 0);
 
 			// 1rst attribute buffer : vertices
diff --git a/tutorial05_textured_cube/tutorial05.cpp b/tutorial05_textured_cube/tutorial05.cpp
@@ -195,7 +195,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial06_keyboard_and_mouse/tutorial06.cpp b/tutorial06_keyboard_and_mouse/tutorial06.cpp
@@ -202,7 +202,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial07_model_loading/tutorial07.cpp b/tutorial07_model_loading/tutorial07.cpp
@@ -131,7 +131,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial08_basic_shading/tutorial08.cpp b/tutorial08_basic_shading/tutorial08.cpp
@@ -148,7 +148,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial09_vbo_indexing/tutorial09.cpp b/tutorial09_vbo_indexing/tutorial09.cpp
@@ -174,7 +174,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial09_vbo_indexing/tutorial09_AssImp.cpp b/tutorial09_vbo_indexing/tutorial09_AssImp.cpp
@@ -169,7 +169,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial09_vbo_indexing/tutorial09_several_objects.cpp b/tutorial09_vbo_indexing/tutorial09_several_objects.cpp
@@ -180,7 +180,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
@@ -251,7 +251,7 @@ int main( void )
 		//// Bind our texture in Texture Unit 0
 		//glActiveTexture(GL_TEXTURE0);
 		//glBindTexture(GL_TEXTURE_2D, Texture);
-		//// Set our "myTextureSampler" sampler to user Texture Unit 0
+		//// Set our "myTextureSampler" sampler to use Texture Unit 0
 		//glUniform1i(TextureID, 0);
 		
 		
diff --git a/tutorial10_transparency/tutorial10.cpp b/tutorial10_transparency/tutorial10.cpp
@@ -178,7 +178,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial11_2d_fonts/tutorial11.cpp b/tutorial11_2d_fonts/tutorial11.cpp
@@ -178,7 +178,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial12_extensions/tutorial12.cpp b/tutorial12_extensions/tutorial12.cpp
@@ -242,7 +242,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial13_normal_mapping/tutorial13.cpp b/tutorial13_normal_mapping/tutorial13.cpp
@@ -208,19 +208,19 @@ int main( void )
 		// Bind our diffuse texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, DiffuseTexture);
-		// Set our "DiffuseTextureSampler" sampler to user Texture Unit 0
+		// Set our "DiffuseTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(DiffuseTextureID, 0);
 
 		// Bind our normal texture in Texture Unit 1
 		glActiveTexture(GL_TEXTURE1);
 		glBindTexture(GL_TEXTURE_2D, NormalTexture);
-		// Set our "Normal	TextureSampler" sampler to user Texture Unit 0
+		// Set our "NormalTextureSampler" sampler to use Texture Unit 1
 		glUniform1i(NormalTextureID, 1);
 
-		// Bind our normal texture in Texture Unit 2
+		// Bind our specular texture in Texture Unit 2
 		glActiveTexture(GL_TEXTURE2);
 		glBindTexture(GL_TEXTURE_2D, SpecularTexture);
-		// Set our "Normal	TextureSampler" sampler to user Texture Unit 0
+		// Set our "SpecularTextureSampler" sampler to use Texture Unit 2
 		glUniform1i(SpecularTextureID, 2);
 
 
diff --git a/tutorial14_render_to_texture/tutorial14.cpp b/tutorial14_render_to_texture/tutorial14.cpp
@@ -249,7 +249,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
@@ -319,7 +319,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, renderedTexture);
-		// Set our "renderedTexture" sampler to user Texture Unit 0
+		// Set our "renderedTexture" sampler to use Texture Unit 0
 		glUniform1i(texID, 0);
 
 		glUniform1f(timeID, (float)(glfwGetTime()*10.0f) );
diff --git a/tutorial15_lightmaps/tutorial15.cpp b/tutorial15_lightmaps/tutorial15.cpp
@@ -131,7 +131,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial16_shadowmaps/tutorial16.cpp b/tutorial16_shadowmaps/tutorial16.cpp
@@ -305,7 +305,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		glActiveTexture(GL_TEXTURE1);
@@ -375,7 +375,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, depthTexture);
-		// Set our "renderedTexture" sampler to user Texture Unit 0
+		// Set our "renderedTexture" sampler to use Texture Unit 0
 		glUniform1i(texID, 0);
 
 		// 1rst attribute buffer : vertices
diff --git a/tutorial16_shadowmaps/tutorial16_SimpleVersion.cpp b/tutorial16_shadowmaps/tutorial16_SimpleVersion.cpp
@@ -273,7 +273,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		glActiveTexture(GL_TEXTURE1);
diff --git a/tutorial17_rotations/tutorial17.cpp b/tutorial17_rotations/tutorial17.cpp
@@ -214,7 +214,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
  
 		// 1rst attribute buffer : vertices
diff --git a/tutorial18_billboards_and_particles/tutorial18_billboards.cpp b/tutorial18_billboards_and_particles/tutorial18_billboards.cpp
@@ -182,7 +182,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// This is the only interesting part of the tutorial.
diff --git a/tutorial18_billboards_and_particles/tutorial18_particles.cpp b/tutorial18_billboards_and_particles/tutorial18_particles.cpp
@@ -305,7 +305,7 @@ int main( void )
 		// Bind our texture in Texture Unit 0
 		glActiveTexture(GL_TEXTURE0);
 		glBindTexture(GL_TEXTURE_2D, Texture);
-		// Set our "myTextureSampler" sampler to user Texture Unit 0
+		// Set our "myTextureSampler" sampler to use Texture Unit 0
 		glUniform1i(TextureID, 0);
 
 		// Same as the billboards tutorial
