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_movieclip_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_movieclip_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_movieclip_types.h | 244 |
1 files changed, 122 insertions, 122 deletions
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 342bad4e067..38ef17f4545 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -26,7 +26,7 @@ #include "DNA_ID.h" #include "DNA_tracking_types.h" -#include "DNA_color_types.h" /* for color management */ +#include "DNA_color_types.h" /* for color management */ struct AnimData; struct ImBuf; @@ -37,161 +37,161 @@ struct anim; struct bGPdata; typedef struct MovieClipUser { - /** Current frame number. */ - int framenr; - /** Proxy render size. */ - short render_size, render_flag; + /** Current frame number. */ + int framenr; + /** Proxy render size. */ + short render_size, render_flag; } MovieClipUser; typedef struct MovieClipProxy { - /** 768=FILE_MAXDIR custom directory for index and proxy files (defaults to BL_proxy). */ - char dir[768]; - - /** Time code in use. */ - short tc; - /** Proxy build quality. */ - short quality; - /** Size flags (see below) of all proxies to build. */ - short build_size_flag; - /** Time code flags (see below) of all tc indices to build. */ - short build_tc_flag; + /** 768=FILE_MAXDIR custom directory for index and proxy files (defaults to BL_proxy). */ + char dir[768]; + + /** Time code in use. */ + short tc; + /** Proxy build quality. */ + short quality; + /** Size flags (see below) of all proxies to build. */ + short build_size_flag; + /** Time code flags (see below) of all tc indices to build. */ + short build_tc_flag; } MovieClipProxy; typedef struct MovieClip { - ID id; - /** Animation data (must be immediately after id for utilities to use it). */ - struct AnimData *adt; - - /** File path, 1024 = FILE_MAX. */ - char name[1024]; - - /** Sequence or movie. */ - int source; - /** Last accessed frame number. */ - int lastframe; - /** Size of last accessed frame. */ - int lastsize[2]; - - /** Display aspect. */ - float aspx, aspy; - - /** Movie source data. */ - struct anim *anim; - /** Cache for different stuff, not in file. */ - struct MovieClipCache *cache; - /** Grease pencil data. */ - struct bGPdata *gpd; - - /** Data for SfM tracking. */ - struct MovieTracking tracking; - /** - * Context of tracking job used to synchronize data - * like framenumber in SpaceClip clip user. - */ - void *tracking_context; - - /** Proxy to clip data. */ - struct MovieClipProxy proxy; - int flag; - - /** Length of movie. */ - int len; - - /** - * Scene frame number footage starts playing at affects all data - * which is associated with a clip such as motion tracking, - * camera reconstruciton and so. - */ - int start_frame; - /** - * Offset which is adding to a file number when reading frame from a file. - * affects only a way how scene frame is mapping to a file name and not - * touches other data associated with a clip. */ - int frame_offset; - - /* color management */ - ColorManagedColorspaceSettings colorspace_settings; + ID id; + /** Animation data (must be immediately after id for utilities to use it). */ + struct AnimData *adt; + + /** File path, 1024 = FILE_MAX. */ + char name[1024]; + + /** Sequence or movie. */ + int source; + /** Last accessed frame number. */ + int lastframe; + /** Size of last accessed frame. */ + int lastsize[2]; + + /** Display aspect. */ + float aspx, aspy; + + /** Movie source data. */ + struct anim *anim; + /** Cache for different stuff, not in file. */ + struct MovieClipCache *cache; + /** Grease pencil data. */ + struct bGPdata *gpd; + + /** Data for SfM tracking. */ + struct MovieTracking tracking; + /** + * Context of tracking job used to synchronize data + * like framenumber in SpaceClip clip user. + */ + void *tracking_context; + + /** Proxy to clip data. */ + struct MovieClipProxy proxy; + int flag; + + /** Length of movie. */ + int len; + + /** + * Scene frame number footage starts playing at affects all data + * which is associated with a clip such as motion tracking, + * camera reconstruciton and so. + */ + int start_frame; + /** + * Offset which is adding to a file number when reading frame from a file. + * affects only a way how scene frame is mapping to a file name and not + * touches other data associated with a clip. */ + int frame_offset; + + /* color management */ + ColorManagedColorspaceSettings colorspace_settings; } MovieClip; typedef struct MovieClipScopes { - /** 1 means scopes are ok and recalculation is unneeded. */ - short ok; - /** Whether track's mask should be applied on preview. */ - short use_track_mask; - /** Height of track preview widget. */ - int track_preview_height; - /** Width and height of frame for which scopes are calculated. */ - int frame_width, frame_height; - /** Undistorted position of marker used for pattern sampling. */ - struct MovieTrackingMarker undist_marker; - /** Search area of a track. */ - struct ImBuf *track_search; - /** #ImBuf displayed in track preview. */ - struct ImBuf *track_preview; - /** Sub-pizel position of marker in track ImBuf. */ - float track_pos[2]; - /** Active track is disabled, special notifier should be drawn. */ - short track_disabled; - /** Active track is locked, no transformation should be allowed. */ - short track_locked; - /** Frame number scopes are created for. */ - int framenr; - /** Track scopes are created for. */ - struct MovieTrackingTrack *track; - /** Marker scopes are created for. */ - struct MovieTrackingMarker *marker; - /** Scale used for sliding from previewe area. */ - float slide_scale[2]; + /** 1 means scopes are ok and recalculation is unneeded. */ + short ok; + /** Whether track's mask should be applied on preview. */ + short use_track_mask; + /** Height of track preview widget. */ + int track_preview_height; + /** Width and height of frame for which scopes are calculated. */ + int frame_width, frame_height; + /** Undistorted position of marker used for pattern sampling. */ + struct MovieTrackingMarker undist_marker; + /** Search area of a track. */ + struct ImBuf *track_search; + /** #ImBuf displayed in track preview. */ + struct ImBuf *track_preview; + /** Sub-pizel position of marker in track ImBuf. */ + float track_pos[2]; + /** Active track is disabled, special notifier should be drawn. */ + short track_disabled; + /** Active track is locked, no transformation should be allowed. */ + short track_locked; + /** Frame number scopes are created for. */ + int framenr; + /** Track scopes are created for. */ + struct MovieTrackingTrack *track; + /** Marker scopes are created for. */ + struct MovieTrackingMarker *marker; + /** Scale used for sliding from previewe area. */ + float slide_scale[2]; } MovieClipScopes; /* MovieClipProxy->build_size_flag */ enum { - MCLIP_PROXY_SIZE_25 = (1 << 0), - MCLIP_PROXY_SIZE_50 = (1 << 1), - MCLIP_PROXY_SIZE_75 = (1 << 2), - MCLIP_PROXY_SIZE_100 = (1 << 3), - MCLIP_PROXY_UNDISTORTED_SIZE_25 = (1 << 4), - MCLIP_PROXY_UNDISTORTED_SIZE_50 = (1 << 5), - MCLIP_PROXY_UNDISTORTED_SIZE_75 = (1 << 6), - MCLIP_PROXY_UNDISTORTED_SIZE_100 = (1 << 7), + MCLIP_PROXY_SIZE_25 = (1 << 0), + MCLIP_PROXY_SIZE_50 = (1 << 1), + MCLIP_PROXY_SIZE_75 = (1 << 2), + MCLIP_PROXY_SIZE_100 = (1 << 3), + MCLIP_PROXY_UNDISTORTED_SIZE_25 = (1 << 4), + MCLIP_PROXY_UNDISTORTED_SIZE_50 = (1 << 5), + MCLIP_PROXY_UNDISTORTED_SIZE_75 = (1 << 6), + MCLIP_PROXY_UNDISTORTED_SIZE_100 = (1 << 7), }; /* MovieClip->source */ enum { - MCLIP_SRC_SEQUENCE = 1, - MCLIP_SRC_MOVIE = 2, + MCLIP_SRC_SEQUENCE = 1, + MCLIP_SRC_MOVIE = 2, }; /* MovieClip->selection types */ enum { - MCLIP_SEL_NONE = 0, - MCLIP_SEL_TRACK = 1, + MCLIP_SEL_NONE = 0, + MCLIP_SEL_TRACK = 1, }; /* MovieClip->flag */ enum { - MCLIP_USE_PROXY = (1 << 0), - MCLIP_USE_PROXY_CUSTOM_DIR = (1 << 1), - /* MCLIP_CUSTOM_START_FRAME = (1 << 2), */ /* UNUSED */ - MCLIP_DATA_EXPAND = (1 << 3), + MCLIP_USE_PROXY = (1 << 0), + MCLIP_USE_PROXY_CUSTOM_DIR = (1 << 1), + /* MCLIP_CUSTOM_START_FRAME = (1 << 2), */ /* UNUSED */ + MCLIP_DATA_EXPAND = (1 << 3), - MCLIP_TIMECODE_FLAGS = (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR), + MCLIP_TIMECODE_FLAGS = (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR), }; /* MovieClip->render_size */ enum { - MCLIP_PROXY_RENDER_SIZE_FULL = 0, - MCLIP_PROXY_RENDER_SIZE_25 = 1, - MCLIP_PROXY_RENDER_SIZE_50 = 2, - MCLIP_PROXY_RENDER_SIZE_75 = 3, - MCLIP_PROXY_RENDER_SIZE_100 = 4, + MCLIP_PROXY_RENDER_SIZE_FULL = 0, + MCLIP_PROXY_RENDER_SIZE_25 = 1, + MCLIP_PROXY_RENDER_SIZE_50 = 2, + MCLIP_PROXY_RENDER_SIZE_75 = 3, + MCLIP_PROXY_RENDER_SIZE_100 = 4, }; /* MovieClip->render_flag */ enum { - MCLIP_PROXY_RENDER_UNDISTORT = 1, - /** Use original, if proxy is not found. */ - MCLIP_PROXY_RENDER_USE_FALLBACK_RENDER = 2, + MCLIP_PROXY_RENDER_UNDISTORT = 1, + /** Use original, if proxy is not found. */ + MCLIP_PROXY_RENDER_USE_FALLBACK_RENDER = 2, }; #endif |