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

Shadow tweaks

Browse Source
This commit is contained in:
Anuken
2018-11-16 21:33:10 -05:00
parent eb62356313
commit d52f5e6e03
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/assets/shaders/outline.fragment
View File

@@ -3,7 +3,7 @@ precision mediump float;
precision mediump int; precision mediump int;
#endif #endif
#define SPACE 1.0 #define SPACE 2.0
uniform sampler2D u_texture; uniform sampler2D u_texture;
@@ -20,8 +20,23 @@ void main() {
gl_FragColor = mix(c * v_color, u_color, gl_FragColor = mix(c * v_color, u_color,
(1.0-step(0.1, texture2D(u_texture, v_texCoord.xy).a)) * (1.0-step(0.1, texture2D(u_texture, v_texCoord.xy).a)) *
step(0.1, texture2D(u_texture, v_texCoord.xy + vec2(0, SPACE) * v).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(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(-SPACE, 0) * v).a)); texture2D(u_texture, v_texCoord.xy + vec2(-SPACE, 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 +
//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
));
} }

5
core/src/io/anuke/mindustry/graphics/BlockRenderer.java
View File

@@ -60,7 +60,7 @@ public class BlockRenderer{
} }
public void drawShadows(){ public void drawShadows(){
Draw.color(0, 0, 0, 0.15f); Draw.color(0, 0, 0, 0.25f);
Draw.rect(shadowWrite.texture(), Draw.rect(shadowWrite.texture(),
Core.camera.position.x - Core.camera.position.x % tilesize, Core.camera.position.x - Core.camera.position.x % tilesize,
Core.camera.position.y - Core.camera.position.y % tilesize, Core.camera.position.y - Core.camera.position.y % tilesize,
@@ -117,7 +117,8 @@ public class BlockRenderer{
Team team = tile.getTeam(); Team team = tile.getTeam();
if(!expanded && block != Blocks.air && world.isAccessible(x, y)){ if(!expanded && block != Blocks.air && world.isAccessible(x, y)){
Draw.rect(tile.block().getEditorIcon(), tile.drawx(), tile.drawy()); tile.block().draw(tile);
//Draw.rect(tile.block().getEditorIcon(), tile.drawx(), tile.drawy());
//tile.block().drawShadow(tile); //tile.block().drawShadow(tile);
} }