Commit: 65b3c7b72cb5f49bb64406bd782e2a705c09016c
Author: Jeroen Bakker
Date: Tue Jun 19 08:48:01 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB65b3c7b72cb5f49bb64406bd782e2a705c09016c
Studiolight: Add SH2 cache
- the result of the SH2-coeffiecients are stored in a bin file (3*9
floats). As the file is a local file we do not care about the
architecture.
- solved issue that also for internal lights the irradiance file were
stored. We don't want that as it could be in a not accessible location
===================================================================
M source/blender/blenkernel/BKE_studiolight.h
M source/blender/blenkernel/intern/studiolight.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_studiolight.h
b/source/blender/blenkernel/BKE_studiolight.h
index 0e94411030b..135f926df15 100644
--- a/source/blender/blenkernel/BKE_studiolight.h
+++ b/source/blender/blenkernel/BKE_studiolight.h
@@ -85,7 +85,8 @@ typedef struct StudioLight {
int flag;
char name[FILE_MAXFILE];
char path[FILE_MAX];
- char *path_irr;
+ char *path_irr_cache;
+ char *path_sh2_cache;
int icon_id_irradiance;
int icon_id_radiance;
int icon_id_matcap;
diff --git a/source/blender/blenkernel/intern/studiolight.c
b/source/blender/blenkernel/intern/studiolight.c
index b64feef5528..6e4bfddcd8b 100644
--- a/source/blender/blenkernel/intern/studiolight.c
+++ b/source/blender/blenkernel/intern/studiolight.c
@@ -65,42 +65,35 @@ static const char *STUDIOLIGHT_WORLD_FOLDER =
"studiolights/world/";
static const char *STUDIOLIGHT_MATCAP_FOLDER = "studiolights/matcap/";
/* FUNCTIONS */
+#define SAFE_MEM_FREEN(p) \
+if (p) { \
+ MEM_freeN(p); \
+ p = NULL; \
+}
+#define SAFE_IMB_FREE(p) \
+if (p) { \
+ IMB_freeImBuf(p); \
+ p = NULL; \
+}
+#define SAFE_GPU_TEXTURE_FREE(p) \
+if (p) { \
+ GPU_texture_free(p); \
+ p = NULL; \
+}
+
static void studiolight_free(struct StudioLight *sl)
{
for (int index = 0 ; index < 6 ; index ++) {
- if (sl->radiance_cubemap_buffers[index] != NULL) {
- IMB_freeImBuf(sl->radiance_cubemap_buffers[index]);
- sl->radiance_cubemap_buffers[index] = NULL;
- }
- }
- if (sl->equirectangular_radiance_gputexture) {
- GPU_texture_free(sl->equirectangular_radiance_gputexture);
- sl->equirectangular_radiance_gputexture = 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;
- }
- if (sl->path_irr) {
- MEM_freeN(sl->path_irr);
- sl->path_irr = NULL;
+ SAFE_IMB_FREE(sl->radiance_cubemap_buffers[index])
}
- if (sl->gpu_matcap_3components) {
- MEM_freeN(sl->gpu_matcap_3components);
- sl->gpu_matcap_3components = NULL;
- }
- MEM_freeN(sl);
+ SAFE_GPU_TEXTURE_FREE(sl->equirectangular_radiance_gputexture);
+ SAFE_GPU_TEXTURE_FREE(sl->equirectangular_irradiance_gputexture);
+ SAFE_IMB_FREE(sl->equirectangular_radiance_buffer)
+ SAFE_IMB_FREE(sl->equirectangular_irradiance_buffer)
+ SAFE_MEM_FREEN(sl->path_irr_cache);
+ SAFE_MEM_FREEN(sl->path_sh2_cache);
+ SAFE_MEM_FREEN(sl->gpu_matcap_3components);
+ SAFE_MEM_FREEN(sl);
}
static struct StudioLight *studiolight_create(int flag)
@@ -108,7 +101,8 @@ static struct StudioLight *studiolight_create(int flag)
struct StudioLight *sl = MEM_callocN(sizeof(*sl), __func__);
sl->path[0] = 0x00;
sl->name[0] = 0x00;
- sl->path_irr = NULL;
+ sl->path_irr_cache = NULL;
+ sl->path_sh2_cache = NULL;
sl->flag = flag;
sl->index = BLI_listbase_count(&studiolights);
if (flag & STUDIOLIGHT_ORIENTATION_VIEWNORMAL) {
@@ -468,8 +462,14 @@ static void
studiolight_calculate_diffuse_light(StudioLight *sl)
print_v3("SH2", sl->spherical_harmonics_coefs[comp]);
#endif
}
+ if (sl->flag & STUDIOLIGHT_USER_DEFINED) {
+ FILE *fp = BLI_fopen(sl->path_sh2_cache, "wb");
+ if (fp) {
+ fwrite(sl->spherical_harmonics_coefs,
sizeof(sl->spherical_harmonics_coefs), 1, fp);
+ fclose(fp);
+ }
+ }
}
-
sl->flag |= STUDIOLIGHT_SPHERICAL_HARMONICS_COEFFICIENTS_CALCULATED;
}
@@ -554,7 +554,7 @@ static bool
studiolight_load_irradiance_equirectangular_image(StudioLight *sl)
{
if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) {
ImBuf *ibuf = NULL;
- ibuf = IMB_loadiffname(sl->path_irr, 0, NULL);
+ ibuf = IMB_loadiffname(sl->path_irr_cache, 0, NULL);
if (ibuf) {
IMB_float_from_rect(ibuf);
sl->equirectangular_irradiance_buffer = ibuf;
@@ -565,6 +565,23 @@ static bool
studiolight_load_irradiance_equirectangular_image(StudioLight *sl)
return false;
}
+static bool studiolight_load_spherical_harmonics_coefficients(StudioLight *sl)
+{
+ if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) {
+ FILE *fp = BLI_fopen(sl->path_sh2_cache, "rb");
+ if (fp) {
+ if (fread((void*)(sl->spherical_harmonics_coefs),
sizeof(sl->spherical_harmonics_coefs), 1, fp))
+ {
+ sl->flag |=
STUDIOLIGHT_SPHERICAL_HARMONICS_COEFFICIENTS_CALCULATED;
+ fclose(fp);
+ return true;
+ }
+ fclose(fp);
+ }
+ }
+ return false;
+}
+
static void studiolight_calculate_irradiance_equirectangular_image(StudioLight
*sl)
{
if (sl->flag & STUDIOLIGHT_EXTERNAL_FILE) {
@@ -592,8 +609,8 @@ static void
studiolight_calculate_irradiance_equirectangular_image(StudioLight *
STUDIOLIGHT_IRRADIANCE_EQUIRECTANGULAR_HEIGHT);
MEM_freeN(colbuf);
- if (sl->flag | STUDIOLIGHT_USER_DEFINED) {
- IMB_saveiff(sl->equirectangular_irradiance_buffer,
sl->path_irr, IB_rectfloat);
+ if (sl->flag & STUDIOLIGHT_USER_DEFINED) {
+ IMB_saveiff(sl->equirectangular_irradiance_buffer,
sl->path_irr_cache, IB_rectfloat);
}
}
sl->flag |= STUDIOLIGHT_EQUIRECTANGULAR_IRRADIANCE_IMAGE_CALCULATED;
@@ -649,7 +666,8 @@ static void studiolight_add_files_from_datafolder(const int
folder_id, const cha
sl =
studiolight_create(STUDIOLIGHT_EXTERNAL_FILE | flag);
BLI_strncpy(sl->name, filename,
FILE_MAXFILE);
BLI_strncpy(sl->path, path,
FILE_MAXFILE);
- sl->path_irr = BLI_string_joinN(path,
".irr");
+ sl->path_irr_cache =
BLI_string_joinN(path, ".irr");
+ sl->path_sh2_cache =
BLI_string_joinN(path, ".sh2");
BLI_addtail(&studiolights, sl);
}
}
@@ -949,7 +967,9 @@ void BKE_studiolight_ensure_flag(StudioLight *sl, int flag)
studiolight_calculate_radiance_cubemap_buffers(sl);
}
if ((flag & STUDIOLIGHT_SPHERICAL_HARMONICS_COEFFICIENTS_CALCULATED)) {
- studiolight_calculate_diffuse_light(sl);
+ if (!studiolight_load_spherical_harmonics_coefficients(sl)) {
+ studiolight_calculate_diffuse_light(sl);
+ }
}
if ((flag & STUDIOLIGHT_EQUIRECTANGULAR_RADIANCE_GPUTEXTURE)) {
studiolight_create_equirectangular_radiance_gputexture(sl);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
