diff options
| author | Campbell Barton <campbell@blender.org> | 2022-03-25 04:04:20 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-03-25 04:04:20 +0300 |
| commit | 4d46fac65d9946382c4be5b3842660e77468f00b (patch) | |
| tree | c2910a4ca0b2d345007bf853d6484a1b9e53e4e1 /source/blender/draw | |
| parent | c594cfbe50497fdc365b3f327b643de507cda02f (diff) | |
Cleanup: use count or num instead of nbr
Follow conventions from T85728.
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_shadows_cascade.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_shadows_cascade.c b/source/blender/draw/engines/eevee/eevee_shadows_cascade.c index 96b0df5b7db..25939926cfa 100644 --- a/source/blender/draw/engines/eevee/eevee_shadows_cascade.c +++ b/source/blender/draw/engines/eevee/eevee_shadows_cascade.c @@ -116,7 +116,7 @@ static void eevee_shadow_cascade_setup(EEVEE_LightsInfo *linfo, EEVEE_ShadowCascade *csm_data = linfo->shadow_cascade_data + (int)shdw_data->type_data_id; EEVEE_ShadowCascadeRender *csm_render = linfo->shadow_cascade_render + (int)shdw_data->type_data_id; - int cascade_nbr = csm_render->cascade_count; + int cascade_count = csm_render->cascade_count; float cascade_fade = csm_render->cascade_fade; float cascade_max_dist = csm_render->cascade_max_dist; float cascade_exponent = csm_render->cascade_exponent; @@ -223,19 +223,19 @@ static void eevee_shadow_cascade_setup(EEVEE_LightsInfo *linfo, float p[4] = {1.0f, 1.0f, csm_end, 1.0f}; /* TODO: we don't need full m4 multiply here */ mul_m4_v4(vp_projmat, p); - splits_end_ndc[cascade_nbr - 1] = p[2]; + splits_end_ndc[cascade_count - 1] = p[2]; if (is_persp) { - splits_end_ndc[cascade_nbr - 1] /= p[3]; + splits_end_ndc[cascade_count - 1] /= p[3]; } } csm_data->split_start[0] = csm_start; - csm_data->split_end[cascade_nbr - 1] = csm_end; + csm_data->split_end[cascade_count - 1] = csm_end; - for (int c = 1; c < cascade_nbr; c++) { + for (int c = 1; c < cascade_count; c++) { /* View Space */ - float linear_split = interpf(csm_end, csm_start, c / (float)cascade_nbr); - float exp_split = csm_start * powf(csm_end / csm_start, c / (float)cascade_nbr); + float linear_split = interpf(csm_end, csm_start, c / (float)cascade_count); + float exp_split = csm_start * powf(csm_end / csm_start, c / (float)cascade_count); if (is_persp) { csm_data->split_start[c] = interpf(exp_split, linear_split, cascade_exponent); @@ -276,13 +276,13 @@ static void eevee_shadow_cascade_setup(EEVEE_LightsInfo *linfo, } /* Set last cascade split fade distance into the first split_start. */ - float prev_split = (cascade_nbr > 1) ? csm_data->split_end[cascade_nbr - 2] : - csm_data->split_start[0]; + float prev_split = (cascade_count > 1) ? csm_data->split_end[cascade_count - 2] : + csm_data->split_start[0]; csm_data->split_start[0] = interpf( - prev_split, csm_data->split_end[cascade_nbr - 1], cascade_fade); + prev_split, csm_data->split_end[cascade_count - 1], cascade_fade); /* For each cascade */ - for (int c = 0; c < cascade_nbr; c++) { + for (int c = 0; c < cascade_count; c++) { float(*projmat)[4] = csm_render->projmat[c]; /* Given 8 frustum corners */ float corners[8][3] = { |