diff options
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/DRW_render.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache.c | 102 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache.h | 22 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_common.c | 16 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_common.h | 6 |
5 files changed, 74 insertions, 74 deletions
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; |