Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various graphical fixes

Browse Source
This commit is contained in:
Anuken
2018-12-29 13:06:17 -05:00
parent 5b2c8ac337
commit 86b35fc43d
8 changed files with 59 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/assets/shaders/outline.fragment
+14 -12
View File
@@ -9,6 +9,7 @@ uniform sampler2D u_texture;
uniform vec4 u_color;
uniform vec2 u_texsize;
uniform float u_scl;
varying vec4 v_color;
varying vec2 v_texCoord;
@@ -17,26 +18,27 @@ void main() {
vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y);
vec4 c = texture2D(u_texture, v_texCoord.xy);
float spacing = SPACE * u_scl;
gl_FragColor = mix(c * v_color, u_color,
(1.0-step(0.1, texture2D(u_texture, v_texCoord.xy).a)) *
step(0.1,
//cardinals
texture2D(u_texture, v_texCoord.xy + vec2(0, SPACE) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(0, -SPACE) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(SPACE, 0) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(-SPACE, 0) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(0, spacing) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(0, -spacing) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(spacing, 0) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(-spacing, 0) * v).a +
//cardinal edges
texture2D(u_texture, v_texCoord.xy + vec2(SPACE, SPACE) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(SPACE, -SPACE) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(-SPACE, SPACE) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(-SPACE, -SPACE) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(spacing, spacing) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(spacing, -spacing) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(-spacing, spacing) * v).a +
texture2D(u_texture, v_texCoord.xy + vec2(-spacing, -spacing) * v).a +
//cardinals * 2
texture2D(u_texture, v_texCoord.xy + vec2(0, SPACE) * v*2.0).a +
texture2D(u_texture, v_texCoord.xy + vec2(0, -SPACE) * v*2.0).a +
texture2D(u_texture, v_texCoord.xy + vec2(SPACE, 0) * v*2.0).a +
texture2D(u_texture, v_texCoord.xy + vec2(-SPACE, 0) * v*2.0).a
texture2D(u_texture, v_texCoord.xy + vec2(0, spacing) * v*2.0).a +
texture2D(u_texture, v_texCoord.xy + vec2(0, -spacing) * v*2.0).a +
texture2D(u_texture, v_texCoord.xy + vec2(spacing, 0) * v*2.0).a +
texture2D(u_texture, v_texCoord.xy + vec2(-spacing, 0) * v*2.0).a
));
}