Merge pull request #103 from teamfisk/WeaponSystem

Working weapon system
2016-02-11 23:16:44 +01:00
parent bdec4f9d16 7cae84d4ee
commit c4c53944d9
31 changed files with 777 additions and 301 deletions
@@ -34,7 +34,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(clamp((glowTexel.xyz*3) - 1.0, 0, 100), 1.0);
+	bloomColor = vec4(1.0, 1.0, 1.0, 0.0);
 }