Chapter 5 revisions complete?

chalonverse · chalonverse · commit ecafeb593bbe · 2017-11-24T23:39:26.000-08:00
diff --git a/Chapter05/Game.cpp b/Chapter05/Game.cpp
@@ -178,16 +178,15 @@ void Game::UpdateGame()
 
 void Game::GenerateOutput()
 {
-	// Set the clear color to dark green
+	// Set the clear color to grey
 	glClearColor(0.86f, 0.86f, 0.86f, 1.0f);
 	// Clear the color buffer
 	glClear(GL_COLOR_BUFFER_BIT);
 	
 	// Draw all sprite components
 	// Enable alpha blending on the color buffer
 	glEnable(GL_BLEND);
-	glBlendEquationSeparate(GL_FUNC_ADD, GL_FUNC_ADD);
-	glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ZERO);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	
 	// Set shader/vao as active
 	mSpriteShader->SetActive();
diff --git a/Chapter05/Game.vcxproj b/Chapter05/Game.vcxproj
@@ -50,6 +50,7 @@
     <None Include="Shaders\Basic.vert" />
     <None Include="Shaders\Sprite.frag" />
     <None Include="Shaders\Sprite.vert" />
+    <None Include="Shaders\Transform.vert" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BC508D87-495F-4554-932D-DD68388B63CC}</ProjectGuid>
diff --git a/Chapter05/Game.vcxproj.filters b/Chapter05/Game.vcxproj.filters
@@ -119,5 +119,8 @@
     <None Include="Shaders\Basic.vert">
       <Filter>Shaders</Filter>
     </None>
+    <None Include="Shaders\Transform.vert">
+      <Filter>Shaders</Filter>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/Chapter05/Shaders/Sprite.frag b/Chapter05/Shaders/Sprite.frag
@@ -21,5 +21,5 @@ uniform sampler2D uTexture;
 void main()
 {
 	// Sample color from texture
-    outColor = texture(uTexture, fragTexCoord);
+	outColor = texture(uTexture, fragTexCoord);
 }
diff --git a/Chapter05/Shaders/Sprite.vert b/Chapter05/Shaders/Sprite.vert
@@ -17,14 +17,14 @@ uniform mat4 uViewProj;
 layout(location = 0) in vec3 inPosition;
 layout(location = 1) in vec2 inTexCoord;
 
-// Any vertex outputs (other than position)
+// Add texture coordinate as output
 out vec2 fragTexCoord;
 
 void main()
 {
 	// Convert position to homogeneous coordinates
 	vec4 pos = vec4(inPosition, 1.0);
-	// Transform to position world space, then clip space
+	// Transform position to world space, then clip space
 	gl_Position = pos * uWorldTransform * uViewProj;
 
 	// Transform
diff --git a/Chapter05/Shaders/Transform.vert b/Chapter05/Shaders/Transform.vert
@@ -0,0 +1,23 @@
+// ----------------------------------------------------------------
+// From Game Programming in C++ by Sanjay Madhav
+// Copyright (C) 2017 Sanjay Madhav. All rights reserved.
+// 
+// Released under the BSD License
+// See LICENSE in root directory for full details.
+// ----------------------------------------------------------------
+
+// Request GLSL 3.3
+#version 330
+
+// Uniforms for world transform and view-proj
+uniform mat4 uWorldTransform;
+uniform mat4 uViewProj;
+
+// Vertex attributes
+in vec3 inPosition;
+
+void main()
+{
+	vec4 pos = vec4(inPosition, 1.0);
+	gl_Position = pos * uWorldTransform * uViewProj;
+}
diff --git a/Chapter05/Texture.cpp b/Chapter05/Texture.cpp
@@ -51,7 +51,7 @@ bool Texture::Load(const std::string& fileName)
 	
 	SOIL_free_image_data(image);
 	
-	// Enable linear filtering
+	// Enable bilinear filtering
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	
diff --git a/Chapter05/Texture.h b/Chapter05/Texture.h
@@ -22,7 +22,9 @@ class Texture
 	int GetWidth() const { return mWidth; }
 	int GetHeight() const { return mHeight; }
 private:
+	// OpenGL ID of this texture
 	unsigned int mTextureID;
+	// Width/height of the texture
 	int mWidth;
 	int mHeight;
 };

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,5 @@ uniform sampler2D uTexture;`
`21`	`21`	`void main()`
`22`	`22`	`{`
`23`	`23`	`// Sample color from texture`
`24`		`- outColor = texture(uTexture, fragTexCoord);`
	`24`	`+ outColor = texture(uTexture, fragTexCoord);`
`25`	`25`	`}`