From 3f37787c804a2eab3fd5ac26fb24772ef52c9b60 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 9 May 2019 21:35:52 +1000 Subject: UI: rename Look Dev 'Ball' to 'Sphere' D4813 by @Gvgeo --- .../blender/blenloader/intern/versioning_userdef.c | 4 +-- source/blender/draw/engines/eevee/eevee_effects.c | 2 +- source/blender/draw/engines/eevee/eevee_lookdev.c | 38 +++++++++++----------- source/blender/draw/engines/eevee/eevee_private.h | 2 +- source/blender/makesdna/DNA_userdef_types.h | 2 +- source/blender/makesrna/intern/rna_space.c | 2 +- source/blender/makesrna/intern/rna_userdef.c | 6 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 6638e8c98bc..1fa1d0b2683 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -564,8 +564,8 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) userdef->vbotimeout = 120; } - if (userdef->lookdev_ball_size == 0) { - userdef->lookdev_ball_size = 150; + if (userdef->lookdev_sphere_size == 0) { + userdef->lookdev_sphere_size = 150; } } diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index a8b4159e030..ea01f5d36df 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -572,7 +572,7 @@ void EEVEE_draw_effects(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) /* NOTE: Lookdev drawing happens before TAA but after * motion blur and dof to avoid distortions. * Velocity resolve use a hack to exclude lookdev - * balls from creating shimering reprojection vectors. */ + * spheres from creating shimering reprojection vectors. */ EEVEE_lookdev_draw(vedata); EEVEE_velocity_resolve(vedata); diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.c b/source/blender/draw/engines/eevee/eevee_lookdev.c index 13f7ab1c562..2ca60861995 100644 --- a/source/blender/draw/engines/eevee/eevee_lookdev.c +++ b/source/blender/draw/engines/eevee/eevee_lookdev.c @@ -72,21 +72,21 @@ void EEVEE_lookdev_cache_init(EEVEE_Data *vedata, Scene *scene = draw_ctx->scene; if (LOOK_DEV_OVERLAY_ENABLED(v3d)) { - /* Viewport / Ball size. */ + /* Viewport / Spheres size. */ rcti rect; ED_region_visible_rect(draw_ctx->ar, &rect); - /* Make the viewport width scale the lookdev balls a bit. + /* Make the viewport width scale the lookdev spheres a bit. * Scale between 1000px and 2000px. */ const float viewport_scale = clamp_f( BLI_rcti_size_x(&rect) / (2000.0f * U.dpi_fac), 0.5f, 1.0f); - const int ball_size = U.lookdev_ball_size * U.dpi_fac * viewport_scale; + const int sphere_size = U.lookdev_sphere_size * U.dpi_fac * viewport_scale; - if (ball_size != effects->ball_size || rect.xmax != effects->anchor[0] || + if (sphere_size != effects->sphere_size || rect.xmax != effects->anchor[0] || rect.ymin != effects->anchor[1]) { - /* If ball size or anchor point moves, reset TAA to avoid ghosting issue. + /* If sphere size or anchor point moves, reset TAA to avoid ghosting issue. * This needs to happen early because we are changing taa_current_sample. */ - effects->ball_size = ball_size; + effects->sphere_size = sphere_size; effects->anchor[0] = rect.xmax; effects->anchor[1] = rect.ymin; EEVEE_temporal_sampling_reset(vedata); @@ -184,7 +184,7 @@ void EEVEE_lookdev_cache_init(EEVEE_Data *vedata, } static void eevee_lookdev_apply_taa(const EEVEE_EffectsInfo *effects, - int ball_size, + int sphere_size, float winmat[4][4]) { if (DRW_state_is_image_render() || ((effects->enabled_effects & EFFECT_TAA) != 0)) { @@ -195,8 +195,8 @@ static void eevee_lookdev_apply_taa(const EEVEE_EffectsInfo *effects, BLI_halton_2d(ht_primes, ht_offset, effects->taa_current_sample, ht_point); EEVEE_temporal_sampling_offset_calc(ht_point, 1.5f, ofs); - winmat[3][0] += ofs[0] / ball_size; - winmat[3][1] += ofs[1] / ball_size; + winmat[3][0] += ofs[0] / sphere_size; + winmat[3][1] += ofs[1] / sphere_size; } } @@ -226,7 +226,7 @@ void EEVEE_lookdev_draw(EEVEE_Data *vedata) DRWMatrixState matstate; unit_m4(matstate.winmat); - eevee_lookdev_apply_taa(effects, effects->ball_size, matstate.winmat); + eevee_lookdev_apply_taa(effects, effects->sphere_size, matstate.winmat); /* "Remove" view matrix location. Leaving only rotation. */ DRW_viewport_matrix_get(matstate.viewmat, DRW_MAT_VIEW); @@ -246,25 +246,25 @@ void EEVEE_lookdev_draw(EEVEE_Data *vedata) GPU_framebuffer_bind(fb); - const int ball_margin = effects->ball_size / 6.0f; - float offset[2] = {0.0f, ball_margin}; + const int sphere_margin = effects->sphere_size / 6.0f; + float offset[2] = {0.0f, sphere_margin}; - offset[0] = effects->ball_size + ball_margin; + offset[0] = effects->sphere_size + sphere_margin; GPU_framebuffer_viewport_set(fb, effects->anchor[0] - offset[0], effects->anchor[1] + offset[1], - effects->ball_size, - effects->ball_size); + effects->sphere_size, + effects->sphere_size); DRW_draw_pass(psl->lookdev_diffuse_pass); - offset[0] = (effects->ball_size + ball_margin) + - (ball_margin + effects->ball_size + ball_margin); + offset[0] = (effects->sphere_size + sphere_margin) + + (sphere_margin + effects->sphere_size + sphere_margin); GPU_framebuffer_viewport_set(fb, effects->anchor[0] - offset[0], effects->anchor[1] + offset[1], - effects->ball_size, - effects->ball_size); + effects->sphere_size, + effects->sphere_size); DRW_draw_pass(psl->lookdev_glossy_pass); diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 6112921ff39..3d243b70bd1 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -606,7 +606,7 @@ typedef struct EEVEE_EffectsInfo { /* Other */ float prev_persmat[4][4]; /* Lookdev */ - int ball_size; + int sphere_size; int anchor[2]; /* Bloom */ int bloom_iteration_len; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index e3e75435493..0b83e0d5f4c 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -645,7 +645,7 @@ typedef struct UserDef { char _pad3[4]; short gizmo_flag, gizmo_size; short edit_studio_light; - short lookdev_ball_size; + short lookdev_sphere_size; short vbotimeout, vbocollectrate; short textimeout, texcollectrate; int memcachelimit; diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 10ae9eff883..ba14329d267 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -3272,7 +3272,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) prop = RNA_def_property(srna, "show_look_dev", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "overlay.flag", V3D_OVERLAY_LOOK_DEV); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Look Dev Preview", "Show look development balls and palette"); + RNA_def_property_ui_text(prop, "Look Dev Preview", "Show look development spheres and palette"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_wireframes", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 51477352a28..fcdb9b53b10 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -4134,12 +4134,12 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_userdef_update"); /* Lookdev */ - prop = RNA_def_property(srna, "lookdev_ball_size", PROP_INT, PROP_PIXEL); - RNA_def_property_int_sdna(prop, NULL, "lookdev_ball_size"); + prop = RNA_def_property(srna, "lookdev_sphere_size", PROP_INT, PROP_PIXEL); + RNA_def_property_int_sdna(prop, NULL, "lookdev_sphere_size"); RNA_def_property_range(prop, 50, 400); RNA_def_property_int_default(prop, 150); RNA_def_property_ui_text( - prop, "LookDev Balls Size", "Maximum diameter of the LookDev balls size"); + prop, "Look Dev Spheres Size", "Maximum diameter of the look development sphere size"); RNA_def_property_update(prop, 0, "rna_userdef_update"); /* View2D Grid Displays */ -- cgit v1.2.3