Merge remote-tracking branch 'origin/master' into SmallFixes-Tobias

# Conflicts:
#	src/Engine/Rendering/DrawFinalPass.cpp

resources/Shaders/DrawColorCorrection.frag.glsl

@@ -19,6 +19,8 @@ void main()
 	vec4 bloomColor = texture(BloomTexture, Input.TextureCoordinate);
 	vec4 hdrColorLowRes = texture(SceneTextureLowRes, Input.TextureCoordinate);
 	vec4 bloomColorLowRes = texture(BloomTextureLowRes, Input.TextureCoordinate);
+
+	//hdrColor = hdrColor * SSAO;
 	hdrColor += bloomColor;
 	hdrColorLowRes;
 
@@ -33,7 +35,6 @@ void main()
 
 	//gamme correction
 	result = pow(result, vec3(1.0 / Gamma));
-
 	fragmentColor = vec4(result, 1.0);
 	//fragmentColor = hdrColor;
 	//fragmentColor = bloomColor;

resources/Shaders/ForwardPlus.frag.glsl

@@ -1,5 +1,7 @@
 #version 430
 
+#define MIN_AMBIENT_LIGHT 0.3
+
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -15,10 +17,11 @@ uniform vec2 DiffuseUVRepeat;
 uniform vec2 NormalUVRepeat;
 uniform vec2 SpecularUVRepeat;
 uniform vec2 GlowUVRepeat;
-layout (binding = 0) uniform sampler2D DiffuseTexture;
-layout (binding = 1) uniform sampler2D NormalMapTexture;
-layout (binding = 2) uniform sampler2D SpecularMapTexture;
-layout (binding = 3) uniform sampler2D GlowMapTexture;
+layout (binding = 0) uniform sampler2D AOTexture;
+layout (binding = 1) uniform sampler2D DiffuseTexture;
+layout (binding = 2) uniform sampler2D NormalMapTexture;
+layout (binding = 3) uniform sampler2D SpecularMapTexture;
+layout (binding = 4) uniform sampler2D GlowMapTexture;
 
 #define TILE_SIZE 16
 
@@ -120,6 +123,8 @@ vec4 CalcNormalMappedValue(vec3 normal, vec3 tangent, vec3 bitangent, vec2 textu
 
 void main()
 {
+	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy), 0).r;
+	ao = (clamp(1.0 - (1.0 - ao), 0.0, 1.0) + MIN_AMBIENT_LIGHT) /  (1.0 + MIN_AMBIENT_LIGHT);
 	vec4 diffuseTexel = texture2D(DiffuseTexture, Input.TextureCoordinate * DiffuseUVRepeat);
 	vec4 glowTexel = texture2D(GlowMapTexture, Input.TextureCoordinate * GlowUVRepeat);
 	vec4 specularTexel = texture2D(SpecularMapTexture, Input.TextureCoordinate * SpecularUVRepeat);
@@ -134,7 +139,7 @@ void main()
 	tilePos.y = int(gl_FragCoord.y/TILE_SIZE);
 
 	LightResult totalLighting;
-	totalLighting.Diffuse = vec4(AmbientColor.rgb, 1.0);
+	totalLighting.Diffuse = vec4(AmbientColor.rgb * ao, 1.0);
 	int currentTile = int(floor(gl_FragCoord.x/TILE_SIZE) + (floor(gl_FragCoord.y/TILE_SIZE) * int(ScreenDimensions.x/TILE_SIZE)));
 
 	int start = int(LightGrids.Data[currentTile].Start);
@@ -152,8 +157,8 @@ void main()
 		} else if (light.Type == 2) { //Directional
 			light_result = CalcDirectionalLightSource(V * light.Direction, light.Color, light.Intensity, viewVec, normal);
 		}
-		totalLighting.Diffuse += light_result.Diffuse;
-		totalLighting.Specular += light_result.Specular;
+		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao, light_result.Diffuse.a);
+		totalLighting.Specular += vec4(light_result.Specular.rgb * ao, light_result.Specular.a);
 	}
 
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);

resources/Shaders/ForwardPlusSplatMapRGB.frag.glsl

@@ -1,5 +1,7 @@
 #version 430
 
+#define MIN_AMBIENT_LIGHT 0.3
+
 uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
@@ -23,19 +25,20 @@ uniform vec2 SpecularUVRepeat3;
 uniform vec2 GlowUVRepeat1;
 uniform vec2 GlowUVRepeat2;
 uniform vec2 GlowUVRepeat3;
-layout (binding = 0) uniform sampler2D SplatMapTexture;
-layout (binding = 1) uniform sampler2D DiffuseTexture1;
-layout (binding = 2) uniform sampler2D DiffuseTexture2;
-layout (binding = 3) uniform sampler2D DiffuseTexture3;
-layout (binding = 4) uniform sampler2D NormalMapTexture1;
-layout (binding = 5) uniform sampler2D NormalMapTexture2;
-layout (binding = 6) uniform sampler2D NormalMapTexture3;
-layout (binding = 7) uniform sampler2D SpecularMapTexture1;
-layout (binding = 8) uniform sampler2D SpecularMapTexture2;
-layout (binding = 9) uniform sampler2D SpecularMapTexture3;
-layout (binding = 10) uniform sampler2D GlowMapTexture1;
-layout (binding = 11) uniform sampler2D GlowMapTexture2;
-layout (binding = 12) uniform sampler2D GlowMapTexture3;
+layout (binding = 0) uniform sampler2D AOTexture;
+layout (binding = 1) uniform sampler2D SplatMapTexture;
+layout (binding = 2) uniform sampler2D DiffuseTexture1;
+layout (binding = 3) uniform sampler2D DiffuseTexture2;
+layout (binding = 4) uniform sampler2D DiffuseTexture3;
+layout (binding = 5) uniform sampler2D NormalMapTexture1;
+layout (binding = 6) uniform sampler2D NormalMapTexture2;
+layout (binding = 7) uniform sampler2D NormalMapTexture3;
+layout (binding = 8) uniform sampler2D SpecularMapTexture1;
+layout (binding = 9) uniform sampler2D SpecularMapTexture2;
+layout (binding = 10) uniform sampler2D SpecularMapTexture3;
+layout (binding = 11) uniform sampler2D GlowMapTexture1;
+layout (binding = 12) uniform sampler2D GlowMapTexture2;
+layout (binding = 13) uniform sampler2D GlowMapTexture3;
 
 #define TILE_SIZE 16
 
@@ -174,6 +177,9 @@ vec4 CalcBlendedNormal(vec4 blendValue, sampler2D R, sampler2D G, sampler2D B,
 
 void main()
 {
+	float ao = texelFetch(AOTexture, ivec2(gl_FragCoord.xy), 0).r;
+	ao = (clamp(1.0 - (1.0 - ao), 0.0, 1.0) + MIN_AMBIENT_LIGHT) /  (1.0 + MIN_AMBIENT_LIGHT);
+
 	vec4 splatTexel = texture2D(SplatMapTexture, Input.TextureCoordinate);
 
 	vec4 diffuseTexel = CalcBlendedTexel(splatTexel, DiffuseTexture1, DiffuseTexture2, DiffuseTexture3,
@@ -195,7 +201,7 @@ void main()
 	tilePos.y = int(gl_FragCoord.y/TILE_SIZE);
 
 	LightResult totalLighting;
-	totalLighting.Diffuse = vec4(AmbientColor.rgb, 1.0);
+	totalLighting.Diffuse = vec4(AmbientColor.rgb * ao, 1.0);
 	int currentTile = int(floor(gl_FragCoord.x/TILE_SIZE) + (floor(gl_FragCoord.y/TILE_SIZE) * int(ScreenDimensions.x/TILE_SIZE)));
 
 	int start = int(LightGrids.Data[currentTile].Start);
@@ -213,8 +219,8 @@ void main()
 		} else if (light.Type == 2) { //Directional
 			light_result = CalcDirectionalLightSource(V * light.Direction, light.Color, light.Intensity, viewVec, normal);
 		}
-		totalLighting.Diffuse += light_result.Diffuse;
-		totalLighting.Specular += light_result.Specular;
+		totalLighting.Diffuse += vec4(light_result.Diffuse.rgb * ao, light_result.Diffuse.a);
+		totalLighting.Specular += vec4(light_result.Specular.rgb * ao, light_result.Specular.a);
 	}
 
 	vec4 color_result = mix((Color * diffuseTexel * DiffuseColor), Input.ExplosionColor, Input.ExplosionPercentageElapsed);

resources/Shaders/SSAO.frag.glsl

@@ -0,0 +1,114 @@
+#version 430
+
+//Number of samples per pixel
+uniform int           uNumOfSamples;
+//#define NUM_SAMPLES (11)
+
+//Number of turns around the cirle
+uniform int           uNumOfTurns;
+//#define NUM_TURNS (7)
+
+layout (binding = 0) uniform sampler2D ViewSpaceZ;
+
+uniform vec4 uProjInfo;
+
+uniform float           uProjScale;
+//#define ProjScale 500
+
+uniform float           uRadius;
+//#define Radius 1.0f
+
+uniform float           uBias;
+//#define Bias 0.012f
+
+uniform float           uContrast;
+//#define IntensityDivR6 1
+
+uniform float           uIntensityScale;
+
+out float				AO;
+
+vec3 getVSPosition(ivec2 ScreenSpaceCoord) {
+    float z = texelFetch(ViewSpaceZ, ScreenSpaceCoord, 0).r;
+    //Get the xy view space coordinates and add the z value from ViewSpaceZ buffer.
+    return vec3((uProjInfo[0] + (ScreenSpaceCoord.x * uProjInfo[1])) * z, (uProjInfo[2] + (ScreenSpaceCoord.y * uProjInfo[3])) * z, z);
+}
+
+vec3 getVSFaceNormal(vec3 ViewSpacePosition) {
+	// Get tangets vector for the plane and ViewSpacePositin... don't ask how this functions works. It's pure magic. 
+	// They do this and it just works... I would guess that they approximate the function of a plane from pixels close to the pixel were on now.
+	return normalize(cross(dFdx(ViewSpacePosition), dFdy(ViewSpacePosition)));
+}
+
+
+vec3 getSampleViewSpacePos(ivec2 ScreenSpaceCoord, int SampleIndex, float RotationAngle, float ScreenSpaceSampleRadius){
+	// Pure Magic...
+	float alpha = float(SampleIndex) * (1.0 / uNumOfSamples);
+
+	// Angle to where to sample
+    float angle = alpha * (uNumOfTurns * 6.28) + RotationAngle;
+
+	//Lenght to were to sample
+    ScreenSpaceSampleRadius = ScreenSpaceSampleRadius * alpha;
+
+    vec2 screenSpaceSampleOffsetVecor = vec2(cos(angle), sin(angle));
+
+    // Get texel coordinate on where to sample by going screenSpaceSampleOffsetVecor direction in ScreenSpaceSampleRadius units from ScreenSpaceCoord (the point being shaded);
+    ivec2 screenSpaceSampleTexel = ivec2(ScreenSpaceSampleRadius * screenSpaceSampleOffsetVecor) + ScreenSpaceCoord;
+
+    return getVSPosition(screenSpaceSampleTexel);
+}
+
+
+
+float sampleAO(ivec2 ScreenSpaceCoord, vec3 Origin, vec3 OriginNormal, float ScreenSpaceSampleRadius, int SampleIndex, float RotationAngle, float Radius) {
+	float radius2 = Radius * Radius;
+	vec3 sampleViewSpacePosition = getSampleViewSpacePos(ScreenSpaceCoord, SampleIndex, RotationAngle, ScreenSpaceSampleRadius);
+
+	vec3 sampleVector = Origin - sampleViewSpacePosition;
+
+	// vv = sampleVectorLenght ^ 2
+	float vv = dot(sampleVector, sampleVector);
+	// vn = angle between sampleVector and Normal
+	float vn = dot(sampleVector, OriginNormal);
+
+	const float epsilon = 0.0001f;
+
+	// vv < radius2 if the vector is shorter then the radius;
+	// vn - bias, offset the angle to reduse self occlusion. 
+	// epsilon is here to make divison by 0 impossible.
+	return float(vv < radius2) * max((vn - uBias) / (epsilon + vv), 0.0);
+	//float f = max(radius2 - vv, 0.0); 
+	//return f * f * f * max((vn - uBias) / (epsilon + vv), 0.0);
+}
+
+
+void main() {
+	ivec2 originScreenCoord = ivec2(gl_FragCoord.xy);
+
+	vec3 origin = getVSPosition(originScreenCoord);
+
+	float radius;
+	if(origin.z < uRadius){
+		radius = origin.z;
+	} else {
+		radius = uRadius;
+	}
+
+
+	vec3 originNormal = getVSFaceNormal(origin);
+
+	float screenSpaceSampleRadius = -uProjScale * radius / origin.z;
+
+	float rotationAngleOffset = 30 * originScreenCoord.x ^ originScreenCoord.y + 10 * originScreenCoord.x * originScreenCoord.y;
+
+	float sum = 0.0;
+    for (int i = 0; i < uNumOfSamples; i++) {
+        sum += sampleAO(originScreenCoord, origin, originNormal, screenSpaceSampleRadius, i, rotationAngleOffset, radius);
+    }
+
+    //float A = max(0.0, 1.0 - sum * (2.0f / uNumOfSamples));
+    float A = 1.0 - sum * (2.0f * uIntensityScale / float(uNumOfSamples));
+    AO = clamp(pow(A, uContrast), 0.0f, 1.0f);
+	//AO = vec4(originNormal, 1.0f);
+}

resources/Shaders/SSAO.vert.glsl

@@ -0,0 +1,8 @@
+#version 430
+
+layout (location = 0) in vec3 Position;
+
+void main()
+{
+	gl_Position = vec4(Position, 1.0);
+}

resources/Shaders/SSAOViewSpaceZ.frag.glsl

@@ -0,0 +1,14 @@
+#version 430
+
+layout (binding = 0) uniform sampler2D DepthBuffer;
+uniform vec3 ClipInfo;
+
+out float depthLinear;
+//Just for Debug, should be depthLinear
+//out vec4 fragmentColor;
+void main() {
+	float depthSample = texelFetch(DepthBuffer, ivec2(gl_FragCoord.xy), 0).r;
+	depthLinear = ClipInfo[0] / (ClipInfo[1] * depthSample + ClipInfo[2]);
+	//float depthLinear = (NearClip) / ( -depthSample + 1.0f);
+	//fragmentColor = vec4(depthLinear, depthLinear, depthLinear, 1.0f);
+}

resources/Shaders/Sprite.frag.glsl

@@ -7,8 +7,8 @@ uniform mat4 M;
 uniform mat4 V;
 uniform mat4 P;
 
-layout (binding = 0) uniform sampler2D DiffuseTexture;
-layout (binding = 1) uniform sampler2D GlowMapTexture;
+layout (binding = 1) uniform sampler2D DiffuseTexture;
+layout (binding = 2) uniform sampler2D GlowMapTexture;
 
 
 in VertexData{