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

raw strings for SurfaceShaders (#4004)

Browse Source 
* SurfaceShaders thing

* Update core/src/mindustry/graphics/Shaders.java

spacing fix

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>

* star import

Co-authored-by: Antsiferov Andrew <summet.dev@gmail.com>
This commit is contained in:
Xelo
2020-12-17 11:39:08 +11:00
committed by GitHub
parent d0bf3d6fa1
commit 9a88426ff7
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/mindustry/graphics/Shaders.java
View File

@@ -1,6 +1,7 @@
package mindustry.graphics; package mindustry.graphics;
import arc.*; import arc.*;
import arc.files.*;
import arc.graphics.*; import arc.graphics.*;
import arc.graphics.Texture.*; import arc.graphics.Texture.*;
import arc.graphics.g2d.*; import arc.graphics.g2d.*;
@@ -225,11 +226,18 @@ public class Shaders{
} }
} }
public static class SurfaceShader extends LoadShader{ public static class SurfaceShader extends Shader{
public SurfaceShader(String frag){ public SurfaceShader(String frag){
super(frag, "screenspace"); super(getShaderFi("screenspace.vert"), getShaderFi(frag + ".frag"));
loadNoise();
}
public SurfaceShader(String vertRaw, String fragRaw){
super(vertRaw, fragRaw);
loadNoise();
}
public void loadNoise(){
Core.assets.load("sprites/noise.png", Texture.class).loaded = t -> { Core.assets.load("sprites/noise.png", Texture.class).loaded = t -> {
((Texture)t).setFilter(TextureFilter.linear); ((Texture)t).setFilter(TextureFilter.linear);
((Texture)t).setWrap(TextureWrap.repeat); ((Texture)t).setWrap(TextureWrap.repeat);
@@ -252,9 +260,12 @@ public class Shaders{
} }
public static class LoadShader extends Shader{ public static class LoadShader extends Shader{
public LoadShader(String frag, String vert){ public LoadShader(String frag, String vert){
super(Core.files.internal("shaders/" + vert + ".vert"), Core.files.internal("shaders/" + frag + ".frag")); super(getShaderFi(vert + ".vert"), getShaderFi(frag + ".frag"));
} }
} }
public static Fi getShaderFi(String file){
return Core.files.internal("shaders/" + file);
}
} }