griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Make format

Browse Source
This commit is contained in:
Jeroen Bakker
2023-08-28 15:31:20 +02:00
parent fb6687a790
commit 779bfe2734
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_vert.glsl
View File

@@ -103,8 +103,9 @@ void main()
facing = 1.0 - abs(facing) * 0.2;
/* Do interpolation in a non-linear space to have a better visual result. */
finalColor.rgb = mix(finalColor.rgb, non_linear_blend_color(colorEditMeshMiddle.rgb,
finalColor.rgb, facing), fresnelMixEdit);
finalColor.rgb = mix(finalColor.rgb,
non_linear_blend_color(colorEditMeshMiddle.rgb, finalColor.rgb, facing),
fresnelMixEdit);
#endif
view_clipping_distances(world_pos);

12
source/blender/draw/engines/overlay/shaders/overlay_edit_mesh_vert_no_geom.glsl
View File

@@ -145,10 +145,14 @@ void main()
facing1 = 1.0 - abs(facing1) * 0.2;
/* Do interpolation in a non-linear space to have a better visual result. */
out_finalColor[0].rgb = mix(out_finalColor[0].rgb, non_linear_blend_color(
colorEditMeshMiddle.rgb, out_finalColor[0].rgb, facing0), fresnelMixEdit);
out_finalColor[1].rgb = mix(out_finalColor[1].rgb, non_linear_blend_color(
colorEditMeshMiddle.rgb, out_finalColor[1].rgb, facing1), fresnelMixEdit);
out_finalColor[0].rgb = mix(
out_finalColor[0].rgb,
non_linear_blend_color(colorEditMeshMiddle.rgb, out_finalColor[0].rgb, facing0),
fresnelMixEdit);
out_finalColor[1].rgb = mix(
out_finalColor[1].rgb,
non_linear_blend_color(colorEditMeshMiddle.rgb, out_finalColor[1].rgb, facing1),
fresnelMixEdit);
#endif
// -------- GEOM SHADER ALTERNATIVE ----------- //

2
source/blender/draw/intern/draw_common.cc
View File

@@ -84,7 +84,7 @@ void DRW_globals_update()
UI_GetThemeColor4fv(TH_TRANSPARENT_CHECKER_PRIMARY, gb->color_checker_primary);
UI_GetThemeColor4fv(TH_TRANSPARENT_CHECKER_SECONDARY, gb->color_checker_secondary);
gb->size_checker = UI_GetThemeValuef(TH_TRANSPARENT_CHECKER_SIZE);
gb->fresnel_mix_edit = ((U.gpu_flag & USER_GPU_FLAG_FRESNEL_EDIT) == 0 ) ? 0.0f : 1.0f;
gb->fresnel_mix_edit = ((U.gpu_flag & USER_GPU_FLAG_FRESNEL_EDIT) == 0) ? 0.0f : 1.0f;
UI_GetThemeColor4fv(TH_V3D_CLIPPING_BORDER, gb->color_clipping_border);
/* Custom median color to slightly affect the edit mesh colors. */

2
source/blender/draw/intern/draw_common_shader_shared.h
View File

@@ -134,7 +134,7 @@ struct GlobalsUboStorage {
float size_vertex, size_edge, size_edge_fix, size_face_dot;
float size_checker;
float size_vertex_gpencil;
float fresnel_mix_edit;
float fresnel_mix_edit;
float _pad[3];
};
BLI_STATIC_ASSERT_ALIGN(GlobalsUboStorage, 16)