curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 11:04:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

making dithering work on skybox drawing

Browse Source
This commit is contained in:
minjaesong
2019-12-15 12:39:20 +09:00
parent b319485637
commit 3e5a581e89
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -392,7 +392,7 @@ public class AppLoader implements ApplicationListener {
// set GL graphics constants // set GL graphics constants
shaderBayerSkyboxFill = loadShader("assets/4096.vert", "assets/4096_bayer_skyboxfill.frag"); shaderBayerSkyboxFill = loadShader("assets/4096.vert", "assets/4096_bayer_skyboxfill.frag");
shaderHicolour = loadShader("assets/4096.vert", "assets/hicolour.frag"); shaderHicolour = loadShader("assets/4096.vert", "assets/hicolour.frag");
shaderPassthruRGB = loadShader("assets/4096.vert", "assets/passthrurgb.frag"); shaderPassthruRGB = SpriteBatch.createDefaultShader();
shaderColLUT = loadShader("assets/4096.vert", "assets/passthrurgb.frag"); shaderColLUT = loadShader("assets/4096.vert", "assets/passthrurgb.frag");
shaderReflect = loadShader("assets/4096.vert", "assets/reflect.frag"); shaderReflect = loadShader("assets/4096.vert", "assets/reflect.frag");

1
src/net/torvald/terrarum/DefaultConfig.kt
View File

@@ -103,6 +103,7 @@ object DefaultConfig {
// "fancy" graphics settings // "fancy" graphics settings
jsonObject.addProperty("fxdither", true)
jsonObject.addProperty("fxretro", false) jsonObject.addProperty("fxretro", false)
//jsonObject.addProperty("fx3dlut", false) //jsonObject.addProperty("fx3dlut", false)

10
src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt
View File

@@ -173,7 +173,15 @@ internal object WeatherMixer : RNGConsumer {
skyboxTexture.dispose() skyboxTexture.dispose()
skyboxTexture = Texture(skyboxPixmap); skyboxTexture.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear) skyboxTexture = Texture(skyboxPixmap); skyboxTexture.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear)
batch.shader = IngameRenderer.shaderBayer if (AppLoader.getConfigBoolean("fxdither")) {
batch.shader = IngameRenderer.shaderBayer
batch.shader.setUniformf("rcount", 64f)
batch.shader.setUniformf("gcount", 64f)
batch.shader.setUniformf("bcount", 64f)
}
else {
batch.shader = null
}
batch.inUse { batch.inUse {
it.draw(skyboxTexture, 0f, -AppLoader.halfScreenHf, AppLoader.screenWf, AppLoader.screenHf * 2f) // because of how the linear filter works, we extend the image by two it.draw(skyboxTexture, 0f, -AppLoader.halfScreenHf, AppLoader.screenWf, AppLoader.screenHf * 2f) // because of how the linear filter works, we extend the image by two
} }