Added BlendMode.Subtract, fixed line endings in default shader files

config/shaders/default/add.frag

@@ -1,12 +1,12 @@
-// Default fragment shader for ADD blend mode
-
-uniform sampler2D texture;
-
-void main()
-{
-	// lookup the pixel in the texture
-	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
-
-	// multiply it by the color
-	gl_FragColor = gl_Color * pixel;
-}
+// Default fragment shader for ADD blend mode
+
+uniform sampler2D texture;
+
+void main()
+{
+	// lookup the pixel in the texture
+	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
+
+	// multiply it by the color
+	gl_FragColor = gl_Color * pixel;
+}

config/shaders/default/alpha.frag

@@ -1,12 +1,12 @@
-// Default fragment shader for ALPHA blend mode
-
-uniform sampler2D texture;
-
-void main()
-{
-	// lookup the pixel in the texture
-	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
-
-	// multiply it by the color
-	gl_FragColor = gl_Color * pixel;
-}
+// Default fragment shader for ALPHA blend mode
+
+uniform sampler2D texture;
+
+void main()
+{
+	// lookup the pixel in the texture
+	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
+
+	// multiply it by the color
+	gl_FragColor = gl_Color * pixel;
+}

config/shaders/default/multiply.frag

@@ -1,15 +1,15 @@
-// Default fragment shader for MULTIPLY blend mode
-
-uniform sampler2D texture;
-
-void main()
-{
-	// lookup the pixel in the texture
-	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
-
-	// multiply it by the color
-	gl_FragColor = gl_Color * pixel;
-	
-	// this must be the last line in this shader
-	gl_FragColor.xyz *= gl_FragColor.w;
-}
+// Default fragment shader for MULTIPLY blend mode
+
+uniform sampler2D texture;
+
+void main()
+{
+	// lookup the pixel in the texture
+	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
+
+	// multiply it by the color
+	gl_FragColor = gl_Color * pixel;
+
+	// this must be the last line in this shader
+	gl_FragColor.xyz *= gl_FragColor.w;
+}

config/shaders/default/overlay.frag

@@ -1,16 +1,16 @@
-// Default fragment shader for OVERLAY blend mode
-// Texture color higher than 127,127,127 brightens the scene, lower than 127,127,127 darkens it.
-
-uniform sampler2D texture;
-
-void main()
-{
-	// lookup the pixel in the texture
-	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
-
-	// multiply it by the color
-	gl_FragColor = gl_Color * pixel;
-	
-	// this must be the last line in this shader
-	gl_FragColor = mix(vec4(0.5,0.5,0.5,1.0), gl_FragColor, gl_FragColor.w);
-}
+// Default fragment shader for OVERLAY blend mode
+// Texture color higher than 127,127,127 brightens the scene, lower than 127,127,127 darkens it.
+
+uniform sampler2D texture;
+
+void main()
+{
+	// lookup the pixel in the texture
+	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
+
+	// multiply it by the color
+	gl_FragColor = gl_Color * pixel;
+
+	// this must be the last line in this shader
+	gl_FragColor = mix(vec4(0.5,0.5,0.5,1.0), gl_FragColor, gl_FragColor.w);
+}

config/shaders/default/premultiplied.frag

@@ -1,16 +1,16 @@
-// Default fragment shader for PREMULTIPLIED blend mode
-
-uniform sampler2D texture;
-
-void main()
-{
-	// lookup the pixel in the texture
-	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
-
-	// multiply it by the color
-	gl_FragColor = gl_Color * pixel;
-	
-	// this must be the last line in this shader
-	// * sign(pixel.w) fixes the white border around some transparent pngs
-	gl_FragColor.xyz *= gl_Color.w * sign(pixel.w);
-}
+// Default fragment shader for PREMULTIPLIED blend mode
+
+uniform sampler2D texture;
+
+void main()
+{
+	// lookup the pixel in the texture
+	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
+
+	// multiply it by the color
+	gl_FragColor = gl_Color * pixel;
+
+	// this must be the last line in this shader
+	// * sign(pixel.w) fixes the white border around some transparent pngs
+	gl_FragColor.xyz *= gl_Color.w * sign(pixel.w);
+}

config/shaders/default/screen.frag

@@ -1,15 +1,15 @@
-// Default fragment shader for SCREEN blend mode
-
-uniform sampler2D texture;
-
-void main()
-{
-	// lookup the pixel in the texture
-	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
-
-	// multiply it by the color
-	gl_FragColor = gl_Color * pixel;
-	
-	// this must be the last line in this shader
-	gl_FragColor.xyz *= gl_FragColor.w;
-}
+// Default fragment shader for SCREEN blend mode
+
+uniform sampler2D texture;
+
+void main()
+{
+	// lookup the pixel in the texture
+	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
+
+	// multiply it by the color
+	gl_FragColor = gl_Color * pixel;
+
+	// this must be the last line in this shader
+	gl_FragColor.xyz *= gl_FragColor.w;
+}

config/shaders/default/subtract.frag

@@ -0,0 +1,12 @@
+// Default fragment shader for SUBTRACT blend mode
+
+uniform sampler2D texture;
+
+void main()
+{
+	// lookup the pixel in the texture
+	vec4 pixel = texture2D(texture, gl_TexCoord[0].xy);
+
+	// multiply it by the color
+	gl_FragColor = gl_Color * pixel;
+}

src/fe_blend.cpp

@@ -30,6 +30,12 @@ sf::BlendMode FeBlend::get_blend_mode( int blend_mode )
 		case FeBlend::Add:
 			return sf::BlendAdd;
 
+#if ( SFML_VERSION_INT >= FE_VERSION_INT( 2, 4, 0 ))
+		case FeBlend::Subtract:
+			return sf::BlendMode(sf::BlendMode::SrcAlpha, sf::BlendMode::One, sf::BlendMode::ReverseSubtract,
+								 sf::BlendMode::One, sf::BlendMode::One, sf::BlendMode::ReverseSubtract);
+#endif
+
 #if ( SFML_VERSION_INT >= FE_VERSION_INT( 2, 2, 0 ))
 		case FeBlend::Screen:
 			return sf::BlendMode(sf::BlendMode::One, sf::BlendMode::OneMinusSrcColor);
@@ -71,6 +77,7 @@ sf::Shader* FeBlend::get_default_shader( int blend_mode )
 	{
 		case FeBlend::Alpha:
 		case FeBlend::Add:
+		case FeBlend::Subtract:
 		case FeBlend::None:
 			return NULL;
 		case FeBlend::Screen:

src/fe_blend.hpp

@@ -37,6 +37,7 @@ class FeBlend
 	{ 
 		Alpha,
 		Add,
+		Subtract,
 		Screen,
 		Multiply,
 		Overlay,

src/fe_vm.cpp

@@ -580,6 +580,7 @@ bool FeVM::on_new_layout()
 		.Enum( _SC("BlendMode"), Enumeration()
 			.Const( _SC("Alpha"), FeBlend::Alpha )
 			.Const( _SC("Add"), FeBlend::Add )
+			.Const( _SC("Subtract"), FeBlend::Subtract )
 			.Const( _SC("Screen"), FeBlend::Screen )
 			.Const( _SC("Multiply"), FeBlend::Multiply )
 			.Const( _SC("Overlay"), FeBlend::Overlay )