blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Workbench: Dither background color/gradient

This commit is contained in:
Jeroen Bakker 2018-04-25 11:30:38 +02:00
parent 35220ccde0
commit f938ff1010
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/draw/CMakeLists.txt
View File

@ -212,6 +212,7 @@ data_to_c_simple(engines/workbench/shaders/workbench_prepass_vert.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_prepass_frag.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_composite_frag.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_background_lib.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_common_lib.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_data_lib.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_object_overlap_lib.glsl SRC)
data_to_c_simple(engines/workbench/shaders/workbench_world_light_lib.glsl SRC)

2
source/blender/draw/engines/workbench/shaders/workbench_background_lib.glsl
View File

@ -1,3 +1,3 @@
vec3 background_color(WorldData world_data, float y) {
return mix(world_data.background_color_low, world_data.background_color_high, y).xyz;
return mix(world_data.background_color_low, world_data.background_color_high, y).xyz + bayer_dither_noise();
}

14
source/blender/draw/engines/workbench/shaders/workbench_common_lib.glsl Normal file
View File

@ -0,0 +1,14 @@
/* 4x4 bayer matrix prepared for 8bit UNORM precision error. */
#define P(x) (((x + 0.5) * (1.0 / 16.0) - 0.5) * (1.0 / 255.0))
const vec4 dither_mat4x4[4] = vec4[4](
vec4( P(0.0), P(8.0), P(2.0), P(10.0)),
vec4(P(12.0), P(4.0), P(14.0), P(6.0)),
vec4( P(3.0), P(11.0), P(1.0), P(9.0)),
vec4(P(15.0), P(7.0), P(13.0), P(5.0))
);
float bayer_dither_noise() {
ivec2 tx1 = ivec2(gl_FragCoord.xy) % 4;
ivec2 tx2 = ivec2(gl_FragCoord.xy) % 2;
return dither_mat4x4[tx1.x][tx1.y];
}

2
source/blender/draw/engines/workbench/workbench_materials.c
View File

@ -48,6 +48,7 @@ extern char datatoc_workbench_prepass_frag_glsl[];
extern char datatoc_workbench_composite_frag_glsl[];
extern char datatoc_workbench_background_lib_glsl[];
extern char datatoc_workbench_common_lib_glsl[];
extern char datatoc_workbench_data_lib_glsl[];
extern char datatoc_workbench_object_overlap_lib_glsl[];
extern char datatoc_workbench_world_light_lib_glsl[];
@ -82,6 +83,7 @@ static char *workbench_build_composite_frag(WORKBENCH_PrivateData *wpd)
DynStr *ds = BLI_dynstr_new();
BLI_dynstr_append(ds, datatoc_workbench_data_lib_glsl);
BLI_dynstr_append(ds, datatoc_workbench_common_lib_glsl);
BLI_dynstr_append(ds, datatoc_workbench_background_lib_glsl);
if (wpd->drawtype_lighting & V3D_LIGHTING_STUDIO) {