diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/makesdna/DNA_image_types.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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/makesdna/DNA_image_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 253 |
1 files changed, 126 insertions, 127 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index e411e5f304e..fec5f96b4f3 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -26,7 +26,7 @@ #include "DNA_defs.h" #include "DNA_ID.h" -#include "DNA_color_types.h" /* for color management */ +#include "DNA_color_types.h" /* for color management */ struct GPUTexture; struct MovieCache; @@ -38,176 +38,175 @@ struct anim; /* ImageUser is in Texture, in Nodes, Background Image, Image Window, .... */ /* should be used in conjunction with an ID * to Image. */ typedef struct ImageUser { - /** To retrieve render result. */ - struct Scene *scene; - - /** Movies, sequences: current to display. */ - int framenr; - /** Total amount of frames to use. */ - int frames; - /** Offset within movie, start frame in global time. */ - int offset, sfra; - /** Cyclic flag. */ - char _pad0, cycl; - char ok; - - /** Multiview current eye - for internal use of drawing routines. */ - char multiview_eye; - short pass; - char _pad1[2]; - - /** Listbase indices, for menu browsing or retrieve buffer. */ - short multi_index, view, layer; - short flag; + /** To retrieve render result. */ + struct Scene *scene; + + /** Movies, sequences: current to display. */ + int framenr; + /** Total amount of frames to use. */ + int frames; + /** Offset within movie, start frame in global time. */ + int offset, sfra; + /** Cyclic flag. */ + char _pad0, cycl; + char ok; + + /** Multiview current eye - for internal use of drawing routines. */ + char multiview_eye; + short pass; + char _pad1[2]; + + /** Listbase indices, for menu browsing or retrieve buffer. */ + short multi_index, view, layer; + short flag; } ImageUser; typedef struct ImageAnim { - struct ImageAnim *next, *prev; - struct anim *anim; + struct ImageAnim *next, *prev; + struct anim *anim; } ImageAnim; typedef struct ImageView { - struct ImageView *next, *prev; - /** MAX_NAME. */ - char name[64]; - /** 1024 = FILE_MAX. */ - char filepath[1024]; + struct ImageView *next, *prev; + /** MAX_NAME. */ + char name[64]; + /** 1024 = FILE_MAX. */ + char filepath[1024]; } ImageView; typedef struct ImagePackedFile { - struct ImagePackedFile *next, *prev; - struct PackedFile *packedfile; - /** 1024 = FILE_MAX. */ - char filepath[1024]; + struct ImagePackedFile *next, *prev; + struct PackedFile *packedfile; + /** 1024 = FILE_MAX. */ + char filepath[1024]; } ImagePackedFile; typedef struct RenderSlot { - struct RenderSlot *next, *prev; - /** 64 = MAX_NAME. */ - char name[64]; - struct RenderResult *render; + struct RenderSlot *next, *prev; + /** 64 = MAX_NAME. */ + char name[64]; + struct RenderResult *render; } RenderSlot; /* iuser->flag */ -#define IMA_ANIM_ALWAYS (1 << 0) +#define IMA_ANIM_ALWAYS (1 << 0) /* #define IMA_UNUSED_1 (1 << 1) */ /* #define IMA_UNUSED_2 (1 << 2) */ -#define IMA_NEED_FRAME_RECALC (1 << 3) -#define IMA_SHOW_STEREO (1 << 4) +#define IMA_NEED_FRAME_RECALC (1 << 3) +#define IMA_SHOW_STEREO (1 << 4) enum { - TEXTARGET_TEXTURE_2D = 0, - TEXTARGET_TEXTURE_CUBE_MAP = 1, - TEXTARGET_COUNT = 2, + TEXTARGET_TEXTURE_2D = 0, + TEXTARGET_TEXTURE_CUBE_MAP = 1, + TEXTARGET_COUNT = 2, }; typedef struct Image { - ID id; - - /** File path, 1024 = FILE_MAX. */ - char name[1024]; - - /** Not written in file. */ - struct MovieCache *cache; - /** Not written in file 2 = TEXTARGET_COUNT. */ - struct GPUTexture *gputexture[2]; - - /* sources from: */ - ListBase anims; - struct RenderResult *rr; - - ListBase renderslots; - short render_slot, last_render_slot; - - int flag; - short source, type; - int lastframe; - - /* GPU texture flag. */ - short gpuflag; - char _pad2[6]; - - /** Deprecated. */ - struct PackedFile *packedfile DNA_DEPRECATED; - struct ListBase packedfiles; - struct PreviewImage *preview; - - int lastused; - short ok; - char _pad4[6]; - - /* for generated images */ - int gen_x, gen_y; - char gen_type, gen_flag; - short gen_depth; - float gen_color[4]; - - /* display aspect - for UV editing images resized for faster openGL display */ - float aspx, aspy; - - /* color management */ - ColorManagedColorspaceSettings colorspace_settings; - char alpha_mode; - - char _pad[5]; - - /* Multiview */ - /** For viewer node stereoscopy. */ - char eye; - char views_format; - /** ImageView. */ - ListBase views; - struct Stereo3dFormat *stereo3d_format; + ID id; + + /** File path, 1024 = FILE_MAX. */ + char name[1024]; + + /** Not written in file. */ + struct MovieCache *cache; + /** Not written in file 2 = TEXTARGET_COUNT. */ + struct GPUTexture *gputexture[2]; + + /* sources from: */ + ListBase anims; + struct RenderResult *rr; + + ListBase renderslots; + short render_slot, last_render_slot; + + int flag; + short source, type; + int lastframe; + + /* GPU texture flag. */ + short gpuflag; + char _pad2[6]; + + /** Deprecated. */ + struct PackedFile *packedfile DNA_DEPRECATED; + struct ListBase packedfiles; + struct PreviewImage *preview; + + int lastused; + short ok; + char _pad4[6]; + + /* for generated images */ + int gen_x, gen_y; + char gen_type, gen_flag; + short gen_depth; + float gen_color[4]; + + /* display aspect - for UV editing images resized for faster openGL display */ + float aspx, aspy; + + /* color management */ + ColorManagedColorspaceSettings colorspace_settings; + char alpha_mode; + + char _pad[5]; + + /* Multiview */ + /** For viewer node stereoscopy. */ + char eye; + char views_format; + /** ImageView. */ + ListBase views; + struct Stereo3dFormat *stereo3d_format; } Image; - /* **************** IMAGE ********************* */ /* Image.flag */ enum { - IMA_FLAG_UNUSED_0 = (1 << 0), /* cleared */ - IMA_FLAG_UNUSED_1 = (1 << 1), /* cleared */ + IMA_FLAG_UNUSED_0 = (1 << 0), /* cleared */ + IMA_FLAG_UNUSED_1 = (1 << 1), /* cleared */ #ifdef DNA_DEPRECATED - IMA_DO_PREMUL = (1 << 2), + IMA_DO_PREMUL = (1 << 2), #endif - IMA_FLAG_UNUSED_4 = (1 << 4), /* cleared */ - IMA_NOCOLLECT = (1 << 5), - IMA_FLAG_UNUSED_6 = (1 << 6), /* cleared */ - IMA_OLD_PREMUL = (1 << 7), - IMA_FLAG_UNUSED_8 = (1 << 8), /* cleared */ - IMA_USED_FOR_RENDER = (1 << 9), - /** For image user, but these flags are mixed. */ - IMA_USER_FRAME_IN_RANGE = (1 << 10), - IMA_VIEW_AS_RENDER = (1 << 11), - IMA_IGNORE_ALPHA = (1 << 12), - IMA_DEINTERLACE = (1 << 13), - IMA_USE_VIEWS = (1 << 14), - IMA_FLAG_UNUSED_15 = (1 << 15), /* cleared */ - IMA_FLAG_UNUSED_16 = (1 << 16), /* cleared */ + IMA_FLAG_UNUSED_4 = (1 << 4), /* cleared */ + IMA_NOCOLLECT = (1 << 5), + IMA_FLAG_UNUSED_6 = (1 << 6), /* cleared */ + IMA_OLD_PREMUL = (1 << 7), + IMA_FLAG_UNUSED_8 = (1 << 8), /* cleared */ + IMA_USED_FOR_RENDER = (1 << 9), + /** For image user, but these flags are mixed. */ + IMA_USER_FRAME_IN_RANGE = (1 << 10), + IMA_VIEW_AS_RENDER = (1 << 11), + IMA_IGNORE_ALPHA = (1 << 12), + IMA_DEINTERLACE = (1 << 13), + IMA_USE_VIEWS = (1 << 14), + IMA_FLAG_UNUSED_15 = (1 << 15), /* cleared */ + IMA_FLAG_UNUSED_16 = (1 << 16), /* cleared */ }; /* Image.gpuflag */ enum { - /** GPU texture needs to be refreshed. */ - IMA_GPU_REFRESH = (1 << 0), - /** All mipmap levels in OpenGL texture set? */ - IMA_GPU_MIPMAP_COMPLETE = (1 << 1), - /** OpenGL image texture bound as non-color data. */ - IMA_GPU_IS_DATA = (1 << 2), + /** GPU texture needs to be refreshed. */ + IMA_GPU_REFRESH = (1 << 0), + /** All mipmap levels in OpenGL texture set? */ + IMA_GPU_MIPMAP_COMPLETE = (1 << 1), + /** OpenGL image texture bound as non-color data. */ + IMA_GPU_IS_DATA = (1 << 2), }; /* ima->type and ima->source moved to BKE_image.h, for API */ /* render */ -#define IMA_MAX_RENDER_TEXT (1 << 9) +#define IMA_MAX_RENDER_TEXT (1 << 9) /* gen_flag */ -#define IMA_GEN_FLOAT 1 +#define IMA_GEN_FLOAT 1 /* alpha_mode */ enum { - IMA_ALPHA_STRAIGHT = 0, - IMA_ALPHA_PREMUL = 1, + IMA_ALPHA_STRAIGHT = 0, + IMA_ALPHA_PREMUL = 1, }; #endif |