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

Conflicts: include/Engine/Rendering/DrawFinalPass.h
2016-03-09 16:54:26 +01:00
parent 91cad561a4 3ea1177425
commit fad93ca5aa
97 changed files with 5766 additions and 8259 deletions
@@ -33,7 +33,8 @@ void main()
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));

 	//bloomColor = vec4(clamp((glowTexel.xyz*3) - 1.0, 0, 100), 1.0);
-	bloomColor = vec4(1.0, 1.0, 1.0, 0.0);
+	bloomColor = vec4(max(color_result.xyz - 1.0, 0.0), clamp(color_result.a, 0, 1));
+	//bloomColor = vec4(1.0, 1.0, 1.0, 0.0);
 }