diff options
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_studiolight.h | 20 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/studiolight.c | 301 | ||||
-rw-r--r-- | source/blender/draw/engines/workbench/workbench_materials.c | 28 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 4 |
5 files changed, 263 insertions, 101 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index f20e9021e28..6bf10231be5 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3515,12 +3515,11 @@ class VIEW3D_PT_shading(Panel): col.separator() - if not(shading.light == 'STUDIO' and shading.studio_light_orientation == 'WORLD'): - row = col.row() - row.prop(shading, "show_shadows") - sub = row.row() - sub.active = shading.show_shadows - sub.prop(shading, "shadow_intensity", text="") + row = col.row() + row.prop(shading, "show_shadows") + sub = row.row() + sub.active = shading.show_shadows + sub.prop(shading, "shadow_intensity", text="") col.prop(shading, "show_object_outline") diff --git a/source/blender/blenkernel/BKE_studiolight.h b/source/blender/blenkernel/BKE_studiolight.h index 863aab37f39..2fcf6ab2f19 100644 --- a/source/blender/blenkernel/BKE_studiolight.h +++ b/source/blender/blenkernel/BKE_studiolight.h @@ -38,6 +38,8 @@ #include "DNA_space_types.h" +#include "IMB_imbuf_types.h" + /* * These defines are the indexes in the StudioLight.diffuse_light * X_POS means the light that is traveling towards the positive X @@ -50,17 +52,16 @@ #define STUDIOLIGHT_Z_POS 4 #define STUDIOLIGHT_Z_NEG 5 -enum StudioLightFlag -{ - STUDIOLIGHT_DIFFUSE_LIGHT_CALCULATED = (1 << 0), - STUDIOLIGHT_LIGHT_DIRECTION_CALCULATED = (1 << 1), - STUDIOLIGHT_EXTERNAL_FILE = (1 << 2), - STUDIOLIGHT_ORIENTATION_CAMERA = (1 << 3), - STUDIOLIGHT_ORIENTATION_WORLD = (1 << 4), +enum StudioLightFlag { + STUDIOLIGHT_DIFFUSE_LIGHT_CALCULATED = (1 << 0), + STUDIOLIGHT_LIGHT_DIRECTION_CALCULATED = (1 << 1), + STUDIOLIGHT_EXTERNAL_FILE = (1 << 2), + STUDIOLIGHT_ORIENTATION_CAMERA = (1 << 3), + STUDIOLIGHT_ORIENTATION_WORLD = (1 << 4), + STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED = (1 << 5), } StudioLightFlag; -typedef struct StudioLight -{ +typedef struct StudioLight { struct StudioLight *next, *prev; int flag; char name[FILE_MAXFILE]; @@ -69,6 +70,7 @@ typedef struct StudioLight int index; float diffuse_light[6][3]; float light_direction[3]; + ImBuf *radiance_buffers[6]; } StudioLight; void BKE_studiolight_init(void); diff --git a/source/blender/blenkernel/intern/studiolight.c b/source/blender/blenkernel/intern/studiolight.c index 7942cbaab71..5b84a686fa9 100644 --- a/source/blender/blenkernel/intern/studiolight.c +++ b/source/blender/blenkernel/intern/studiolight.c @@ -53,14 +53,21 @@ /* Statics */ static ListBase studiolights; -#define STUDIO_LIGHT_EXTENSIONS ".jpg", ".hdr" -#define STUDIO_LIGHT_DIFFUSE_SAMPLE_STEP 64 -static const char *STUDIO_LIGHT_CAMERA_FOLDER = "studiolights/camera/"; -static const char *STUDIO_LIGHT_WORLD_FOLDER = "studiolights/world/"; +#define STUDIOLIGHT_EXTENSIONS ".jpg", ".hdr" +#define STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE 32 + +static const char *STUDIOLIGHT_CAMERA_FOLDER = "studiolights/camera/"; +static const char *STUDIOLIGHT_WORLD_FOLDER = "studiolights/world/"; /* FUNCTIONS */ static void studiolight_free(struct StudioLight *sl) { + for (int index = 0 ; index < 6 ; index ++) { + if (sl->radiance_buffers[index] != NULL) { + MEM_freeN(sl->radiance_buffers[index]); + sl->radiance_buffers[index] = NULL; + } + } MEM_freeN(sl); } @@ -72,6 +79,10 @@ static struct StudioLight *studiolight_create(void) sl->flag = 0; sl->index = BLI_listbase_count(&studiolights); sl->icon_id = BKE_icon_ensure_studio_light(sl); + + for (int index = 0 ; index < 6 ; index ++) { + sl->radiance_buffers[index] = NULL; + } return sl; } @@ -91,44 +102,203 @@ static void equirectangular_to_direction(float r[3], float u, float v) r[2] = cosf(theta); } -static void studiolight_calculate_directional_diffuse_light(ImBuf *ibuf, float color[4], const float start[3], const float v1[3], const float v2[3]) +static void studiolight_calculate_radiance(ImBuf *ibuf, float color[4], const float direction[3]) { - const int steps = STUDIO_LIGHT_DIFFUSE_SAMPLE_STEP; float uv[2]; - float dir[3]; - float col[4]; - float v11[3]; - float v12[3]; - float totcol[4]; - - zero_v4(totcol); - for (int x = 0; x < steps ; x++) { - float xf = (float)x / (float)steps; - mul_v3_v3fl(v11, v1, xf); - for (int y = 0; y < steps; y++) { - float yf = (float)y / (float)steps; - /* start + x/steps*v1 + y/steps*v2 */ - mul_v3_v3fl(v12, v2, yf); - add_v3_v3v3(dir, start, v11); - add_v3_v3(dir, v12); - /* normalize */ - normalize_v3(dir); - - /* sample */ - direction_to_equirectangular(uv, dir); - nearest_interpolation_color_wrap(ibuf, NULL, col, uv[0] * ibuf->x, uv[1] * ibuf->y); - add_v3_v3(totcol, col); + direction_to_equirectangular(uv, direction); + nearest_interpolation_color_wrap(ibuf, NULL, color, uv[0] * ibuf->x, uv[1] * ibuf->y); +} + +static void studiolight_calculate_radiance_buffer(ImBuf *ibuf, float *colbuf, const float start_x, const float add_x, const float start_y, const float add_y, const float z, const int index_x, const int index_y, const int index_z) +{ + float direction[3]; + float yf = start_y; + float xf; + float *color = colbuf; + + for (int y = 0; y < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; y ++, yf += add_y) { + xf = start_x; + for (int x = 0; x < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; x ++, xf += add_x) { + direction[index_x] = xf; + direction[index_y] = yf; + direction[index_z] = z; + normalize_v3(direction); + studiolight_calculate_radiance(ibuf, color, direction); + color += 4; } } - mul_v3_v3fl(color, totcol, 1.0 / (steps * steps)); } -static void studiolight_calculate_diffuse_light(StudioLight *sl) +static void studiolight_calculate_radiance_buffers(StudioLight *sl) { - float start[3]; - float v1[3]; - float v2[3]; + if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) { + ImBuf* ibuf = NULL; + ibuf = IMB_loadiffname(sl->path, 0, NULL); + if (ibuf) { + IMB_float_from_rect(ibuf); + float *colbuf = MEM_mallocN(4*STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE*STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE*sizeof(float), __func__); + const float add = 1.0f / (STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE + 1); + const float start = ((1.0f / STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) * 0.5f) - 0.5f; + + /* front */ + studiolight_calculate_radiance_buffer(ibuf, colbuf, start, add, start, add, 0.5f, 0, 2, 1); + sl->radiance_buffers[STUDIOLIGHT_Y_POS] = IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE); + + /* back */ + studiolight_calculate_radiance_buffer(ibuf, colbuf, -start, -add, start, add, -0.5f, 0, 2, 1); + sl->radiance_buffers[STUDIOLIGHT_Y_NEG] = IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE); + + /* left */ + studiolight_calculate_radiance_buffer(ibuf, colbuf, -start, -add, start, add, 0.5f, 1, 2, 0); + sl->radiance_buffers[STUDIOLIGHT_X_POS] = IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE); + + /* right */ + studiolight_calculate_radiance_buffer(ibuf, colbuf, start, add, start, add, -0.5f, 1, 2, 0); + sl->radiance_buffers[STUDIOLIGHT_X_NEG] = IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE); + + /* top */ + studiolight_calculate_radiance_buffer(ibuf, colbuf, start, add, start, add, -0.5f, 0, 1, 2); + sl->radiance_buffers[STUDIOLIGHT_Z_NEG] = IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE); + + /* bottom */ + studiolight_calculate_radiance_buffer(ibuf, colbuf, start, add, -start, -add, 0.5f, 0, 1, 2); + sl->radiance_buffers[STUDIOLIGHT_Z_POS] = IMB_allocFromBuffer(NULL, colbuf, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE, STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE); + +#if 0 + IMB_saveiff(sl->radiance_buffers[STUDIOLIGHT_X_POS], "/tmp/studiolight_radiance_left.png", IB_rectfloat); + IMB_saveiff(sl->radiance_buffers[STUDIOLIGHT_X_NEG], "/tmp/studiolight_radiance_right.png", IB_rectfloat); + IMB_saveiff(sl->radiance_buffers[STUDIOLIGHT_Y_POS], "/tmp/studiolight_radiance_front.png", IB_rectfloat); + IMB_saveiff(sl->radiance_buffers[STUDIOLIGHT_Y_NEG], "/tmp/studiolight_radiance_back.png", IB_rectfloat); + IMB_saveiff(sl->radiance_buffers[STUDIOLIGHT_Z_POS], "/tmp/studiolight_radiance_bottom.png", IB_rectfloat); + IMB_saveiff(sl->radiance_buffers[STUDIOLIGHT_Z_NEG], "/tmp/studiolight_radiance_top.png", IB_rectfloat); +#endif + MEM_freeN(colbuf); + IMB_freeImBuf(ibuf); + } + } + sl->flag |= STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED; +} +static void studiolight_calculate_irradiance(StudioLight *sl, float color[3], const float normal[3]) +{ + float direction[3]; + ImBuf *radiance_buffer; + float *radiance_color; + float angle; + + /* back */ + radiance_buffer = sl->radiance_buffers[STUDIOLIGHT_Y_POS]; + radiance_color = radiance_buffer->rect_float; + for (int y = 0; y < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; y ++) { + for (int x = 0; x < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; x ++) { + // calculate light direction; + direction[1] = 0.5; + direction[0] = (x / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + direction[2] = (y / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + normalize_v3(direction); + angle = dot_v3v3(direction, normal); + if (angle > 0.0f) { + madd_v3_v3fl(color, radiance_color, angle); + } + radiance_color += 4; + } + } + + /* front */ + radiance_buffer = sl->radiance_buffers[STUDIOLIGHT_Y_NEG]; + radiance_color = radiance_buffer->rect_float; + for (int y = 0; y < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; y ++) { + for (int x = 0; x < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; x ++) { + // calculate light direction; + direction[1] = -0.5; + direction[0] = (x / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + direction[2] = (y / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + normalize_v3(direction); + angle = dot_v3v3(direction, normal); + if (angle > 0.0f) { + madd_v3_v3fl(color, radiance_color, angle); + } + radiance_color += 4; + } + } + + /* left */ + radiance_buffer = sl->radiance_buffers[STUDIOLIGHT_X_POS]; + radiance_color = radiance_buffer->rect_float; + for (int y = 0; y < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; y ++) { + for (int x = 0; x < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; x ++) { + // calculate light direction; + direction[0] = 0.5; + direction[1] = (x / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + direction[2] = (y / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + normalize_v3(direction); + angle = dot_v3v3(direction, normal); + if (angle > 0.0f) { + madd_v3_v3fl(color, radiance_color, angle); + } + radiance_color += 4; + } + } + + /* right */ + radiance_buffer = sl->radiance_buffers[STUDIOLIGHT_X_NEG]; + radiance_color = radiance_buffer->rect_float; + for (int y = 0; y < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; y ++) { + for (int x = 0; x < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; x ++) { + // calculate light direction; + direction[0] = -0.5; + direction[1] = (x / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + direction[2] = (y / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + normalize_v3(direction); + angle = dot_v3v3(direction, normal); + if (angle > 0.0f) { + madd_v3_v3fl(color, radiance_color, angle); + } + radiance_color += 4; + } + } + + /* top */ + radiance_buffer = sl->radiance_buffers[STUDIOLIGHT_Z_POS]; + radiance_color = radiance_buffer->rect_float; + for (int y = 0; y < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; y ++) { + for (int x = 0; x < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; x ++) { + // calculate light direction; + direction[2] = 0.5; + direction[0] = (x / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + direction[1] = (y / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + normalize_v3(direction); + angle = dot_v3v3(direction, normal); + if (angle > 0.0f) { + madd_v3_v3fl(color, radiance_color, angle); + } + radiance_color += 4; + } + } + + /* bottom */ + radiance_buffer = sl->radiance_buffers[STUDIOLIGHT_Z_NEG]; + radiance_color = radiance_buffer->rect_float; + for (int y = 0; y < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; y ++) { + for (int x = 0; x < STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE; x ++) { + // calculate light direction; + direction[2] = -0.5; + direction[0] = (x / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + direction[1] = (y / (float)STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) - 0.5f; + normalize_v3(direction); + angle = dot_v3v3(direction, normal); + if (angle > 0.0f) { + madd_v3_v3fl(color, radiance_color, angle); + } + radiance_color += 4; + } + } + + mul_v3_fl(color, 1.25 / (STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE * STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE)); +} + +static void studiolight_calculate_diffuse_light(StudioLight *sl) +{ /* init light to black */ copy_v3_fl(sl->diffuse_light[STUDIOLIGHT_X_POS], 0.0f); copy_v3_fl(sl->diffuse_light[STUDIOLIGHT_X_NEG], 0.0f); @@ -138,33 +308,21 @@ static void studiolight_calculate_diffuse_light(StudioLight *sl) copy_v3_fl(sl->diffuse_light[STUDIOLIGHT_Z_NEG], 0.0f); if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) { - ImBuf *ibuf = NULL; - ibuf = IMB_loadiffname(sl->path, 0, NULL); - if (ibuf) { - IMB_float_from_rect(ibuf); - /* XXX: should calculate the same, only rendering should be different */ - copy_v3_fl3(start, -1.0f, -1.0f, -1.0f); - copy_v3_fl3(v1, 0.0f, 2.0f, 0.0f); - copy_v3_fl3(v2, 0.0f, 0.0f, 2.0f); - studiolight_calculate_directional_diffuse_light(ibuf, sl->diffuse_light[STUDIOLIGHT_Y_POS], start, v1, v2); - copy_v3_fl3(start, 1.0f, -1.0f, -1.0f); - studiolight_calculate_directional_diffuse_light(ibuf, sl->diffuse_light[STUDIOLIGHT_Y_NEG], start, v1, v2); - - copy_v3_fl3(start, -1.0f, -1.0f, -1.0f); - copy_v3_fl3(v1, 2.0f, 0.0f, 0.0f); - copy_v3_fl3(v2, 0.0f, 0.0f, 2.0f); - studiolight_calculate_directional_diffuse_light(ibuf, sl->diffuse_light[STUDIOLIGHT_X_POS], start, v1, v2); - copy_v3_fl3(start, -1.0f, 1.0f, -1.0f); - studiolight_calculate_directional_diffuse_light(ibuf, sl->diffuse_light[STUDIOLIGHT_X_NEG], start, v1, v2); - - copy_v3_fl3(start, -1.0f, -1.0f, 1.0f); - copy_v3_fl3(v1, 2.0f, 0.0f, 0.0f); - copy_v3_fl3(v2, 0.0f, 2.0f, 0.0f); - studiolight_calculate_directional_diffuse_light(ibuf, sl->diffuse_light[STUDIOLIGHT_Z_POS], start, v1, v2); - copy_v3_fl3(start, -1.0f, -1.0f, -1.0f); - studiolight_calculate_directional_diffuse_light(ibuf, sl->diffuse_light[STUDIOLIGHT_Z_NEG], start, v1, v2); - IMB_freeImBuf(ibuf); - } + const float normal_x_neg[3] = {-1.0f, 0.0f, 0.0f}; + const float normal_x_pos[3] = { 1.0f, 0.0f, 0.0f}; + const float normal_y_neg[3] = { 0.0f, 1.0f, 0.0f}; + const float normal_y_pos[3] = { 0.0f, -1.0f, 0.0f}; + const float normal_z_neg[3] = { 0.0f, 0.0f, -1.0f}; + const float normal_z_pos[3] = { 0.0f, 0.0f, 1.0f}; + + BKE_studiolight_ensure_flag(sl, STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED); + + studiolight_calculate_irradiance(sl, sl->diffuse_light[STUDIOLIGHT_X_POS], normal_x_pos); + studiolight_calculate_irradiance(sl, sl->diffuse_light[STUDIOLIGHT_X_NEG], normal_x_neg); + studiolight_calculate_irradiance(sl, sl->diffuse_light[STUDIOLIGHT_Y_POS], normal_y_pos); + studiolight_calculate_irradiance(sl, sl->diffuse_light[STUDIOLIGHT_Y_NEG], normal_y_neg); + studiolight_calculate_irradiance(sl, sl->diffuse_light[STUDIOLIGHT_Z_POS], normal_z_pos); + studiolight_calculate_irradiance(sl, sl->diffuse_light[STUDIOLIGHT_Z_NEG], normal_z_neg); } sl->flag |= STUDIOLIGHT_DIFFUSE_LIGHT_CALCULATED; } @@ -190,10 +348,12 @@ static void studiolight_calculate_light_direction(StudioLight *sl) nearest_interpolation_color_wrap(ibuf, NULL, col, x, y); new_light = col[0] + col[1] + col[2]; if (new_light > best_light) { - equirectangular_to_direction(direction, x, y); + float u = x / (float)ibuf->x; + float v = y / (float)ibuf->y; + equirectangular_to_direction(direction, u, v); sl->light_direction[0] = direction[1]; - sl->light_direction[1] = direction[2]; - sl->light_direction[2] = direction[0]; + sl->light_direction[1] = direction[0]; + sl->light_direction[2] = direction[2]; best_light = new_light; } } @@ -216,7 +376,7 @@ static void studiolight_add_files_from_datafolder(const int folder_id, const cha if ((dir[i].type & S_IFREG)) { const char *filename = dir[i].relname; const char *path = dir[i].path; - if (BLI_testextensie_n(filename, STUDIO_LIGHT_EXTENSIONS, NULL)) { + if (BLI_testextensie_n(filename, STUDIOLIGHT_EXTENSIONS, NULL)) { sl = studiolight_create(); sl->flag = STUDIOLIGHT_EXTERNAL_FILE | flag; BLI_strncpy(sl->name, filename, FILE_MAXFILE); @@ -277,10 +437,10 @@ void BKE_studiolight_init(void) copy_v3_fl(sl->diffuse_light[STUDIOLIGHT_Z_NEG], 0.0f); BLI_addtail(&studiolights, sl); - studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES, STUDIO_LIGHT_CAMERA_FOLDER, STUDIOLIGHT_ORIENTATION_CAMERA); - studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, STUDIO_LIGHT_CAMERA_FOLDER, STUDIOLIGHT_ORIENTATION_CAMERA); - studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES, STUDIO_LIGHT_WORLD_FOLDER, STUDIOLIGHT_ORIENTATION_WORLD); - studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, STUDIO_LIGHT_WORLD_FOLDER, STUDIOLIGHT_ORIENTATION_WORLD); + studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES, STUDIOLIGHT_CAMERA_FOLDER, STUDIOLIGHT_ORIENTATION_CAMERA); + studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, STUDIOLIGHT_CAMERA_FOLDER, STUDIOLIGHT_ORIENTATION_CAMERA); + studiolight_add_files_from_datafolder(BLENDER_SYSTEM_DATAFILES, STUDIOLIGHT_WORLD_FOLDER, STUDIOLIGHT_ORIENTATION_WORLD); + studiolight_add_files_from_datafolder(BLENDER_USER_DATAFILES, STUDIOLIGHT_WORLD_FOLDER, STUDIOLIGHT_ORIENTATION_WORLD); /* sort studio lights on filename. */ BLI_listbase_sort(&studiolights, studiolight_cmp); @@ -379,6 +539,9 @@ void BKE_studiolight_ensure_flag(StudioLight *sl, int flag) return; } + if ((flag & STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED)) { + studiolight_calculate_radiance_buffers(sl); + } if ((flag & STUDIOLIGHT_DIFFUSE_LIGHT_CALCULATED)) { studiolight_calculate_diffuse_light(sl); } diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index 16d982ad42f..116bf809f1f 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -88,8 +88,8 @@ extern char datatoc_workbench_world_light_lib_glsl[]; extern DrawEngineType draw_engine_workbench_solid; #define OBJECT_ID_PASS_ENABLED(wpd) (wpd->shading.flag & V3D_SHADING_OBJECT_OUTLINE) -#define NORMAL_VIEWPORT_PASS_ENABLED(wpd) (wpd->shading.light & V3D_LIGHTING_STUDIO || wpd->shading.flag & V3D_SHADING_SHADOW) #define SHADOW_ENABLED(wpd) (wpd->shading.flag & V3D_SHADING_SHADOW) +#define NORMAL_VIEWPORT_PASS_ENABLED(wpd) (wpd->shading.light & V3D_LIGHTING_STUDIO || SHADOW_ENABLED(wpd)) #define NORMAL_ENCODING_ENABLED() (true) #define STUDIOLIGHT_ORIENTATION_WORLD_ENABLED(wpd) (wpd->studio_light->flag & STUDIOLIGHT_ORIENTATION_WORLD) @@ -104,9 +104,7 @@ static char *workbench_build_defines(WORKBENCH_PrivateData *wpd, int drawtype) BLI_dynstr_appendf(ds, "#define V3D_SHADING_OBJECT_OUTLINE\n"); } if (wpd->shading.flag & V3D_SHADING_SHADOW) { - if (!STUDIOLIGHT_ORIENTATION_WORLD_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define V3D_SHADING_SHADOW\n"); - } + BLI_dynstr_appendf(ds, "#define V3D_SHADING_SHADOW\n"); } if (wpd->shading.light & V3D_LIGHTING_STUDIO) { BLI_dynstr_appendf(ds, "#define V3D_LIGHTING_STUDIO\n"); @@ -438,17 +436,17 @@ void workbench_materials_cache_init(WORKBENCH_Data *vedata) wpd->world_ubo = DRW_uniformbuffer_create(sizeof(WORKBENCH_UBO_World), NULL); DRW_uniformbuffer_update(wpd->world_ubo, &wpd->world_data); - if (STUDIOLIGHT_ORIENTATION_WORLD_ENABLED(wpd)) { - BKE_studiolight_ensure_flag(wpd->studio_light, STUDIOLIGHT_LIGHT_DIRECTION_CALCULATED); - float rot_matrix[3][3]; - // float dir[3] = {0.57, 0.57, -0.57}; - axis_angle_to_mat3_single(rot_matrix, 'Z', wpd->shading.studiolight_rot_z); - mul_v3_m3v3(e_data.display.light_direction, rot_matrix, wpd->studio_light->light_direction); - } - else { - copy_v3_v3(e_data.display.light_direction, scene->display.light_direction); - negate_v3(e_data.display.light_direction); - } + copy_v3_v3(e_data.display.light_direction, scene->display.light_direction); + negate_v3(e_data.display.light_direction); +#if 0 + if (STUDIOLIGHT_ORIENTATION_WORLD_ENABLED(wpd)) { + BKE_studiolight_ensure_flag(wpd->studio_light, STUDIOLIGHT_LIGHT_DIRECTION_CALCULATED); + float rot_matrix[3][3]; + // float dir[3] = {0.57, 0.57, -0.57}; + axis_angle_to_mat3_single(rot_matrix, 'Z', wpd->shading.studiolight_rot_z); + mul_v3_m3v3(e_data.display.light_direction, rot_matrix, wpd->studio_light->light_direction); + } +#endif float view_matrix[4][4]; DRW_viewport_matrix_get(view_matrix, DRW_MAT_VIEW); mul_v3_mat3_m4v3(e_data.light_direction_vs, view_matrix, e_data.display.light_direction); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 8b440ad6f4a..3b9adad4957 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -224,7 +224,7 @@ static const EnumPropertyItem rna_enum_studio_light_items[] = { {29, "STUDIOLIGHT_29", 0, "", ""}, {0, NULL, 0, NULL, NULL} }; -#define NUM_STUDIO_LIGHT_ITEMS 30 +#define NUM_STUDIOLIGHT_ITEMS 30 const EnumPropertyItem rna_enum_clip_editor_mode_items[] = { {SC_MODE_TRACKING, "TRACKING", ICON_ANIM_DATA, "Tracking", "Show tracking and solving tools"}, @@ -738,7 +738,7 @@ static const EnumPropertyItem *rna_View3DShading_studio_light_itemf( int totitem = 0; LISTBASE_FOREACH(StudioLight *, sl, BKE_studiolight_listbase()) { - if (totitem < NUM_STUDIO_LIGHT_ITEMS) { + if (totitem < NUM_STUDIOLIGHT_ITEMS) { RNA_enum_items_add_value(&item, &totitem, rna_enum_studio_light_items, totitem); lastitem = &item[totitem - 1]; lastitem->value = sl->index; |