diff --git a/assets/shaders/alphadither.frag b/assets/shaders/alphadither.frag index 151f57eb8..e4080020e 100644 --- a/assets/shaders/alphadither.frag +++ b/assets/shaders/alphadither.frag @@ -29,6 +29,6 @@ void main() { vec4 selvec = vec4(0.0, 0.0, 0.0, (alpha > bayerThreshold) ? 1.0 : 0.0); -// gl_FragColor = inColor * boolean.yyyx + selvec; - gl_FragColor = inColor; + gl_FragColor = inColor * boolean.yyyx + selvec; +// gl_FragColor = inColor; } \ No newline at end of file diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt index b6c89c97b..6ea654ceb 100644 --- a/src/net/torvald/terrarum/Terrarum.kt +++ b/src/net/torvald/terrarum/Terrarum.kt @@ -358,8 +358,8 @@ fun blendDisable(batch: SpriteBatch) { fun blendNormal(batch: SpriteBatch) { batch.enableBlending() -// batch.setBlendFunction(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA) - batch.setBlendFunctionSeparate(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA, GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA) +// batch.setBlendFunction(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA) // for premultiplied textures + batch.setBlendFunctionSeparate(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA, GL20.GL_ONE, GL20.GL_ONE_MINUS_SRC_ALPHA) // for not premultiplied textures // ALPHA *MUST BE* PREMULTIPLIED // @@ -393,8 +393,8 @@ fun gdxSetBlend() { fun gdxSetBlendNormal() { gdxSetBlend() -// Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA) - Gdx.gl.glBlendFuncSeparate(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA, GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA) +// Gdx.gl.glBlendFunc(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA) // for premultiplied textures + Gdx.gl.glBlendFuncSeparate(GL20.GL_SRC_ALPHA, GL20.GL_ONE_MINUS_SRC_ALPHA, GL20.GL_ONE, GL20.GL_ONE_MINUS_SRC_ALPHA) // for not premultiplied textures // ALPHA *MUST BE* PREMULTIPLIED //