Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer

resources/Shaders/Sprite.frag.glsl

@@ -30,12 +30,11 @@ void main()
 
 	float pos = ((P * vec4(Input.Position, 1)).y + 1.0)/2.0;
 	if(pos <= FillPercentage) {
-		color_result += FillColor;
+		color_result = FillColor*diffuseTexel.a;
 	}
 	sceneColor = vec4(color_result.xyz, clamp(color_result.a, 0, 1));
-	color_result += glowTexel*3;
 
-	bloomColor = vec4(clamp(color_result.xyz - 1.0, 0, 100), 1.0);
+	bloomColor = vec4(clamp((glowTexel.xyz*3) - 1.0, 0, 100), 1.0);
 }
 
 

resources/Shaders/Sprite.vert.glsl

@@ -16,7 +16,8 @@ out VertexData{
 
 void main()
 {
-	gl_Position = P  * M * vec4(Position, 1.0);
+
+	gl_Position = P * V * M * vec4(Position, 1.0);
 
 	Output.Position = Position;
 	Output.TextureCoordinate = TextureCoords;