Merge remote-tracking branch 'origin/master' into Animations

# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/CollisionTestLevel.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Collision/Collision.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Engine/Rendering/RenderSystem.cpp

resources/Shaders/DrawColorCorrection.frag.glsl

@@ -2,6 +2,8 @@
 
 layout (binding = 0) uniform sampler2D SceneTexture;
 layout (binding = 1) uniform sampler2D BloomTexture;
+layout (binding = 2) uniform sampler2D SceneTextureLowRes;
+layout (binding = 3) uniform sampler2D BloomTextureLowRes;
 uniform float Exposure;
 uniform float Gamma;
 
@@ -15,10 +17,19 @@ void main()
 {
 	vec4 hdrColor = texture(SceneTexture, Input.TextureCoordinate);
 	vec4 bloomColor = texture(BloomTexture, Input.TextureCoordinate);
+	vec4 hdrColorLowRes = texture(SceneTextureLowRes, Input.TextureCoordinate);
+	vec4 bloomColorLowRes = texture(BloomTextureLowRes, Input.TextureCoordinate);
 	hdrColor += bloomColor;
+	hdrColorLowRes;
 
+	float hdrColorsum = hdrColorLowRes.r + hdrColorLowRes.g + hdrColorLowRes.b;
 	//Toon mapping thingy
-	vec3 result = vec3(1.0) - exp(-hdrColor.rgb * Exposure);
+	vec3 result;
+	if(hdrColorsum > 0.0) {
+		result = vec3(1.0) - exp(-hdrColorLowRes.rgb * Exposure);
+	} else {
+		result = vec3(1.0) - exp(-hdrColor.rgb * Exposure);
+	}
 
 	//gamme correction
 	result = pow(result, vec3(1.0 / Gamma));

resources/Shaders/FillDepthBuffer.frag.glsl

@@ -0,0 +1,11 @@
+#version 430
+
+in VertexData{
+	vec3 Position;
+}Input;
+
+void main()
+{
+}
+
+

resources/Shaders/FillDepthBuffer.vert.glsl

@@ -0,0 +1,21 @@
+#version 430
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+
+layout(location = 0) in vec3 Position;
+layout(location = 5) in vec4 BoneIndices;
+layout(location = 6) in vec4 BoneWeights;
+
+
+out VertexData{
+	vec3 Position;
+}Output;
+
+void main()
+{
+	gl_Position = P * V * M * vec4(Position, 1.0);
+
+	Output.Position = Position;
+}

resources/Shaders/ShieldStencil.frag.glsl

@@ -0,0 +1,15 @@
+#version 430
+
+in VertexData{
+	vec3 Position;
+}Input;
+
+
+out vec4 fragmentColor;
+
+void main()
+{
+	fragmentColor = vec4(0.5, 0.0, 0.0, 0.0);
+}
+
+

resources/Shaders/ShieldStencil.vert.glsl

@@ -0,0 +1,19 @@
+#version 430
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+
+layout(location = 0) in vec3 Position;
+
+
+out VertexData{
+	vec3 Position;
+}Output;
+
+void main()
+{
+	gl_Position = P * V * M * vec4(Position, 1.0);
+
+	Output.Position = Position;
+}