Commit: 36e9ed98e7cbccdf3e1b3085a4be2679aec5a869
Author: Jeroen Bakker
Date: Tue May 29 16:21:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB36e9ed98e7cbccdf3e1b3085a4be2679aec5a869
StudioLight: Calculate Specular irradiance
===================================================================
M source/blender/blenkernel/BKE_studiolight.h
M source/blender/blenkernel/intern/studiolight.c
M source/blender/draw/engines/eevee/eevee_lookdev.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_studiolight.h
b/source/blender/blenkernel/BKE_studiolight.h
index 213de712abd..2f2e948ab26 100644
--- a/source/blender/blenkernel/BKE_studiolight.h
+++ b/source/blender/blenkernel/BKE_studiolight.h
@@ -57,14 +57,16 @@
struct GPUTexture;
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_EQUIRECTANGULAR_IMAGE_LOADED = (1 << 5),
- STUDIOLIGHT_EQUIRECTANGULAR_GPUTEXTURE = (1 << 6),
- STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED = (1 << 7),
+ 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_EQUIRECTANGULAR_IMAGE_LOADED = (1 << 5),
+ STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_IMAGE_CALCULATED = (1 << 6),
+ STUDIOLIGHT_EQUIRECTANGULAR_RADIANCE_GPUTEXTURE = (1 << 7),
+ STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_GPUTEXTURE = (1 << 8),
+ STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED = (1 << 9),
} StudioLightFlag;
typedef struct StudioLight {
@@ -77,9 +79,11 @@ typedef struct StudioLight {
int index;
float diffuse_light[6][3];
float light_direction[3];
- ImBuf *equirectangular_buffer;
- ImBuf *radiance_buffers[6];
- struct GPUTexture *equirectangular_gputexture;
+ ImBuf *equirectangular_radiance_buffer;
+ ImBuf *equirectangular_irradiance_buffer;
+ ImBuf *radiance_cubemap_buffers[6];
+ struct GPUTexture *equirectangular_radiance_gputexture;
+ struct GPUTexture *equirectangular_irradiance_gputexture;
} StudioLight;
void BKE_studiolight_init(void);
diff --git a/source/blender/blenkernel/intern/studiolight.c
b/source/blender/blenkernel/intern/studiolight.c
index f139ea5fbe6..56765f06a59 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -56,7 +56,9 @@
/* Statics */
static ListBase studiolights;
#define STUDIOLIGHT_EXTENSIONS ".jpg", ".hdr"
-#define STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE 32
+#define STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE 8
+#define STUDIOLIGHT_IRRADIANCE_EQUIRECTANGULAR_HEIGHT 64
+#define STUDIOLIGHT_IRRADIANCE_EQUIRECTANGULAR_WIDTH
(STUDIOLIGHT_IRRADIANCE_EQUIRECTANGULAR_HEIGHT * 2)
static const char *STUDIOLIGHT_CAMERA_FOLDER = "studiolights/camera/";
static const char *STUDIOLIGHT_WORLD_FOLDER = "studiolights/world/";
@@ -65,19 +67,29 @@ static const char *STUDIOLIGHT_WORLD_FOLDER =
"studiolights/world/";
static void studiolight_free(struct StudioLight *sl)
{
for (int index = 0 ; index < 6 ; index ++) {
- if (sl->radiance_buffers[index] != NULL) {
- IMB_freeImBuf(sl->radiance_buffers[index]);
- sl->radiance_buffers[index] = NULL;
+ if (sl->radiance_cubemap_buffers[index] != NULL) {
+ IMB_freeImBuf(sl->radiance_cubemap_buffers[index]);
+ sl->radiance_cubemap_buffers[index] = NULL;
}
- if (sl->equirectangular_gputexture) {
- GPU_texture_free(sl->equirectangular_gputexture);
- sl->equirectangular_gputexture = NULL;
+ if (sl->equirectangular_radiance_gputexture) {
+
GPU_texture_free(sl->equirectangular_radiance_gputexture);
+ sl->equirectangular_radiance_gputexture = NULL;
}
- if (sl->equirectangular_buffer) {
- IMB_freeImBuf(sl->equirectangular_buffer);
- sl->equirectangular_buffer = NULL;
+ if (sl->equirectangular_irradiance_gputexture) {
+
GPU_texture_free(sl->equirectangular_irradiance_gputexture);
+ sl->equirectangular_irradiance_gputexture = NULL;
+ }
+
+ if (sl->equirectangular_radiance_buffer) {
+ IMB_freeImBuf(sl->equirectangular_radiance_buffer);
+ sl->equirectangular_radiance_buffer = NULL;
+ }
+
+ if (sl->equirectangular_irradiance_buffer) {
+ IMB_freeImBuf(sl->equirectangular_irradiance_buffer);
+ sl->equirectangular_irradiance_buffer = NULL;
}
}
MEM_freeN(sl);
@@ -94,7 +106,7 @@ static struct StudioLight *studiolight_create(void)
sl->irradiance_icon_id = BKE_icon_ensure_studio_light(sl,
STUDIOLIGHT_ICON_ID_TYPE_IRRADIANCE);
for (int index = 0 ; index < 6 ; index ++) {
- sl->radiance_buffers[index] = NULL;
+ sl->radiance_cubemap_buffers[index] = NULL;
}
return sl;
}
@@ -153,30 +165,39 @@ static void
studiolight_load_equierectangular_image(StudioLight *sl)
ibuf = IMB_loadiffname(sl->path, 0, NULL);
if (ibuf) {
IMB_float_from_rect(ibuf);
- sl->equirectangular_buffer = ibuf;
+ sl->equirectangular_radiance_buffer = ibuf;
}
}
sl->flag |= STUDIOLIGHT_EQUIRECTANGULAR_IMAGE_LOADED;
}
-static void studiolight_create_equierectangular_gputexture(StudioLight *sl)
+static void
studiolight_create_equierectangular_radiance_gputexture(StudioLight *sl)
{
if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) {
char error[256];
BKE_studiolight_ensure_flag(sl,
STUDIOLIGHT_EQUIRECTANGULAR_IMAGE_LOADED);
- ImBuf *ibuf = sl->equirectangular_buffer;
- sl->equirectangular_gputexture = GPU_texture_create_2D(ibuf->x,
ibuf->y, GPU_RGBA16F, ibuf->rect_float, error);
+ ImBuf *ibuf = sl->equirectangular_radiance_buffer;
+ sl->equirectangular_radiance_gputexture =
GPU_texture_create_2D(ibuf->x, ibuf->y, GPU_RGBA16F, ibuf->rect_float, error);
}
- sl->flag |= STUDIOLIGHT_EQUIRECTANGULAR_GPUTEXTURE;
+ sl->flag |= STUDIOLIGHT_EQUIRECTANGULAR_RADIANCE_GPUTEXTURE;
}
+static void
studiolight_create_equierectangular_irradiance_gputexture(StudioLight *sl)
+{
+ if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) {
+ char error[256];
+ BKE_studiolight_ensure_flag(sl,
STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_IMAGE_CALCULATED);
+ ImBuf *ibuf = sl->equirectangular_irradiance_buffer;
+ sl->equirectangular_irradiance_gputexture =
GPU_texture_create_2D(ibuf->x, ibuf->y, GPU_RGBA16F, ibuf->rect_float, error);
+ }
+ sl->flag |= STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_GPUTEXTURE;
+}
-
-static void studiolight_calculate_radiance_buffers(StudioLight *sl)
+static void studiolight_calculate_radiance_cubemap_buffers(StudioLight *sl)
{
if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) {
BKE_studiolight_ensure_flag(sl,
STUDIOLIGHT_EQUIRECTANGULAR_IMAGE_LOADED);
- ImBuf* ibuf = sl->equirectangular_buffer;
+ ImBuf* ibuf = sl->equirectangular_radiance_buffer;
if (ibuf) {
float *colbuf =
MEM_mallocN(SQUARE(STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE) * sizeof(float[4]),
__func__);
const float add = 1.0f /
(STUDIOLIGHT_RADIANCE_CUBEMAP_SIZE + 1);
@@ -184,41 +205,41 @@ static void
studiolight_calculate_radiance_buffers(StudioLight *sl)
/* front */
studiolight_calculate_radiance_buffer(ibuf, colbuf,
start, add, start, add, 0.5f, 0, 2, 1);
- sl->radiance_buffers[STUDIOLIGHT_Y_POS] =
IMB_allocFromBuffer(
+ sl->radiance_cubemap_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(
+ sl->radiance_cubemap_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(
+ sl->radiance_cubemap_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(
+ sl->radiance_cubemap_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(
+ sl->radiance_cubemap_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(
+ sl->radiance_cubemap_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);
+
IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_X_POS],
"/tmp/studiolight_radiance_left.png", IB_rectfloat);
+
IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_X_NEG],
"/tmp/studiolight_radiance_right.png", IB_rectfloat);
+
IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Y_POS],
"/tmp/studiolight_radiance_front.png", IB_rectfloat);
+
IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Y_NEG],
"/tmp/studiolight_radiance_back.png", IB_rectfloat);
+
IMB_saveiff(sl->radiance_cubemap_buffers[STUDIOLIGHT_Z_POS],
"/tmp/studiolight_radiance_bottom.png", IB_rectfloat);
+ IMB_saveiff(
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
