Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenkernel/BKE_studiolight.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenkernel/BKE_studiolight.h')
-rw-r--r--source/blender/blenkernel/BKE_studiolight.h107
1 files changed, 56 insertions, 51 deletions
diff --git a/source/blender/blenkernel/BKE_studiolight.h b/source/blender/blenkernel/BKE_studiolight.h
index 0e7cf818839..3586c08547c 100644
--- a/source/blender/blenkernel/BKE_studiolight.h
+++ b/source/blender/blenkernel/BKE_studiolight.h
@@ -47,9 +47,9 @@
#define STUDIOLIGHT_Z_POS 4
#define STUDIOLIGHT_Z_NEG 5
-#define STUDIOLIGHT_ICON_ID_TYPE_RADIANCE (1 << 0)
-#define STUDIOLIGHT_ICON_ID_TYPE_IRRADIANCE (1 << 1)
-#define STUDIOLIGHT_ICON_ID_TYPE_MATCAP (1 << 2)
+#define STUDIOLIGHT_ICON_ID_TYPE_RADIANCE (1 << 0)
+#define STUDIOLIGHT_ICON_ID_TYPE_IRRADIANCE (1 << 1)
+#define STUDIOLIGHT_ICON_ID_TYPE_MATCAP (1 << 2)
#define STUDIOLIGHT_ICON_ID_TYPE_MATCAP_FLIPPED (1 << 3)
#define STUDIOLIGHT_MAX_LIGHT 4
@@ -63,9 +63,9 @@
#if STUDIOLIGHT_SH_BANDS > 3
/* Bypass L3 */
-#define STUDIOLIGHT_SH_EFFECTIVE_COEFS_LEN (STUDIOLIGHT_SH_COEFS_LEN - 7)
+# define STUDIOLIGHT_SH_EFFECTIVE_COEFS_LEN (STUDIOLIGHT_SH_COEFS_LEN - 7)
#else
-#define STUDIOLIGHT_SH_EFFECTIVE_COEFS_LEN STUDIOLIGHT_SH_COEFS_LEN
+# define STUDIOLIGHT_SH_EFFECTIVE_COEFS_LEN STUDIOLIGHT_SH_COEFS_LEN
#endif
struct GPUTexture;
@@ -73,59 +73,60 @@ struct StudioLight;
/* StudioLight.flag */
enum StudioLightFlag {
- STUDIOLIGHT_SPHERICAL_HARMONICS_COEFFICIENTS_CALCULATED = (1 << 0),
-/* STUDIOLIGHT_LIGHT_DIRECTION_CALCULATED = (1 << 1), */
- STUDIOLIGHT_INTERNAL = (1 << 2),
- STUDIOLIGHT_EXTERNAL_FILE = (1 << 3),
- STUDIOLIGHT_TYPE_STUDIO = (1 << 4),
- STUDIOLIGHT_TYPE_WORLD = (1 << 5),
- STUDIOLIGHT_TYPE_MATCAP = (1 << 6),
- STUDIOLIGHT_EXTERNAL_IMAGE_LOADED = (1 << 7),
- STUDIOLIGHT_EQUIRECT_IRRADIANCE_IMAGE_CALCULATED = (1 << 8),
- STUDIOLIGHT_EQUIRECT_RADIANCE_GPUTEXTURE = (1 << 9),
- STUDIOLIGHT_EQUIRECT_IRRADIANCE_GPUTEXTURE = (1 << 10),
- STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED = (1 << 11),
- STUDIOLIGHT_USER_DEFINED = (1 << 12),
- STUDIOLIGHT_UI_EXPANDED = (1 << 13),
+ STUDIOLIGHT_SPHERICAL_HARMONICS_COEFFICIENTS_CALCULATED = (1 << 0),
+ /* STUDIOLIGHT_LIGHT_DIRECTION_CALCULATED = (1 << 1), */
+ STUDIOLIGHT_INTERNAL = (1 << 2),
+ STUDIOLIGHT_EXTERNAL_FILE = (1 << 3),
+ STUDIOLIGHT_TYPE_STUDIO = (1 << 4),
+ STUDIOLIGHT_TYPE_WORLD = (1 << 5),
+ STUDIOLIGHT_TYPE_MATCAP = (1 << 6),
+ STUDIOLIGHT_EXTERNAL_IMAGE_LOADED = (1 << 7),
+ STUDIOLIGHT_EQUIRECT_IRRADIANCE_IMAGE_CALCULATED = (1 << 8),
+ STUDIOLIGHT_EQUIRECT_RADIANCE_GPUTEXTURE = (1 << 9),
+ STUDIOLIGHT_EQUIRECT_IRRADIANCE_GPUTEXTURE = (1 << 10),
+ STUDIOLIGHT_RADIANCE_BUFFERS_CALCULATED = (1 << 11),
+ STUDIOLIGHT_USER_DEFINED = (1 << 12),
+ STUDIOLIGHT_UI_EXPANDED = (1 << 13),
};
#define STUDIOLIGHT_FLAG_ALL (STUDIOLIGHT_INTERNAL | STUDIOLIGHT_EXTERNAL_FILE)
-#define STUDIOLIGHT_FLAG_ORIENTATIONS (STUDIOLIGHT_TYPE_STUDIO | STUDIOLIGHT_TYPE_WORLD | STUDIOLIGHT_TYPE_MATCAP)
+#define STUDIOLIGHT_FLAG_ORIENTATIONS \
+ (STUDIOLIGHT_TYPE_STUDIO | STUDIOLIGHT_TYPE_WORLD | STUDIOLIGHT_TYPE_MATCAP)
#define STUDIOLIGHT_ORIENTATIONS_MATERIAL_MODE (STUDIOLIGHT_TYPE_WORLD)
#define STUDIOLIGHT_ORIENTATIONS_SOLID (STUDIOLIGHT_INTERNAL | STUDIOLIGHT_TYPE_STUDIO)
typedef void StudioLightFreeFunction(struct StudioLight *, void *data);
typedef struct StudioLight {
- struct StudioLight *next, *prev;
-
- int index;
- int flag;
- char name[FILE_MAXFILE];
- char path[FILE_MAX];
- char *path_irr_cache;
- char *path_sh_cache;
- int icon_id_irradiance;
- int icon_id_radiance;
- int icon_id_matcap;
- int icon_id_matcap_flipped;
- float spherical_harmonics_coefs[STUDIOLIGHT_SH_EFFECTIVE_COEFS_LEN][3];
- float light_direction[3];
- ImBuf *equirect_radiance_buffer;
- ImBuf *equirect_irradiance_buffer;
- ImBuf *radiance_cubemap_buffers[6];
- struct GPUTexture *equirect_radiance_gputexture;
- struct GPUTexture *equirect_irradiance_gputexture;
- SolidLight light[STUDIOLIGHT_MAX_LIGHT];
- float light_ambient[3];
-
- /*
- * Free function to clean up the running icons previews (wmJob) the usage is in
- * interface_icons. Please be aware that this was build to handle only one free function
- * that cleans up all icons. just to keep the code simple.
- */
- StudioLightFreeFunction *free_function;
- void *free_function_data;
+ struct StudioLight *next, *prev;
+
+ int index;
+ int flag;
+ char name[FILE_MAXFILE];
+ char path[FILE_MAX];
+ char *path_irr_cache;
+ char *path_sh_cache;
+ int icon_id_irradiance;
+ int icon_id_radiance;
+ int icon_id_matcap;
+ int icon_id_matcap_flipped;
+ float spherical_harmonics_coefs[STUDIOLIGHT_SH_EFFECTIVE_COEFS_LEN][3];
+ float light_direction[3];
+ ImBuf *equirect_radiance_buffer;
+ ImBuf *equirect_irradiance_buffer;
+ ImBuf *radiance_cubemap_buffers[6];
+ struct GPUTexture *equirect_radiance_gputexture;
+ struct GPUTexture *equirect_irradiance_gputexture;
+ SolidLight light[STUDIOLIGHT_MAX_LIGHT];
+ float light_ambient[3];
+
+ /*
+ * Free function to clean up the running icons previews (wmJob) the usage is in
+ * interface_icons. Please be aware that this was build to handle only one free function
+ * that cleans up all icons. just to keep the code simple.
+ */
+ StudioLightFreeFunction *free_function;
+ void *free_function_data;
} StudioLight;
void BKE_studiolight_init(void);
@@ -138,10 +139,14 @@ struct ListBase *BKE_studiolight_listbase(void);
void BKE_studiolight_ensure_flag(StudioLight *sl, int flag);
void BKE_studiolight_refresh(void);
StudioLight *BKE_studiolight_load(const char *path, int orientation);
-StudioLight *BKE_studiolight_create(const char *path, const SolidLight light[4], const float light_ambient[3]);
+StudioLight *BKE_studiolight_create(const char *path,
+ const SolidLight light[4],
+ const float light_ambient[3]);
StudioLight *BKE_studiolight_studio_edit_get(void);
void BKE_studiolight_remove(StudioLight *sl);
-void BKE_studiolight_set_free_function(StudioLight *sl, StudioLightFreeFunction *free_function, void *data);
+void BKE_studiolight_set_free_function(StudioLight *sl,
+ StudioLightFreeFunction *free_function,
+ void *data);
void BKE_studiolight_unset_icon_id(StudioLight *sl, int icon_id);
#endif /* __BKE_STUDIOLIGHT_H__ */