Refactored geometry shader example, added normal map toggle, updated shaders, etc.

data/shaders/geometryshader/base.vert

@@ -8,6 +8,11 @@ layout (location = 1) in vec3 inNormal;
 
 layout (location = 0) out vec3 outNormal;
 
+out gl_PerVertex
+{
+	vec4 gl_Position;
+};
+
 void main(void)
 {
 	outNormal = inNormal;

data/shaders/geometryshader/mesh.frag

@@ -3,23 +3,21 @@
 #extension GL_ARB_separate_shader_objects : enable
 #extension GL_ARB_shading_language_420pack : enable
 
-layout (location = 0) in vec2 vTexcoord;
-layout (location = 1) in vec3 vNormal;
-layout (location = 2) in vec3 vColor;
-layout (location = 3) in vec3 vEyePos;
-layout (location = 4) in vec3 vLightVec;
+layout (location = 0) in vec3 inNormal;
+layout (location = 1) in vec3 inColor;
+layout (location = 2) in vec3 inViewVec;
+layout (location = 3) in vec3 inLightVec;
 
 layout (location = 0) out vec4 outFragColor;
 
 void main() 
 {
-  vec3 Eye = normalize(-vEyePos);
-  vec3 Reflected = normalize(reflect(-vLightVec, vNormal)); 
- 
-  vec4 IAmbient = vec4(0.2, 0.2, 0.2, 1.0);
-  vec4 IDiffuse = vec4(0.5, 0.5, 0.5, 0.5) * max(dot(vNormal, vLightVec), 0.0);
-  float specular = 0.75;
-  vec4 ISpecular = vec4(0.5, 0.5, 0.5, 1.0) * pow(max(dot(Reflected, Eye), 0.0), 0.8) * specular; 
- 
-  outFragColor = vec4((IAmbient + IDiffuse) * vec4(vColor, 1.0) + ISpecular);
+	vec3 N = normalize(inNormal);
+	vec3 L = normalize(inLightVec);
+	vec3 V = normalize(inViewVec);
+	vec3 R = reflect(-L, N);
+	vec3 ambient = vec3(0.1);
+	vec3 diffuse = max(dot(N, L), 0.0) * vec3(1.0);
+	vec3 specular = pow(max(dot(R, V), 0.0), 16.0) * vec3(0.75);
+	outFragColor = vec4((ambient + diffuse) * inColor.rgb + specular, 1.0);		
 }

data/shaders/geometryshader/mesh.vert

@@ -5,28 +5,34 @@
 
 layout (location = 0) in vec4 inPos;
 layout (location = 1) in vec3 inNormal;
-layout (location = 2) in vec2 inTexCoord;
-layout (location = 3) in vec3 inColor;
+layout (location = 2) in vec3 inColor;
 
-layout (binding = 0) uniform UBO 
+layout (set = 0, binding = 0) uniform UBO 
 {
 	mat4 projection;
 	mat4 model;
 } ubo;
 
-layout (location = 0) out vec2 vTexcoord;
-layout (location = 1) out vec3 vNormal;
-layout (location = 2) out vec3 vColor;
-layout (location = 3) out vec3 vEyePos;
-layout (location = 4) out vec3 vLightVec;
+layout (location = 0) out vec3 outNormal;
+layout (location = 1) out vec3 outColor;
+layout (location = 2) out vec3 outViewVec;
+layout (location = 3) out vec3 outLightVec;
+
+out gl_PerVertex
+{
+	vec4 gl_Position;
+};
 
 void main() 
 {
-	vTexcoord = inTexCoord.st;
-	vNormal = inNormal;
-	vColor = inColor;
+	outNormal = inNormal;
+	outColor = inColor;
 	gl_Position = ubo.projection * ubo.model * inPos;
-	vEyePos = vec3(ubo.model * inPos);
-	vec4 lightPos = vec4(0.0, 0.0, 0.0, 1.0) * ubo.model;
-	vLightVec = normalize(lightPos.xyz - vEyePos);
+
+	vec4 pos = ubo.model * vec4(inPos.xyz, 1.0);
+	outNormal = mat3(ubo.model) * inNormal;
+
+	vec3 lightPos = vec3(1.0f, -1.0f, 1.0f);
+	outLightVec = lightPos.xyz - pos.xyz;
+	outViewVec = -pos.xyz;		
 }

data/shaders/geometryshader/normaldebug.geom

@@ -18,7 +18,7 @@ layout (location = 0) out vec3 outColor;
 
 void main(void)
 {	
-	float normalLength = 0.015;
+	float normalLength = 0.02;
 	for(int i=0; i<gl_in.length(); i++)
 	{
 		vec3 pos = gl_in[i].gl_Position.xyz;