diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:02:02 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-27 04:26:49 +0300 |
commit | 1079742db92576d79ec89a28d95336aff847a82a (patch) | |
tree | 2e440e498c20d3205c2a64eedf4f84bf57abcb84 /source/blender/draw | |
parent | 918941483f7ec5fc6320d345c755e953b963c710 (diff) |
Cleanup: rename lamp -> light
Diffstat (limited to 'source/blender/draw')
18 files changed, 255 insertions, 255 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_data.c b/source/blender/draw/engines/eevee/eevee_data.c index dae1e3e8930..78bfb543bb1 100644 --- a/source/blender/draw/engines/eevee/eevee_data.c +++ b/source/blender/draw/engines/eevee/eevee_data.c @@ -32,7 +32,7 @@ void EEVEE_view_layer_data_free(void *storage) EEVEE_ViewLayerData *sldata = (EEVEE_ViewLayerData *)storage; /* Lights */ - MEM_SAFE_FREE(sldata->lamps); + MEM_SAFE_FREE(sldata->lights); DRW_UBO_FREE_SAFE(sldata->light_ubo); DRW_UBO_FREE_SAFE(sldata->shadow_ubo); DRW_UBO_FREE_SAFE(sldata->shadow_render_ubo); @@ -153,30 +153,30 @@ EEVEE_LightProbeEngineData *EEVEE_lightprobe_data_ensure(Object *ob) /* Light data. */ -static void eevee_lamp_data_init(DrawData *dd) +static void eevee_light_data_init(DrawData *dd) { - EEVEE_LampEngineData *led = (EEVEE_LampEngineData *)dd; + EEVEE_LightEngineData *led = (EEVEE_LightEngineData *)dd; led->need_update = true; led->prev_cube_shadow_id = -1; } -EEVEE_LampEngineData *EEVEE_lamp_data_get(Object *ob) +EEVEE_LightEngineData *EEVEE_light_data_get(Object *ob) { if (ob->type != OB_LAMP) { return NULL; } - return (EEVEE_LampEngineData *)DRW_drawdata_get( + return (EEVEE_LightEngineData *)DRW_drawdata_get( &ob->id, &draw_engine_eevee_type); } -EEVEE_LampEngineData *EEVEE_lamp_data_ensure(Object *ob) +EEVEE_LightEngineData *EEVEE_light_data_ensure(Object *ob) { BLI_assert(ob->type == OB_LAMP); - return (EEVEE_LampEngineData *)DRW_drawdata_ensure( + return (EEVEE_LightEngineData *)DRW_drawdata_ensure( &ob->id, &draw_engine_eevee_type, - sizeof(EEVEE_LampEngineData), - eevee_lamp_data_init, + sizeof(EEVEE_LightEngineData), + eevee_light_data_init, NULL); } diff --git a/source/blender/draw/engines/eevee/eevee_engine.c b/source/blender/draw/engines/eevee/eevee_engine.c index 1de07688c5e..54c1415ca49 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.c +++ b/source/blender/draw/engines/eevee/eevee_engine.c @@ -368,7 +368,7 @@ static void eevee_id_object_update(void *UNUSED(vedata), Object *object) ped->need_update = (ped->dd.recalc & (ID_RECALC_TRANSFORM | ID_RECALC_COPY_ON_WRITE)) != 0; ped->dd.recalc = 0; } - EEVEE_LampEngineData *led = EEVEE_lamp_data_get(object); + EEVEE_LightEngineData *led = EEVEE_light_data_get(object); if (led != NULL && led->dd.recalc != 0) { led->need_update = true; led->dd.recalc = 0; diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index 34a653c8f9c..f4fe088157e 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -113,8 +113,8 @@ void EEVEE_lights_init(EEVEE_ViewLayerData *sldata) datatoc_shadow_vert_glsl, NULL, datatoc_shadow_frag_glsl, NULL); } - if (!sldata->lamps) { - sldata->lamps = MEM_callocN(sizeof(EEVEE_LampsInfo), "EEVEE_LampsInfo"); + if (!sldata->lights) { + sldata->lights = MEM_callocN(sizeof(EEVEE_LightsInfo), "EEVEE_LightsInfo"); sldata->light_ubo = DRW_uniformbuffer_create(sizeof(EEVEE_Light) * MAX_LIGHT, NULL); sldata->shadow_ubo = DRW_uniformbuffer_create(shadow_ubo_size, NULL); sldata->shadow_render_ubo = DRW_uniformbuffer_create(sizeof(EEVEE_ShadowRender), NULL); @@ -126,20 +126,20 @@ void EEVEE_lights_init(EEVEE_ViewLayerData *sldata) sldata->shcasters_buffers[i].count = 0; } - sldata->lamps->shcaster_frontbuffer = &sldata->shcasters_buffers[0]; - sldata->lamps->shcaster_backbuffer = &sldata->shcasters_buffers[1]; + sldata->lights->shcaster_frontbuffer = &sldata->shcasters_buffers[0]; + sldata->lights->shcaster_backbuffer = &sldata->shcasters_buffers[1]; } /* Flip buffers */ - SWAP(EEVEE_ShadowCasterBuffer *, sldata->lamps->shcaster_frontbuffer, sldata->lamps->shcaster_backbuffer); + SWAP(EEVEE_ShadowCasterBuffer *, sldata->lights->shcaster_frontbuffer, sldata->lights->shcaster_backbuffer); const int sh_method = scene_eval->eevee.shadow_method; int sh_cube_size = scene_eval->eevee.shadow_cube_size; int sh_cascade_size = scene_eval->eevee.shadow_cascade_size; const bool sh_high_bitdepth = (scene_eval->eevee.flag & SCE_EEVEE_SHADOW_HIGH_BITDEPTH) != 0; - sldata->lamps->soft_shadows = (scene_eval->eevee.flag & SCE_EEVEE_SHADOW_SOFT) != 0; + sldata->lights->soft_shadows = (scene_eval->eevee.flag & SCE_EEVEE_SHADOW_SOFT) != 0; - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; if ((linfo->shadow_cube_size != sh_cube_size) || (linfo->shadow_method != sh_method) || (linfo->shadow_high_bitdepth != sh_high_bitdepth)) @@ -242,7 +242,7 @@ static DRWPass *eevee_lights_cube_store_pass_get(EEVEE_PassList *psl, EEVEE_View bool high_blur = shadow_samples_len > 16; DRWPass **pass = (high_blur) ? &psl->shadow_cube_store_pass : &psl->shadow_cube_store_high_pass; if (*pass == NULL) { - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; *pass = DRW_pass_create("Shadow Cube Storage Pass", DRW_STATE_WRITE_COLOR); GPUShader *shader = eevee_lights_get_store_sh(shadow_method, high_blur, false); DRWShadingGroup *grp = DRW_shgroup_create(shader, *pass); @@ -259,7 +259,7 @@ static DRWPass *eevee_lights_cascade_store_pass_get(EEVEE_PassList *psl, EEVEE_V bool high_blur = shadow_samples_len > 16; DRWPass **pass = (high_blur) ? &psl->shadow_cascade_store_pass : &psl->shadow_cascade_store_high_pass; if (*pass == NULL) { - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; *pass = DRW_pass_create("Shadow Cascade Storage Pass", DRW_STATE_WRITE_COLOR); GPUShader *shader = eevee_lights_get_store_sh(shadow_method, high_blur, true); DRWShadingGroup *grp = DRW_shgroup_create(shader, *pass); @@ -274,7 +274,7 @@ static DRWPass *eevee_lights_cascade_store_pass_get(EEVEE_PassList *psl, EEVEE_V void EEVEE_lights_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; EEVEE_StorageList *stl = vedata->stl; EEVEE_PassList *psl = vedata->psl; @@ -332,12 +332,12 @@ void EEVEE_lights_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) void EEVEE_lights_cache_add(EEVEE_ViewLayerData *sldata, Object *ob) { - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; const DRWContextState *draw_ctx = DRW_context_state_get(); const float threshold = draw_ctx->scene->eevee.light_threshold; - /* Step 1 find all lamps in the scene and setup them */ + /* Step 1 find all lights in the scene and setup them */ if (linfo->num_light >= MAX_LIGHT) { printf("Too many lights in the scene !!!\n"); } @@ -346,13 +346,13 @@ void EEVEE_lights_cache_add(EEVEE_ViewLayerData *sldata, Object *ob) EEVEE_Light *evli = linfo->light_data + linfo->num_light; eevee_light_setup(ob, evli); - /* We do not support shadowmaps for dupli lamps. */ + /* We do not support shadowmaps for dupli lights. */ if ((ob->base_flag & BASE_FROM_DUPLI) != 0) { linfo->num_light++; return; } - EEVEE_LampEngineData *led = EEVEE_lamp_data_ensure(ob); + EEVEE_LightEngineData *led = EEVEE_light_data_ensure(ob); /* Save previous shadow id. */ int prev_cube_sh_id = led->prev_cube_shadow_id; @@ -396,7 +396,7 @@ void EEVEE_lights_cache_add(EEVEE_ViewLayerData *sldata, Object *ob) } led->prev_cube_shadow_id = linfo->cpu_cube_len; - /* Saving lamp bounds for later. */ + /* Saving light bounds for later. */ BLI_assert(linfo->cpu_cube_len >= 0 && linfo->cpu_cube_len < MAX_LIGHT); copy_v3_v3(linfo->shadow_bounds[linfo->cpu_cube_len].center, ob->obmat[3]); linfo->shadow_bounds[linfo->cpu_cube_len].radius = light_attenuation_radius_get(la, threshold); @@ -457,7 +457,7 @@ void EEVEE_lights_cache_shcaster_material_add( DRW_shgroup_call_object_add(grp, geom, ob); } -/* Make that object update shadow casting lamps inside its influence bounding box. */ +/* Make that object update shadow casting lights inside its influence bounding box. */ void EEVEE_lights_cache_shcaster_object_add(EEVEE_ViewLayerData *sldata, Object *ob) { if ((ob->base_flag & BASE_FROM_DUPLI) != 0) { @@ -466,7 +466,7 @@ void EEVEE_lights_cache_shcaster_object_add(EEVEE_ViewLayerData *sldata, Object } EEVEE_ObjectEngineData *oedata = EEVEE_object_data_ensure(ob); - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; EEVEE_ShadowCasterBuffer *backbuffer = linfo->shcaster_backbuffer; EEVEE_ShadowCasterBuffer *frontbuffer = linfo->shcaster_frontbuffer; int past_id = oedata->shadow_caster_id; @@ -521,7 +521,7 @@ void EEVEE_lights_cache_shcaster_object_add(EEVEE_ViewLayerData *sldata, Object void EEVEE_lights_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; eGPUTextureFormat shadow_pool_format = GPU_R32F; sldata->common_data.la_num_light = linfo->num_light; @@ -587,7 +587,7 @@ void EEVEE_lights_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) GPU_ATTACHMENT_TEXTURE(sldata->shadow_cascade_pool) }); - /* Update Lamps UBOs. */ + /* Update Lights UBOs. */ EEVEE_lights_update(sldata, vedata); } @@ -659,7 +659,7 @@ static float light_shape_power_get(const Light *la, const EEVEE_Light *evli) return power; } -/* Update buffer with lamp data */ +/* Update buffer with light data */ static void eevee_light_setup(Object *ob, EEVEE_Light *evli) { Light *la = (Light *)ob->data; @@ -696,9 +696,9 @@ static void eevee_light_setup(Object *ob, EEVEE_Light *evli) light_shape_parameters_set(evli, la, scale); /* Light Type */ - evli->lamptype = (float)la->type; + evli->light_type = (float)la->type; if ((la->type == LA_AREA) && ELEM(la->area_shape, LA_AREA_DISK, LA_AREA_ELLIPSE)) { - evli->lamptype = LAMPTYPE_AREA_ELLIPSE; + evli->light_type = LAMPTYPE_AREA_ELLIPSE; } power = light_shape_power_get(la, evli); @@ -809,7 +809,7 @@ static void shadow_cube_random_position_set( add_v3_v3(ws_sample_pos, jitter); } -static void eevee_shadow_cube_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE_LampEngineData *led, int sample_ofs) +static void eevee_shadow_cube_setup(Object *ob, EEVEE_LightsInfo *linfo, EEVEE_LightEngineData *led, int sample_ofs) { EEVEE_ShadowCubeData *sh_data = &led->data.scd; EEVEE_Light *evli = linfo->light_data + sh_data->light_id; @@ -909,7 +909,7 @@ static void frustum_min_bounding_sphere(const float corners[8][3], float r_cente } static void eevee_shadow_cascade_setup( - Object *ob, EEVEE_LampsInfo *linfo, EEVEE_LampEngineData *led, + Object *ob, EEVEE_LightsInfo *linfo, EEVEE_LightEngineData *led, DRWMatrixState *saved_mats, float view_near, float view_far, int sample_ofs) { Light *la = (Light *)ob->data; @@ -919,7 +919,7 @@ static void eevee_shadow_cascade_setup( float (*vp_projmat)[4] = saved_mats->mat[DRW_MAT_WIN]; bool is_persp = DRW_viewport_is_persp_get(); - /* Lamps Matrices */ + /* Lights Matrices */ int cascade_nbr = la->cascade_count; EEVEE_ShadowCascadeData *sh_data = &led->data.scad; @@ -1139,7 +1139,7 @@ void EEVEE_lights_update(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_StorageList *stl = vedata->stl; EEVEE_EffectsInfo *effects = stl->effects; - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; Object *ob; int i; char *flag; @@ -1155,7 +1155,7 @@ void EEVEE_lights_update(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) } else { /* Search for deleted shadow casters and if shcaster WAS in shadow radius. */ - /* No need to run this if we already update all lamps. */ + /* No need to run this if we already update all lights. */ EEVEE_LightBits past_bits = {{0}}; EEVEE_LightBits curr_bits = {{0}}; shcaster = backbuffer->shadow_casters; @@ -1163,7 +1163,7 @@ void EEVEE_lights_update(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) for (i = 0; i < backbuffer->count; ++i, ++flag, ++shcaster) { /* If the shadowcaster has been deleted or updated. */ if (*flag != 0) { - /* Add the lamps that were intersecting with its BBox. */ + /* Add the lights that were intersecting with its BBox. */ lightbits_or(&past_bits, &shcaster->bits); } } @@ -1192,7 +1192,7 @@ void EEVEE_lights_update(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) /* Setup shadow cube in UBO and tag for update if necessary. */ for (i = 0; (i < MAX_SHADOW_CUBE) && (ob = linfo->shadow_cube_ref[i]); i++) { - EEVEE_LampEngineData *led = EEVEE_lamp_data_ensure(ob); + EEVEE_LightEngineData *led = EEVEE_light_data_ensure(ob); eevee_shadow_cube_setup(ob, linfo, led, effects->taa_current_sample - 1); if (lightbits_get(&update_bits, i) != 0 || linfo->soft_shadows) { @@ -1209,13 +1209,13 @@ void EEVEE_lights_update(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) } } -/* this refresh lamps shadow buffers */ +/* this refresh lights shadow buffers */ void EEVEE_draw_shadows(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { EEVEE_PassList *psl = vedata->psl; EEVEE_StorageList *stl = vedata->stl; EEVEE_EffectsInfo *effects = stl->effects; - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; const DRWContextState *draw_ctx = DRW_context_state_get(); const float light_threshold = draw_ctx->scene->eevee.light_threshold; Object *ob; @@ -1240,7 +1240,7 @@ void EEVEE_draw_shadows(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) } bool cascade_visible[MAX_SHADOW_CASCADE]; for (i = 0; (ob = linfo->shadow_cascade_ref[i]) && (i < MAX_SHADOW_CASCADE); i++) { - EEVEE_LampEngineData *led = EEVEE_lamp_data_get(ob); + EEVEE_LightEngineData *led = EEVEE_light_data_get(ob); EEVEE_ShadowCascadeData *sh_data = &led->data.scad; float plane[4]; normalize_m4_m4(sh_data->viewmat, ob->obmat); @@ -1258,7 +1258,7 @@ void EEVEE_draw_shadows(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) DRW_stats_group_start("Cube Shadow Maps"); /* Render each shadow to one layer of the array */ for (i = 0; (ob = linfo->shadow_cube_ref[i]) && (i < MAX_SHADOW_CUBE); i++) { - EEVEE_LampEngineData *led = EEVEE_lamp_data_ensure(ob); + EEVEE_LightEngineData *led = EEVEE_light_data_ensure(ob); Light *la = (Light *)ob->data; if (!led->need_update || !cube_visible[i]) { @@ -1371,7 +1371,7 @@ void EEVEE_draw_shadows(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) continue; } - EEVEE_LampEngineData *led = EEVEE_lamp_data_ensure(ob); + EEVEE_LightEngineData *led = EEVEE_light_data_ensure(ob); Light *la = (Light *)ob->data; EEVEE_ShadowCascadeData *evscd = &led->data.scad; diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index f08295b6158..eec61ffd08c 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -1117,7 +1117,7 @@ static void material_opaque( Scene *scene = draw_ctx->scene; EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl; EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl; - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; bool use_diffuse, use_glossy, use_refract; float *color_p = &ma->r; @@ -1318,7 +1318,7 @@ static void material_transparent( Scene *scene = draw_ctx->scene; EEVEE_StorageList *stl = ((EEVEE_Data *)vedata)->stl; EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl; - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; const bool use_ssrefract = ( ((ma->blend_flag & MA_BL_SS_REFRACTION) != 0) && @@ -1682,7 +1682,7 @@ void EEVEE_hair_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sldata, static float half = 0.5f; static float error_col[3] = {1.0f, 0.0f, 1.0f}; static float compile_col[3] = {0.5f, 0.5f, 0.5f}; - struct GPUMaterial *gpumat = EEVEE_material_hair_get(scene, ma, sldata->lamps->shadow_method); + struct GPUMaterial *gpumat = EEVEE_material_hair_get(scene, ma, sldata->lights->shadow_method); switch (GPU_material_status(gpumat)) { case GPU_MAT_SUCCESS: @@ -1719,7 +1719,7 @@ void EEVEE_hair_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sldata, shgrp = EEVEE_default_shading_group_get(sldata, vedata, ob, psys, md, true, false, use_ssr, - sldata->lamps->shadow_method); + sldata->lights->shadow_method); DRW_shgroup_uniform_vec3(shgrp, "basecol", color_p, 1); DRW_shgroup_uniform_float(shgrp, "metallic", metal_p, 1); DRW_shgroup_uniform_float(shgrp, "specular", spec_p, 1); @@ -1746,7 +1746,7 @@ void EEVEE_materials_cache_finish(EEVEE_Data *vedata) const View3D *v3d = draw_ctx->v3d; if (LOOK_DEV_OVERLAY_ENABLED(v3d)) { EEVEE_ViewLayerData *sldata = EEVEE_view_layer_data_ensure(); - EEVEE_LampsInfo *linfo = sldata->lamps; + EEVEE_LightsInfo *linfo = sldata->lights; struct GPUBatch *sphere = DRW_cache_sphere_get(); static float mat1[4][4]; static float color[3] = {0.8f, 0.8f, 0.8f}; diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index a5695fa3a4c..0d168bb2793 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -352,10 +352,10 @@ typedef struct EEVEE_Light { float spotsize, spotblend, radius, shadowid; float rightvec[3], sizex; float upvec[3], sizey; - float forwardvec[3], lamptype; + float forwardvec[3], light_type; } EEVEE_Light; -/* Special type for elliptic area lamps, matches lamps_lib.glsl */ +/* Special type for elliptic area lights, matches lamps_lib.glsl */ #define LAMPTYPE_AREA_ELLIPSE 100.0f typedef struct EEVEE_Shadow { @@ -405,7 +405,7 @@ typedef struct EEVEE_ShadowCasterBuffer { } EEVEE_ShadowCasterBuffer; /* ************ LIGHT DATA ************* */ -typedef struct EEVEE_LampsInfo { +typedef struct EEVEE_LightsInfo { int num_light, cache_num_light; int num_cube_layer, cache_num_cube_layer; int num_cascade_layer, cache_num_cascade_layer; @@ -436,15 +436,15 @@ typedef struct EEVEE_LampsInfo { /* Pointers only. */ struct EEVEE_ShadowCasterBuffer *shcaster_frontbuffer; struct EEVEE_ShadowCasterBuffer *shcaster_backbuffer; -} EEVEE_LampsInfo; +} EEVEE_LightsInfo; -/* EEVEE_LampsInfo->shadow_casters_flag */ +/* EEVEE_LightsInfo->shadow_casters_flag */ enum { SHADOW_CASTER_PRUNED = (1 << 0), SHADOW_CASTER_UPDATED = (1 << 1), }; -/* EEVEE_LampsInfo->update_flag */ +/* EEVEE_LightsInfo->update_flag */ enum { LIGHT_UPDATE_SHADOW_CUBE = (1 << 0), }; @@ -646,7 +646,7 @@ typedef struct EEVEE_CommonUniformBuffer { int sss_toggle; /* bool */ /* Specular */ int spec_toggle; /* bool */ - /* Lamps */ + /* Lights */ int la_num_light; /* int */ /* Probes */ int prb_num_planar; /* int */ @@ -676,8 +676,8 @@ typedef struct EEVEE_ClipPlanesUniformBuffer { /* ************** SCENE LAYER DATA ************** */ typedef struct EEVEE_ViewLayerData { - /* Lamps */ - struct EEVEE_LampsInfo *lamps; + /* Lights */ + struct EEVEE_LightsInfo *lights; struct GPUUniformBuffer *light_ubo; struct GPUUniformBuffer *shadow_ubo; @@ -737,7 +737,7 @@ typedef struct EEVEE_ShadowCascadeData { /* Theses are the structs stored inside Objects. * It works with even if the object is in multiple layers * because we don't get the same "Object *" for each layer. */ -typedef struct EEVEE_LampEngineData { +typedef struct EEVEE_LightEngineData { DrawData dd; bool need_update; @@ -748,7 +748,7 @@ typedef struct EEVEE_LampEngineData { struct EEVEE_ShadowCubeData scd; struct EEVEE_ShadowCascadeData scad; } data; -} EEVEE_LampEngineData; +} EEVEE_LightEngineData; typedef struct EEVEE_LightProbeEngineData { DrawData dd; @@ -827,8 +827,8 @@ EEVEE_ObjectEngineData *EEVEE_object_data_get(Object *ob); EEVEE_ObjectEngineData *EEVEE_object_data_ensure(Object *ob); EEVEE_LightProbeEngineData *EEVEE_lightprobe_data_get(Object *ob); EEVEE_LightProbeEngineData *EEVEE_lightprobe_data_ensure(Object *ob); -EEVEE_LampEngineData *EEVEE_lamp_data_get(Object *ob); -EEVEE_LampEngineData *EEVEE_lamp_data_ensure(Object *ob); +EEVEE_LightEngineData *EEVEE_light_data_get(Object *ob); +EEVEE_LightEngineData *EEVEE_light_data_ensure(Object *ob); EEVEE_WorldEngineData *EEVEE_world_data_get(World *wo); EEVEE_WorldEngineData *EEVEE_world_data_ensure(World *wo); diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 816899b9290..53c08c4d8f3 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -46,11 +46,11 @@ static struct { char *volumetric_common_lib; - char *volumetric_common_lamps_lib; + char *volumetric_common_lights_lib; struct GPUShader *volumetric_clear_sh; struct GPUShader *volumetric_scatter_sh; - struct GPUShader *volumetric_scatter_with_lamps_sh; + struct GPUShader *volumetric_scatter_with_lights_sh; struct GPUShader *volumetric_integration_sh; struct GPUShader *volumetric_resolve_sh; @@ -84,7 +84,7 @@ static void eevee_create_shader_volumes(void) datatoc_bsdf_common_lib_glsl, datatoc_volumetric_lib_glsl); - e_data.volumetric_common_lamps_lib = BLI_string_joinN( + e_data.volumetric_common_lights_lib = BLI_string_joinN( datatoc_common_view_lib_glsl, datatoc_common_uniforms_lib_glsl, datatoc_bsdf_common_lib_glsl, @@ -104,15 +104,15 @@ static void eevee_create_shader_volumes(void) datatoc_volumetric_vert_glsl, datatoc_volumetric_geom_glsl, datatoc_volumetric_scatter_frag_glsl, - e_data.volumetric_common_lamps_lib, + e_data.volumetric_common_lights_lib, SHADER_DEFINES "#define VOLUMETRICS\n" "#define VOLUME_SHADOW\n"); - e_data.volumetric_scatter_with_lamps_sh = DRW_shader_create_with_lib( + e_data.volumetric_scatter_with_lights_sh = DRW_shader_create_with_lib( datatoc_volumetric_vert_glsl, datatoc_volumetric_geom_glsl, datatoc_volumetric_scatter_frag_glsl, - e_data.volumetric_common_lamps_lib, + e_data.volumetric_common_lights_lib, SHADER_DEFINES "#define VOLUMETRICS\n" "#define VOLUME_LIGHTING\n" @@ -416,7 +416,7 @@ void EEVEE_volumes_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) psl->volumetric_objects_ps = DRW_pass_create("Volumetric Properties", DRW_STATE_WRITE_COLOR | DRW_STATE_ADDITIVE); - struct GPUShader *scatter_sh = (common_data->vol_use_lights) ? e_data.volumetric_scatter_with_lamps_sh + struct GPUShader *scatter_sh = (common_data->vol_use_lights) ? e_data.volumetric_scatter_with_lights_sh : e_data.volumetric_scatter_sh; psl->volumetric_scatter_ps = DRW_pass_create("Volumetric Scattering", DRW_STATE_WRITE_COLOR); grp = DRW_shgroup_empty_tri_batch_create(scatter_sh, psl->volumetric_scatter_ps, @@ -608,11 +608,11 @@ void EEVEE_volumes_free_smoke_textures(void) void EEVEE_volumes_free(void) { MEM_SAFE_FREE(e_data.volumetric_common_lib); - MEM_SAFE_FREE(e_data.volumetric_common_lamps_lib); + MEM_SAFE_FREE(e_data.volumetric_common_lights_lib); DRW_SHADER_FREE_SAFE(e_data.volumetric_clear_sh); DRW_SHADER_FREE_SAFE(e_data.volumetric_scatter_sh); - DRW_SHADER_FREE_SAFE(e_data.volumetric_scatter_with_lamps_sh); + DRW_SHADER_FREE_SAFE(e_data.volumetric_scatter_with_lights_sh); DRW_SHADER_FREE_SAFE(e_data.volumetric_integration_sh); DRW_SHADER_FREE_SAFE(e_data.volumetric_resolve_sh); } diff --git a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl index 64473d93054..b7e03b2937e 100644 --- a/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/bsdf_common_lib.glsl @@ -29,7 +29,7 @@ struct LightData { vec4 spotdata_radius_shadow; /* x : spot size, y : spot blend, z : radius, w: shadow id */ vec4 rightvec_sizex; /* xyz: Normalized up vector, w: area size X or spot scale X */ vec4 upvec_sizey; /* xyz: Normalized right vector, w: area size Y or spot scale Y */ - vec4 forwardvec_type; /* xyz: Normalized forward vector, w: Lamp Type */ + vec4 forwardvec_type; /* xyz: Normalized forward vector, w: Light Type */ }; /* convenience aliases */ diff --git a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl index 9c5a212aead..b8dff694aca 100644 --- a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl @@ -27,7 +27,7 @@ layout(std140) uniform common_block { bool sssToggle; /* Specular */ bool specToggle; - /* Lamps */ + /* Lights */ int laNumLight; /* Probes */ int prbNumPlanar; diff --git a/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl b/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl index 5a73950746d..e12d76596d3 100644 --- a/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/lamps_lib.glsl @@ -19,7 +19,7 @@ layout(std140) uniform light_block { #define SUN 1.0 #define SPOT 2.0 #define AREA_RECT 4.0 -/* Used to define the area lamp shape, doesn't directly correspond to a Blender lamp type. */ +/* Used to define the area light shape, doesn't directly correspond to a Blender light type. */ #define AREA_ELLIPSE 100.0 #if defined(SHADOW_VSM) diff --git a/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl b/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl index 6fb8ebc719e..3d5b8f6f975 100644 --- a/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl @@ -194,7 +194,7 @@ void CLOSURE_NAME( vec4 rand = texelFetch(utilTex, ivec3(ivec2(gl_FragCoord.xy) % LUT_SIZE, 2.0), 0); /* ---------------------------------------------------------------- */ - /* -------------------- SCENE LAMPS LIGHTING ---------------------- */ + /* -------------------- SCENE LIGHTS LIGHTING --------------------- */ /* ---------------------------------------------------------------- */ #ifdef CLOSURE_GLOSSY @@ -241,13 +241,13 @@ void CLOSURE_NAME( } #ifdef CLOSURE_GLOSSY - vec3 brdf_lut_lamps = texture(utilTex, vec3(lut_uv, 1.0)).rgb; - out_spec *= F_area(f0, brdf_lut_lamps.xy) * brdf_lut_lamps.z; + vec3 brdf_lut_lights = texture(utilTex, vec3(lut_uv, 1.0)).rgb; + out_spec *= F_area(f0, brdf_lut_lights.xy) * brdf_lut_lights.z; #endif #ifdef CLOSURE_CLEARCOAT - vec3 brdf_lut_lamps_clear = texture(utilTex, vec3(lut_uv_clear, 1.0)).rgb; - out_spec_clear *= F_area(vec3(0.04), brdf_lut_lamps_clear.xy) * brdf_lut_lamps_clear.z; + vec3 brdf_lut_lights_clear = texture(utilTex, vec3(lut_uv_clear, 1.0)).rgb; + out_spec_clear *= F_area(vec3(0.04), brdf_lut_lights_clear.xy) * brdf_lut_lights_clear.z; out_spec += out_spec_clear * C_intensity; #endif diff --git a/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl index dbc29299fdc..8792c646ec1 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl @@ -26,7 +26,7 @@ void prep_specular( /* Normalized Blinn shading */ vec4 blinn_specular(vec4 shininess, vec4 spec_angle, vec4 NL) { - /* Pi is already divided in the lamp power. + /* Pi is already divided in the light power. * normalization_factor = (shininess + 8.0) / (8.0 * M_PI) */ vec4 normalization_factor = shininess * 0.125 + 1.0; vec4 spec_light = pow(spec_angle, shininess) * NL * normalization_factor; diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 259605b4707..8d5518a6b99 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -69,7 +69,7 @@ struct GPUMaterial; struct GPUShader; struct GPUTexture; struct GPUUniformBuffer; -struct LampEngineData; +struct LightEngineData; struct Object; struct ParticleSystem; struct RenderEngineType; diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index 72729cdd8cc..845cab620bd 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -78,16 +78,16 @@ static struct DRWShapeCache { GPUBatch *drw_field_vortex; GPUBatch *drw_field_tube_limit; GPUBatch *drw_field_cone_limit; - GPUBatch *drw_lamp; - GPUBatch *drw_lamp_shadows; - GPUBatch *drw_lamp_sunrays; - GPUBatch *drw_lamp_area_square; - GPUBatch *drw_lamp_area_disk; - GPUBatch *drw_lamp_hemi; - GPUBatch *drw_lamp_spot; - GPUBatch *drw_lamp_spot_volume; - GPUBatch *drw_lamp_spot_square; - GPUBatch *drw_lamp_spot_square_volume; + GPUBatch *drw_light; + GPUBatch *drw_light_shadows; + GPUBatch *drw_light_sunrays; + GPUBatch *drw_light_area_square; + GPUBatch *drw_light_area_disk; + GPUBatch *drw_light_hemi; + GPUBatch *drw_light_spot; + GPUBatch *drw_light_spot_volume; + GPUBatch *drw_light_spot_square; + GPUBatch *drw_light_spot_square_volume; GPUBatch *drw_speaker; GPUBatch *drw_lightprobe_cube; GPUBatch *drw_lightprobe_planar; @@ -1295,13 +1295,13 @@ GPUBatch *DRW_cache_field_cone_limit_get(void) /** \} */ /* -------------------------------------------------------------------- */ -/** \name Lamps +/** \name Lights * \{ */ -GPUBatch *DRW_cache_lamp_get(void) +GPUBatch *DRW_cache_light_get(void) { #define NSEGMENTS 8 - if (!SHC.drw_lamp) { + if (!SHC.drw_light) { float v[2]; /* Position Only 3D format */ @@ -1324,16 +1324,16 @@ GPUBatch *DRW_cache_lamp_get(void) GPU_vertbuf_attr_set(vbo, attr_id.pos, a + 1, v); } - SHC.drw_lamp = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp; + return SHC.drw_light; #undef NSEGMENTS } -GPUBatch *DRW_cache_lamp_shadows_get(void) +GPUBatch *DRW_cache_light_shadows_get(void) { #define NSEGMENTS 10 - if (!SHC.drw_lamp_shadows) { + if (!SHC.drw_light_shadows) { float v[2]; /* Position Only 3D format */ @@ -1356,15 +1356,15 @@ GPUBatch *DRW_cache_lamp_shadows_get(void) GPU_vertbuf_attr_set(vbo, attr_id.pos, a + 1, v); } - SHC.drw_lamp_shadows = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light_shadows = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp_shadows; + return SHC.drw_light_shadows; #undef NSEGMENTS } -GPUBatch *DRW_cache_lamp_sunrays_get(void) +GPUBatch *DRW_cache_light_sunrays_get(void) { - if (!SHC.drw_lamp_sunrays) { + if (!SHC.drw_light_sunrays) { float v[2], v1[2], v2[2]; /* Position Only 2D format */ @@ -1392,14 +1392,14 @@ GPUBatch *DRW_cache_lamp_sunrays_get(void) GPU_vertbuf_attr_set(vbo, attr_id.pos, a * 4 + 3, v2); } - SHC.drw_lamp_sunrays = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light_sunrays = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp_sunrays; + return SHC.drw_light_sunrays; } -GPUBatch *DRW_cache_lamp_area_square_get(void) +GPUBatch *DRW_cache_light_area_square_get(void) { - if (!SHC.drw_lamp_area_square) { + if (!SHC.drw_light_area_square) { float v1[3] = {0.0f, 0.0f, 0.0f}; /* Position Only 3D format */ @@ -1426,15 +1426,15 @@ GPUBatch *DRW_cache_lamp_area_square_get(void) v1[1] = 0.5f; GPU_vertbuf_attr_set(vbo, attr_id.pos, 7, v1); - SHC.drw_lamp_area_square = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light_area_square = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp_area_square; + return SHC.drw_light_area_square; } -GPUBatch *DRW_cache_lamp_area_disk_get(void) +GPUBatch *DRW_cache_light_area_disk_get(void) { #define NSEGMENTS 32 - if (!SHC.drw_lamp_area_disk) { + if (!SHC.drw_light_area_disk) { /* Position Only 3D format */ static GPUVertFormat format = { 0 }; static struct { uint pos; } attr_id; @@ -1456,16 +1456,16 @@ GPUBatch *DRW_cache_lamp_area_disk_get(void) copy_v3_fl3(v, 0.0f, 0.5f, 0.0f); GPU_vertbuf_attr_set(vbo, attr_id.pos, (2 * NSEGMENTS) - 1, v); - SHC.drw_lamp_area_disk = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light_area_disk = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp_area_disk; + return SHC.drw_light_area_disk; #undef NSEGMENTS } -GPUBatch *DRW_cache_lamp_hemi_get(void) +GPUBatch *DRW_cache_light_hemi_get(void) { #define CIRCLE_RESOL 32 - if (!SHC.drw_lamp_hemi) { + if (!SHC.drw_light_hemi) { float v[3]; int vidx = 0; @@ -1519,17 +1519,17 @@ GPUBatch *DRW_cache_lamp_hemi_get(void) } - SHC.drw_lamp_hemi = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light_hemi = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp_hemi; + return SHC.drw_light_hemi; #undef CIRCLE_RESOL } -GPUBatch *DRW_cache_lamp_spot_get(void) +GPUBatch *DRW_cache_light_spot_get(void) { #define NSEGMENTS 32 - if (!SHC.drw_lamp_spot) { + if (!SHC.drw_light_spot) { /* a single ring of vertices */ float p[NSEGMENTS][2]; float n[NSEGMENTS][3]; @@ -1588,16 +1588,16 @@ GPUBatch *DRW_cache_lamp_spot_get(void) GPU_vertbuf_attr_set(vbo, attr_id.n2, i * 4 + 3, neg[(i) % NSEGMENTS]); } - SHC.drw_lamp_spot = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light_spot = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp_spot; + return SHC.drw_light_spot; #undef NSEGMENTS } -GPUBatch *DRW_cache_lamp_spot_volume_get(void) +GPUBatch *DRW_cache_light_spot_volume_get(void) { #define NSEGMENTS 32 - if (!SHC.drw_lamp_spot_volume) { + if (!SHC.drw_light_spot_volume) { /* a single ring of vertices */ float p[NSEGMENTS][2]; for (int i = 0; i < NSEGMENTS; ++i) { @@ -1633,15 +1633,15 @@ GPUBatch *DRW_cache_lamp_spot_volume_get(void) GPU_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v); } - SHC.drw_lamp_spot_volume = GPU_batch_create_ex(GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light_spot_volume = GPU_batch_create_ex(GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp_spot_volume; + return SHC.drw_light_spot_volume; #undef NSEGMENTS } -GPUBatch *DRW_cache_lamp_spot_square_get(void) +GPUBatch *DRW_cache_light_spot_square_get(void) { - if (!SHC.drw_lamp_spot_square) { + if (!SHC.drw_light_spot_square) { float p[5][3] = { { 0.0f, 0.0f, 0.0f}, { 1.0f, 1.0f, -1.0f}, @@ -1670,14 +1670,14 @@ GPUBatch *DRW_cache_lamp_spot_square_get(void) GPU_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[((i + 1) % 4) + 1]); } - SHC.drw_lamp_spot_square = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light_spot_square = GPU_batch_create_ex(GPU_PRIM_LINES, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp_spot_square; + return SHC.drw_light_spot_square; } -GPUBatch *DRW_cache_lamp_spot_square_volume_get(void) +GPUBatch *DRW_cache_light_spot_square_volume_get(void) { - if (!SHC.drw_lamp_spot_square_volume) { + if (!SHC.drw_light_spot_square_volume) { float p[5][3] = { { 0.0f, 0.0f, 0.0f}, { 1.0f, 1.0f, -1.0f}, @@ -1704,9 +1704,9 @@ GPUBatch *DRW_cache_lamp_spot_square_volume_get(void) GPU_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[(i % 4) + 1]); } - SHC.drw_lamp_spot_square_volume = GPU_batch_create_ex(GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO); + SHC.drw_light_spot_square_volume = GPU_batch_create_ex(GPU_PRIM_TRIS, vbo, NULL, GPU_BATCH_OWNS_VBO); } - return SHC.drw_lamp_spot_square_volume; + return SHC.drw_light_spot_square_volume; } /** \} */ diff --git a/source/blender/draw/intern/draw_cache.h b/source/blender/draw/intern/draw_cache.h index 21c5e0823c2..1be2f4da4e5 100644 --- a/source/blender/draw/intern/draw_cache.h +++ b/source/blender/draw/intern/draw_cache.h @@ -80,17 +80,17 @@ struct GPUBatch *DRW_cache_field_cone_limit_get(void); /* Grease Pencil */ struct GPUBatch *DRW_cache_gpencil_axes_get(void); -/* Lamps */ -struct GPUBatch *DRW_cache_lamp_get(void); -struct GPUBatch *DRW_cache_lamp_shadows_get(void); -struct GPUBatch *DRW_cache_lamp_sunrays_get(void); -struct GPUBatch *DRW_cache_lamp_area_square_get(void); -struct GPUBatch *DRW_cache_lamp_area_disk_get(void); -struct GPUBatch *DRW_cache_lamp_hemi_get(void); -struct GPUBatch *DRW_cache_lamp_spot_get(void); -struct GPUBatch *DRW_cache_lamp_spot_volume_get(void); -struct GPUBatch *DRW_cache_lamp_spot_square_get(void); -struct GPUBatch *DRW_cache_lamp_spot_square_volume_get(void); +/* Lights */ +struct GPUBatch *DRW_cache_light_get(void); +struct GPUBatch *DRW_cache_light_shadows_get(void); +struct GPUBatch *DRW_cache_light_sunrays_get(void); +struct GPUBatch *DRW_cache_light_area_square_get(void); +struct GPUBatch *DRW_cache_light_area_disk_get(void); +struct GPUBatch *DRW_cache_light_hemi_get(void); +struct GPUBatch *DRW_cache_light_spot_get(void); +struct GPUBatch *DRW_cache_light_spot_volume_get(void); +struct GPUBatch *DRW_cache_light_spot_square_get(void); +struct GPUBatch *DRW_cache_light_spot_square_volume_get(void); /* Camera */ struct GPUBatch *DRW_cache_camera_get(void); diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index fee9c4fceb9..2647bbb9059 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -59,7 +59,7 @@ void DRW_globals_update(void) UI_COLOR_RGBA_FROM_U8(0x88, 0xFF, 0xFF, 155, gb->colorLibrarySelect); UI_COLOR_RGBA_FROM_U8(0x55, 0xCC, 0xCC, 155, gb->colorLibrary); UI_GetThemeColor4fv(TH_TRANSFORM, gb->colorTransform); - UI_GetThemeColor4fv(TH_LAMP, gb->colorLamp); + UI_GetThemeColor4fv(TH_LIGHT, gb->colorLight); UI_GetThemeColor4fv(TH_SPEAKER, gb->colorSpeaker); UI_GetThemeColor4fv(TH_CAMERA, gb->colorCamera); UI_GetThemeColor4fv(TH_EMPTY, gb->colorEmpty); @@ -136,11 +136,11 @@ void DRW_globals_update(void) UI_GetThemeColorShadeAlpha4fv(TH_TRANSFORM, 0, -80, gb->colorDeselect); UI_GetThemeColorShadeAlpha4fv(TH_WIRE, 0, -30, gb->colorOutline); - UI_GetThemeColorShadeAlpha4fv(TH_LAMP, 0, 255, gb->colorLampNoAlpha); + UI_GetThemeColorShadeAlpha4fv(TH_LIGHT, 0, 255, gb->colorLightNoAlpha); - gb->sizeLampCenter = (U.obcenter_dia + 1.5f) * U.pixelsize; - gb->sizeLampCircle = U.pixelsize * 9.0f; - gb->sizeLampCircleShadow = gb->sizeLampCircle + U.pixelsize * 3.0f; + gb->sizeLightCenter = (U.obcenter_dia + 1.5f) * U.pixelsize; + gb->sizeLightCircle = U.pixelsize * 9.0f; + gb->sizeLightCircleShadow = gb->sizeLightCircle + U.pixelsize * 3.0f; /* M_SQRT2 to be at least the same size of the old square */ gb->sizeVertex = U.pixelsize * (max_ff(1.0f, UI_GetThemeValuef(TH_VERTEX_SIZE) * (float)M_SQRT2 / 2.0f)); @@ -971,7 +971,7 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color theme_id = (active) ? TH_ACTIVE : TH_SELECT; } else { - if (ob->type == OB_LAMP) theme_id = TH_LAMP; + if (ob->type == OB_LAMP) theme_id = TH_LIGHT; else if (ob->type == OB_SPEAKER) theme_id = TH_SPEAKER; else if (ob->type == OB_CAMERA) theme_id = TH_CAMERA; else if (ob->type == OB_EMPTY) theme_id = TH_EMPTY; @@ -1001,7 +1001,7 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color case TH_SPEAKER: *r_color = G_draw.block.colorSpeaker; break; case TH_CAMERA: *r_color = G_draw.block.colorCamera; break; case TH_EMPTY: *r_color = G_draw.block.colorEmpty; break; - case TH_LAMP: *r_color = G_draw.block.colorLamp; break; + case TH_LIGHT: *r_color = G_draw.block.colorLight; break; default: *r_color = G_draw.block.colorWire; break; } } @@ -1024,7 +1024,7 @@ float *DRW_color_background_blend_get(int theme_id) case TH_SPEAKER: ret = colors[6]; break; case TH_CAMERA: ret = colors[7]; break; case TH_EMPTY: ret = colors[8]; break; - case TH_LAMP: ret = colors[9]; break; + case TH_LIGHT: ret = colors[9]; break; default: ret = colors[10]; break; } diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h index a570312adf6..cfef8676bb8 100644 --- a/source/blender/draw/intern/draw_common.h +++ b/source/blender/draw/intern/draw_common.h @@ -50,7 +50,7 @@ typedef struct GlobalsUboStorage { float colorLibrarySelect[4]; float colorLibrary[4]; float colorTransform[4]; - float colorLamp[4]; + float colorLight[4]; float colorSpeaker[4]; float colorCamera[4]; float colorEmpty[4]; @@ -76,7 +76,7 @@ typedef struct GlobalsUboStorage { float colorDeselect[4]; float colorOutline[4]; - float colorLampNoAlpha[4]; + float colorLightNoAlpha[4]; float colorBackground[4]; float colorEditMeshMiddle[4]; @@ -110,7 +110,7 @@ typedef struct GlobalsUboStorage { /* NOTE! Put all color before UBO_LAST_COLOR */ /* Pack individual float at the end of the buffer to avoid alignment errors */ - float sizeLampCenter, sizeLampCircle, sizeLampCircleShadow; + float sizeLightCenter, sizeLightCircle, sizeLightCircleShadow; float sizeVertex, sizeEdge, sizeEdgeFix, sizeFaceDot; float gridDistance, gridResolution, gridSubdivisions, gridScale; diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 4b874425d7a..02d400c0051 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -204,28 +204,28 @@ typedef struct OBJECT_ShadingGroupList { /* MetaBalls */ DRWShadingGroup *mball_handle; - /* Lamps */ - DRWShadingGroup *lamp_center; - DRWShadingGroup *lamp_groundpoint; - DRWShadingGroup *lamp_groundline; - DRWShadingGroup *lamp_circle; - DRWShadingGroup *lamp_circle_shadow; - DRWShadingGroup *lamp_sunrays; - DRWShadingGroup *lamp_distance; - DRWShadingGroup *lamp_buflimit; - DRWShadingGroup *lamp_buflimit_points; - DRWShadingGroup *lamp_area_sphere; - DRWShadingGroup *lamp_area_square; - DRWShadingGroup *lamp_area_disk; - DRWShadingGroup *lamp_hemi; - DRWShadingGroup *lamp_spot_cone; - DRWShadingGroup *lamp_spot_blend; - DRWShadingGroup *lamp_spot_pyramid; - DRWShadingGroup *lamp_spot_blend_rect; - DRWShadingGroup *lamp_spot_volume; - DRWShadingGroup *lamp_spot_volume_rect; - DRWShadingGroup *lamp_spot_volume_outside; - DRWShadingGroup *lamp_spot_volume_rect_outside; + /* Lights */ + DRWShadingGroup *light_center; + DRWShadingGroup *light_groundpoint; + DRWShadingGroup *light_groundline; + DRWShadingGroup *light_circle; + DRWShadingGroup *light_circle_shadow; + DRWShadingGroup *light_sunrays; + DRWShadingGroup *light_distance; + DRWShadingGroup *light_buflimit; + DRWShadingGroup *light_buflimit_points; + DRWShadingGroup *light_area_sphere; + DRWShadingGroup *light_area_square; + DRWShadingGroup *light_area_disk; + DRWShadingGroup *light_hemi; + DRWShadingGroup *light_spot_cone; + DRWShadingGroup *light_spot_blend; + DRWShadingGroup *light_spot_pyramid; + DRWShadingGroup *light_spot_blend_rect; + DRWShadingGroup *light_spot_volume; + DRWShadingGroup *light_spot_volume_rect; + DRWShadingGroup *light_spot_volume_outside; + DRWShadingGroup *light_spot_volume_rect_outside; /* Helpers */ DRWShadingGroup *relationship_lines; @@ -1156,7 +1156,7 @@ static void OBJECT_cache_init(void *vedata) for (int i = 0; i < 2; ++i) { OBJECT_ShadingGroupList *sgl = (i == 1) ? &stl->g_data->sgl_ghost : &stl->g_data->sgl; - /* Non Meshes Pass (Camera, empties, lamps ...) */ + /* Non Meshes Pass (Camera, empties, lights ...) */ struct GPUBatch *geom; struct GPUShader *sh; @@ -1304,57 +1304,57 @@ static void OBJECT_cache_init(void *vedata) /* Metaballs Handles */ sgl->mball_handle = shgroup_instance_mball_handles(sgl->non_meshes, draw_ctx->sh_cfg); - /* Lamps */ + /* Lights */ /* TODO - * for now we create multiple times the same VBO with only lamp center coordinates + * for now we create multiple times the same VBO with only light center coordinates * but ideally we would only create it once */ /* start with buflimit because we don't want stipples */ geom = DRW_cache_single_line_get(); - sgl->lamp_buflimit = shgroup_distance_lines_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + sgl->light_buflimit = shgroup_distance_lines_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); - sgl->lamp_center = shgroup_dynpoints_uniform_color(sgl->non_meshes, gb->colorLampNoAlpha, &gb->sizeLampCenter, draw_ctx->sh_cfg); + sgl->light_center = shgroup_dynpoints_uniform_color(sgl->non_meshes, gb->colorLightNoAlpha, &gb->sizeLightCenter, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_get(); - sgl->lamp_circle = shgroup_instance_screenspace(sgl->non_meshes, geom, &gb->sizeLampCircle, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_shadows_get(); - sgl->lamp_circle_shadow = shgroup_instance_screenspace(sgl->non_meshes, geom, &gb->sizeLampCircleShadow, draw_ctx->sh_cfg); + geom = DRW_cache_light_get(); + sgl->light_circle = shgroup_instance_screenspace(sgl->non_meshes, geom, &gb->sizeLightCircle, draw_ctx->sh_cfg); + geom = DRW_cache_light_shadows_get(); + sgl->light_circle_shadow = shgroup_instance_screenspace(sgl->non_meshes, geom, &gb->sizeLightCircleShadow, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_sunrays_get(); - sgl->lamp_sunrays = shgroup_instance_screenspace(sgl->non_meshes, geom, &gb->sizeLampCircle, draw_ctx->sh_cfg); + geom = DRW_cache_light_sunrays_get(); + sgl->light_sunrays = shgroup_instance_screenspace(sgl->non_meshes, geom, &gb->sizeLightCircle, draw_ctx->sh_cfg); - sgl->lamp_groundline = shgroup_groundlines_uniform_color(sgl->non_meshes, gb->colorLamp, draw_ctx->sh_cfg); - sgl->lamp_groundpoint = shgroup_groundpoints_uniform_color(sgl->non_meshes, gb->colorLamp, draw_ctx->sh_cfg); + sgl->light_groundline = shgroup_groundlines_uniform_color(sgl->non_meshes, gb->colorLight, draw_ctx->sh_cfg); + sgl->light_groundpoint = shgroup_groundpoints_uniform_color(sgl->non_meshes, gb->colorLight, draw_ctx->sh_cfg); geom = DRW_cache_screenspace_circle_get(); - sgl->lamp_area_sphere = shgroup_instance_screen_aligned(sgl->non_meshes, geom, draw_ctx->sh_cfg); + sgl->light_area_sphere = shgroup_instance_screen_aligned(sgl->non_meshes, geom, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_area_square_get(); - sgl->lamp_area_square = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + geom = DRW_cache_light_area_square_get(); + sgl->light_area_square = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_area_disk_get(); - sgl->lamp_area_disk = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + geom = DRW_cache_light_area_disk_get(); + sgl->light_area_disk = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_hemi_get(); - sgl->lamp_hemi = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + geom = DRW_cache_light_hemi_get(); + sgl->light_hemi = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); geom = DRW_cache_single_line_get(); - sgl->lamp_distance = shgroup_distance_lines_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + sgl->light_distance = shgroup_distance_lines_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); geom = DRW_cache_single_line_endpoints_get(); - sgl->lamp_buflimit_points = shgroup_distance_lines_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + sgl->light_buflimit_points = shgroup_distance_lines_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_spot_get(); - sgl->lamp_spot_cone = shgroup_spot_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + geom = DRW_cache_light_spot_get(); + sgl->light_spot_cone = shgroup_spot_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); geom = DRW_cache_circle_get(); - sgl->lamp_spot_blend = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + sgl->light_spot_blend = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_spot_square_get(); - sgl->lamp_spot_pyramid = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + geom = DRW_cache_light_spot_square_get(); + sgl->light_spot_pyramid = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); geom = DRW_cache_square_get(); - sgl->lamp_spot_blend_rect = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); + sgl->light_spot_blend_rect = shgroup_instance(sgl->non_meshes, geom, draw_ctx->sh_cfg); /* -------- STIPPLES ------- */ @@ -1380,21 +1380,21 @@ static void OBJECT_cache_init(void *vedata) state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_LESS_EQUAL | DRW_STATE_BLEND | DRW_STATE_CULL_FRONT; sgl->spot_shapes = psl->spot_shapes[i] = DRW_pass_create("Spot Shape Pass", state); - geom = DRW_cache_lamp_spot_volume_get(); - sgl->lamp_spot_volume = shgroup_instance_alpha(sgl->spot_shapes, geom, draw_ctx->sh_cfg); + geom = DRW_cache_light_spot_volume_get(); + sgl->light_spot_volume = shgroup_instance_alpha(sgl->spot_shapes, geom, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_spot_square_volume_get(); - sgl->lamp_spot_volume_rect = shgroup_instance_alpha(sgl->spot_shapes, geom, draw_ctx->sh_cfg); + geom = DRW_cache_light_spot_square_volume_get(); + sgl->light_spot_volume_rect = shgroup_instance_alpha(sgl->spot_shapes, geom, draw_ctx->sh_cfg); - geom = DRW_cache_lamp_spot_volume_get(); - sgl->lamp_spot_volume_outside = shgroup_instance_alpha(sgl->spot_shapes, geom, draw_ctx->sh_cfg); - DRW_shgroup_state_disable(sgl->lamp_spot_volume_outside, DRW_STATE_CULL_FRONT); - DRW_shgroup_state_enable(sgl->lamp_spot_volume_outside, DRW_STATE_CULL_BACK); + geom = DRW_cache_light_spot_volume_get(); + sgl->light_spot_volume_outside = shgroup_instance_alpha(sgl->spot_shapes, geom, draw_ctx->sh_cfg); + DRW_shgroup_state_disable(sgl->light_spot_volume_outside, DRW_STATE_CULL_FRONT); + DRW_shgroup_state_enable(sgl->light_spot_volume_outside, DRW_STATE_CULL_BACK); - geom = DRW_cache_lamp_spot_square_volume_get(); - sgl->lamp_spot_volume_rect_outside = shgroup_instance_alpha(sgl->spot_shapes, geom, draw_ctx->sh_cfg); - DRW_shgroup_state_disable(sgl->lamp_spot_volume_rect_outside, DRW_STATE_CULL_FRONT); - DRW_shgroup_state_enable(sgl->lamp_spot_volume_rect_outside, DRW_STATE_CULL_BACK); + geom = DRW_cache_light_spot_square_volume_get(); + sgl->light_spot_volume_rect_outside = shgroup_instance_alpha(sgl->spot_shapes, geom, draw_ctx->sh_cfg); + DRW_shgroup_state_disable(sgl->light_spot_volume_rect_outside, DRW_STATE_CULL_FRONT); + DRW_shgroup_state_enable(sgl->light_spot_volume_rect_outside, DRW_STATE_CULL_BACK); } { @@ -1499,52 +1499,52 @@ static void DRW_shgroup_mball_handles(OBJECT_ShadingGroupList *sgl, Object *ob, } } -static void DRW_shgroup_lamp(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLayer *view_layer) +static void DRW_shgroup_light(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLayer *view_layer) { Light *la = ob->data; float *color; int theme_id = DRW_object_wire_theme_get(ob, view_layer, &color); static float zero = 0.0f; - typedef struct LampEngineData { + typedef struct LightEngineData { DrawData dd; float shape_mat[4][4]; float spot_blend_mat[4][4]; - } LampEngineData; + } LightEngineData; - LampEngineData *lamp_engine_data = - (LampEngineData *)DRW_drawdata_ensure( + LightEngineData *light_engine_data = + (LightEngineData *)DRW_drawdata_ensure( &ob->id, &draw_engine_object_type, - sizeof(LampEngineData), + sizeof(LightEngineData), NULL, NULL); - float (*shapemat)[4] = lamp_engine_data->shape_mat; - float (*spotblendmat)[4] = lamp_engine_data->spot_blend_mat; + float (*shapemat)[4] = light_engine_data->shape_mat; + float (*spotblendmat)[4] = light_engine_data->spot_blend_mat; if ((ob->base_flag & (BASE_FROM_SET | BASE_FROM_DUPLI)) == 0) { /* Don't draw the center if it's selected or active */ - if (theme_id == TH_LAMP) { - DRW_shgroup_call_dynamic_add(sgl->lamp_center, ob->obmat[3]); + if (theme_id == TH_LIGHT) { + DRW_shgroup_call_dynamic_add(sgl->light_center, ob->obmat[3]); } } /* First circle */ - DRW_shgroup_call_dynamic_add(sgl->lamp_circle, ob->obmat[3], color); + DRW_shgroup_call_dynamic_add(sgl->light_circle, ob->obmat[3], color); /* draw dashed outer circle for shadow */ - DRW_shgroup_call_dynamic_add(sgl->lamp_circle_shadow, ob->obmat[3], color); + DRW_shgroup_call_dynamic_add(sgl->light_circle_shadow, ob->obmat[3], color); /* Distance */ if (ELEM(la->type, LA_SUN, LA_AREA)) { - DRW_shgroup_call_dynamic_add(sgl->lamp_distance, color, &zero, &la->dist, ob->obmat); + DRW_shgroup_call_dynamic_add(sgl->light_distance, color, &zero, &la->dist, ob->obmat); } copy_m4_m4(shapemat, ob->obmat); if (la->type == LA_SUN) { - DRW_shgroup_call_dynamic_add(sgl->lamp_sunrays, ob->obmat[3], color); + DRW_shgroup_call_dynamic_add(sgl->light_sunrays, ob->obmat[3], color); } else if (la->type == LA_SPOT) { float size[3], sizemat[4][4]; @@ -1565,39 +1565,39 @@ static void DRW_shgroup_lamp(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLayer mul_m4_m4m4(spotblendmat, shapemat, sizemat); if (la->mode & LA_SQUARE) { - DRW_shgroup_call_dynamic_add(sgl->lamp_spot_pyramid, color, &one, shapemat); + DRW_shgroup_call_dynamic_add(sgl->light_spot_pyramid, color, &one, shapemat); /* hide line if it is zero size or overlaps with outer border, * previously it adjusted to always to show it but that seems * confusing because it doesn't show the actual blend size */ if (blend != 0.0f && blend != 1.0f) { - DRW_shgroup_call_dynamic_add(sgl->lamp_spot_blend_rect, color, &one, spotblendmat); + DRW_shgroup_call_dynamic_add(sgl->light_spot_blend_rect, color, &one, spotblendmat); } if (la->mode & LA_SHOW_CONE) { - DRW_shgroup_call_dynamic_add(sgl->lamp_spot_volume_rect, cone_inside, &one, shapemat); - DRW_shgroup_call_dynamic_add(sgl->lamp_spot_volume_rect_outside, cone_outside, &one, shapemat); + DRW_shgroup_call_dynamic_add(sgl->light_spot_volume_rect, cone_inside, &one, shapemat); + DRW_shgroup_call_dynamic_add(sgl->light_spot_volume_rect_outside, cone_outside, &one, shapemat); } } else { - DRW_shgroup_call_dynamic_add(sgl->lamp_spot_cone, color, shapemat); + DRW_shgroup_call_dynamic_add(sgl->light_spot_cone, color, shapemat); /* hide line if it is zero size or overlaps with outer border, * previously it adjusted to always to show it but that seems * confusing because it doesn't show the actual blend size */ if (blend != 0.0f && blend != 1.0f) { - DRW_shgroup_call_dynamic_add(sgl->lamp_spot_blend, color, &one, spotblendmat); + DRW_shgroup_call_dynamic_add(sgl->light_spot_blend, color, &one, spotblendmat); } if (la->mode & LA_SHOW_CONE) { - DRW_shgroup_call_dynamic_add(sgl->lamp_spot_volume, cone_inside, &one, shapemat); - DRW_shgroup_call_dynamic_add(sgl->lamp_spot_volume_outside, cone_outside, &one, shapemat); + DRW_shgroup_call_dynamic_add(sgl->light_spot_volume, cone_inside, &one, shapemat); + DRW_shgroup_call_dynamic_add(sgl->light_spot_volume_outside, cone_outside, &one, shapemat); } } - DRW_shgroup_call_dynamic_add(sgl->lamp_buflimit, color, &la->clipsta, &la->clipend, ob->obmat); - DRW_shgroup_call_dynamic_add(sgl->lamp_buflimit_points, color, &la->clipsta, &la->clipend, ob->obmat); + DRW_shgroup_call_dynamic_add(sgl->light_buflimit, color, &la->clipsta, &la->clipend, ob->obmat); + DRW_shgroup_call_dynamic_add(sgl->light_buflimit_points, color, &la->clipsta, &la->clipend, ob->obmat); } else if (la->type == LA_AREA) { float size[3] = {1.0f, 1.0f, 1.0f}, sizemat[4][4]; @@ -1609,10 +1609,10 @@ static void DRW_shgroup_lamp(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLayer } if (ELEM(la->area_shape, LA_AREA_DISK, LA_AREA_ELLIPSE)) { - DRW_shgroup_call_dynamic_add(sgl->lamp_area_disk, color, &la->area_size, shapemat); + DRW_shgroup_call_dynamic_add(sgl->light_area_disk, color, &la->area_size, shapemat); } else { - DRW_shgroup_call_dynamic_add(sgl->lamp_area_square, color, &la->area_size, shapemat); + DRW_shgroup_call_dynamic_add(sgl->light_area_square, color, &la->area_size, shapemat); } } @@ -1622,12 +1622,12 @@ static void DRW_shgroup_lamp(OBJECT_ShadingGroupList *sgl, Object *ob, ViewLayer shapemat[0][1] = shapemat[0][2] = 0.0f; shapemat[1][0] = shapemat[1][2] = 0.0f; shapemat[2][0] = shapemat[2][1] = 0.0f; - DRW_shgroup_call_dynamic_add(sgl->lamp_area_sphere, color, &la->area_size, shapemat); + DRW_shgroup_call_dynamic_add(sgl->light_area_sphere, color, &la->area_size, shapemat); } /* Line and point going to the ground */ - DRW_shgroup_call_dynamic_add(sgl->lamp_groundline, ob->obmat[3]); - DRW_shgroup_call_dynamic_add(sgl->lamp_groundpoint, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(sgl->light_groundline, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(sgl->light_groundpoint, ob->obmat[3]); } static GPUBatch *batch_camera_path_get( @@ -2539,16 +2539,16 @@ static void DRW_shgroup_lightprobe( normalize_m4_m4(clipmat, ob->obmat); mul_m4_m4m4(clipmat, clipmat, cubefacemat[i]); - DRW_shgroup_call_dynamic_add(sgl->lamp_buflimit, color, &prb->clipsta, &prb->clipend, clipmat); - DRW_shgroup_call_dynamic_add(sgl->lamp_buflimit_points, color, &prb->clipsta, &prb->clipend, clipmat); + DRW_shgroup_call_dynamic_add(sgl->light_buflimit, color, &prb->clipsta, &prb->clipend, clipmat); + DRW_shgroup_call_dynamic_add(sgl->light_buflimit_points, color, &prb->clipsta, &prb->clipend, clipmat); } } } /* Line and point going to the ground */ if (prb->type == LIGHTPROBE_TYPE_CUBE) { - DRW_shgroup_call_dynamic_add(sgl->lamp_groundline, ob->obmat[3]); - DRW_shgroup_call_dynamic_add(sgl->lamp_groundpoint, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(sgl->light_groundline, ob->obmat[3]); + DRW_shgroup_call_dynamic_add(sgl->light_groundpoint, ob->obmat[3]); } } @@ -3045,7 +3045,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) if (hide_object_extra) { break; } - DRW_shgroup_lamp(sgl, ob, view_layer); + DRW_shgroup_light(sgl, ob, view_layer); break; case OB_CAMERA: if (hide_object_extra) { diff --git a/source/blender/draw/modes/shaders/common_globals_lib.glsl b/source/blender/draw/modes/shaders/common_globals_lib.glsl index 1cb8a440469..88540b13941 100644 --- a/source/blender/draw/modes/shaders/common_globals_lib.glsl +++ b/source/blender/draw/modes/shaders/common_globals_lib.glsl @@ -10,7 +10,7 @@ layout(std140) uniform globalsBlock { vec4 colorLibrarySelect; vec4 colorLibrary; vec4 colorTransform; - vec4 colorLamp; + vec4 colorLight; vec4 colorSpeaker; vec4 colorCamera; vec4 colorEmpty; @@ -35,7 +35,7 @@ layout(std140) uniform globalsBlock { vec4 colorFaceDot; vec4 colorDeselect; vec4 colorOutline; - vec4 colorLampNoAlpha; + vec4 colorLightNoAlpha; vec4 colorBackground; vec4 colorEditMeshMiddle; @@ -66,9 +66,9 @@ layout(std140) uniform globalsBlock { vec4 colorGridAxisY; vec4 colorGridAxisZ; - float sizeLampCenter; - float sizeLampCircle; - float sizeLampCircleShadow; + float sizeLightCenter; + float sizeLightCircle; + float sizeLightCircleShadow; float sizeVertex; float sizeEdge; float sizeEdgeFix; |