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

more 'correct' dithering equation

Browse Source
This commit is contained in:
minjaesong
2022-04-12 11:16:58 +09:00
parent 9b2d85c640
commit b92b53352b
3 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/PostProcessor.kt
View File

@@ -159,7 +159,7 @@ object PostProcessor : Disposable {
shader.setUniformi("u_texture", 0) shader.setUniformi("u_texture", 0)
shader.setUniformi("rnd", rng.nextInt(8192), rng.nextInt(8192)) shader.setUniformi("rnd", rng.nextInt(8192), rng.nextInt(8192))
shader.setUniformi("u_pattern", 1) shader.setUniformi("u_pattern", 1)
shader.setUniformf("quant", shaderQuant[App.getConfigInt("displaycolourdepth")] ?: 255f) shader.setUniformf("quant", 2f)//shaderQuant[App.getConfigInt("displaycolourdepth")] ?: 255f)
App.fullscreenQuad.render(shader, GL20.GL_TRIANGLES) App.fullscreenQuad.render(shader, GL20.GL_TRIANGLES)

8
src/shaders/postproc_dither.frag
View File

@@ -5,7 +5,7 @@
#version 130 #version 130
#ifdef GL_ES #ifdef GL_ES
precision mediump float; precision mediump float;
#endif #endif
@@ -26,7 +26,7 @@ uniform ivec2 rnd = ivec2(0,0);
uniform float quant = 255.0; // 64 steps -> 63.0; 256 steps -> 255.0 uniform float quant = 255.0; // 64 steps -> 63.0; 256 steps -> 255.0
vec2 boolean = vec2(0.0, 1.0); vec2 boolean = vec2(0.0, 1.0);
vec4 halfvec = vec4(0.5); vec4 matrixNormaliser = vec4(0.5 / 256.0);
vec2 patternsize = vec2(1.0/512.0, 1.0/512.0); vec2 patternsize = vec2(1.0/512.0, 1.0/512.0);
@@ -46,11 +46,11 @@ mat4 ycocg_to_rgb = mat4(
vec4 nearestColour(vec4 inColor) { vec4 nearestColour(vec4 inColor) {
return floor(vec4(quant) * inColor + halfvec) * vec4(1.0 / quant); return floor(vec4(quant) * inColor) * vec4(1.0 / quant);
} }
vec4 getDitherredDot(vec4 inColor) { vec4 getDitherredDot(vec4 inColor) {
vec4 bayerThreshold = vec4(texture2D(u_pattern, (gl_FragCoord.xy + rnd) * patternsize) - 0.5); vec4 bayerThreshold = vec4(matrixNormaliser + texture2D(u_pattern, (gl_FragCoord.xy + rnd) * patternsize));
return nearestColour(bayerThreshold * vec4(1.0 / quant) + inColor); return nearestColour(bayerThreshold * vec4(1.0 / quant) + inColor);
} }

29
src/shaders/postproc_nodither.frag
View File

@@ -26,35 +26,22 @@ uniform ivec2 rnd = ivec2(0,0);
uniform float quant = 255.0; // 64 steps -> 63.0; 256 steps -> 255.0 uniform float quant = 255.0; // 64 steps -> 63.0; 256 steps -> 255.0
vec2 boolean = vec2(0.0, 1.0); vec2 boolean = vec2(0.0, 1.0);
vec4 halfvec = vec4(0.5);
vec2 patternsize = vec2(1.0/512.0, 1.0/512.0);
mat4 rgb_to_ycocg = mat4( mat4 rgb_to_ycocg = mat4(
0.25, 1.0, -0.5, 0.0, 0.25, 1.0, -0.5, 0.0,
0.5, 0.0, 1.0, 0.0, 0.5, 0.0, 1.0, 0.0,
0.25, -1.0, -0.5, 0.0, 0.25, -1.0, -0.5, 0.0,
0.0, 0.0, 0.0, 1.0 0.0, 0.0, 0.0, 1.0
); );
mat4 ycocg_to_rgb = mat4( mat4 ycocg_to_rgb = mat4(
1.0, 1.0, 1.0, 0.0, 1.0, 1.0, 1.0, 0.0,
0.5, 0.0, -0.5, 0.0, 0.5, 0.0, -0.5, 0.0,
-0.5, 0.5, -0.5, 0.0, -0.5, 0.5, -0.5, 0.0,
0.0, 0.0, 0.0, 1.0 0.0, 0.0, 0.0, 1.0
); );
vec4 nearestColour(vec4 inColor) {
return floor(vec4(quant) * inColor + halfvec) * vec4(1.0 / quant);
}
vec4 getDitherredDot(vec4 inColor) {
vec4 bayerThreshold = vec4(texture2D(u_pattern, (gl_FragCoord.xy + rnd) * patternsize) - 0.5);
return nearestColour(bayerThreshold * vec4(1.0 / quant) + inColor);
}
uniform vec4 vibrancy = vec4(1.0);//vec4(1.0, 1.4, 1.2, 1.0); uniform vec4 vibrancy = vec4(1.0);//vec4(1.0, 1.4, 1.2, 1.0);
void main(void) { void main(void) {