curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-10 13:51:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

simplified the tiling shader a bit

Browse Source
This commit is contained in:
minjaesong
2020-04-13 02:13:24 +09:00
parent 07b9e76090
commit 0200fa8803
7 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/net/torvald/terrarum/AppLoader.java
View File

@@ -396,11 +396,11 @@ public class AppLoader implements ApplicationListener {
CommonResourcePool.INSTANCE.addToLoadingList("title_health2", () -> new Texture(Gdx.files.internal("./assets/graphics/gui/health_distance.tga")));
// set GL graphics constants
shaderBayerSkyboxFill = loadShader("assets/4096.vert", "assets/4096_bayer_skyboxfill.frag");
shaderHicolour = loadShader("assets/4096.vert", "assets/hicolour.frag");
shaderBayerSkyboxFill = loadShaderFromFile("assets/4096.vert", "assets/4096_bayer_skyboxfill.frag");
shaderHicolour = loadShaderFromFile("assets/4096.vert", "assets/hicolour.frag");
shaderPassthruRGB = SpriteBatch.createDefaultShader();
shaderColLUT = loadShader("assets/4096.vert", "assets/passthrurgb.frag");
shaderReflect = loadShader("assets/4096.vert", "assets/reflect.frag");
shaderColLUT = loadShaderFromFile("assets/4096.vert", "assets/passthrurgb.frag");
shaderReflect = loadShaderFromFile("assets/4096.vert", "assets/reflect.frag");
fullscreenQuad = new Mesh(
true, 4, 6,
@@ -1182,7 +1182,7 @@ public class AppLoader implements ApplicationListener {
System.out.println("[" + out + "] " + message.toString());
}
public static ShaderProgram loadShader(String vert, String frag) {
public static ShaderProgram loadShaderFromFile(String vert, String frag) {
ShaderProgram s = new ShaderProgram(Gdx.files.internal(vert), Gdx.files.internal(frag));
if (s.getLog().toLowerCase().contains("error")) {
@@ -1192,6 +1192,16 @@ public class AppLoader implements ApplicationListener {
return s;
}
public static ShaderProgram loadShaderInline(String vert, String frag) {
ShaderProgram s = new ShaderProgram(vert, frag);
if (s.getLog().toLowerCase().contains("error")) {
throw new Error(String.format("Shader program loaded with %s, %s failed:\n%s", vert, frag, s.getLog()));
}
return s;
}
public static void measureDebugTime(String name, kotlin.jvm.functions.Function0<kotlin.Unit> block) {
if (IS_DEVELOPMENT_BUILD) {
//debugTimers.put(name, kotlin.system.TimingKt.measureNanoTime(block));