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_camera_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_camera_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_camera_types.h | 216 |
1 files changed, 108 insertions, 108 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h index 0af69384c54..8c5d911b7fa 100644 --- a/source/blender/makesdna/DNA_camera_types.h +++ b/source/blender/makesdna/DNA_camera_types.h @@ -41,167 +41,167 @@ struct Object; /* ------------------------------------------- */ /* Stereo Settings */ typedef struct CameraStereoSettings { - float interocular_distance; - float convergence_distance; - short convergence_mode; - short pivot; - short flag; - char _pad[2]; - /* Cut-off angle at which interocular distance start to fade down. */ - float pole_merge_angle_from; - /* Cut-off angle at which interocular distance stops to fade down. */ - float pole_merge_angle_to; + float interocular_distance; + float convergence_distance; + short convergence_mode; + short pivot; + short flag; + char _pad[2]; + /* Cut-off angle at which interocular distance start to fade down. */ + float pole_merge_angle_from; + /* Cut-off angle at which interocular distance stops to fade down. */ + float pole_merge_angle_to; } CameraStereoSettings; /* Background Picture */ typedef struct CameraBGImage { - struct CameraBGImage *next, *prev; - - struct Image *ima; - struct ImageUser iuser; - struct MovieClip *clip; - struct MovieClipUser cuser; - float offset[2], scale, rotation; - float alpha; - short flag; - short source; + struct CameraBGImage *next, *prev; + + struct Image *ima; + struct ImageUser iuser; + struct MovieClip *clip; + struct MovieClipUser cuser; + float offset[2], scale, rotation; + float alpha; + short flag; + short source; } CameraBGImage; typedef struct Camera_Runtime { - /* For draw manager. */ - float drw_corners[2][4][2]; - float drw_tria[2][2]; - float drw_depth[2]; - float drw_focusmat[4][4]; - float drw_normalmat[4][4]; + /* For draw manager. */ + float drw_corners[2][4][2]; + float drw_tria[2][2]; + float drw_depth[2]; + float drw_focusmat[4][4]; + float drw_normalmat[4][4]; } Camera_Runtime; typedef struct Camera { - ID id; - /** Animation data (must be immediately after id for utilities to use it). */ - struct AnimData *adt; - - /** CAM_PERSP, CAM_ORTHO or CAM_PANO. */ - char type; - /** Draw type extra. */ - char dtx; - short flag; - float passepartalpha; - float clip_start, clip_end; - float lens, ortho_scale, drawsize; - float sensor_x, sensor_y; - float shiftx, shifty; - float dof_distance; - - /** Old animation system, deprecated for 2.5. */ - struct Ipo *ipo DNA_DEPRECATED; - - struct Object *dof_ob; - struct GPUDOFSettings gpu_dof; - - /* CameraBGImage reference images */ - struct ListBase bg_images; - - char sensor_fit; - char _pad[7]; - - /* Stereo settings */ - struct CameraStereoSettings stereo; - - /** Runtime data (keep last). */ - Camera_Runtime runtime; + ID id; + /** Animation data (must be immediately after id for utilities to use it). */ + struct AnimData *adt; + + /** CAM_PERSP, CAM_ORTHO or CAM_PANO. */ + char type; + /** Draw type extra. */ + char dtx; + short flag; + float passepartalpha; + float clip_start, clip_end; + float lens, ortho_scale, drawsize; + float sensor_x, sensor_y; + float shiftx, shifty; + float dof_distance; + + /** Old animation system, deprecated for 2.5. */ + struct Ipo *ipo DNA_DEPRECATED; + + struct Object *dof_ob; + struct GPUDOFSettings gpu_dof; + + /* CameraBGImage reference images */ + struct ListBase bg_images; + + char sensor_fit; + char _pad[7]; + + /* Stereo settings */ + struct CameraStereoSettings stereo; + + /** Runtime data (keep last). */ + Camera_Runtime runtime; } Camera; /* **************** CAMERA ********************* */ /* type */ enum { - CAM_PERSP = 0, - CAM_ORTHO = 1, - CAM_PANO = 2, + CAM_PERSP = 0, + CAM_ORTHO = 1, + CAM_PANO = 2, }; /* dtx */ enum { - CAM_DTX_CENTER = (1 << 0), - CAM_DTX_CENTER_DIAG = (1 << 1), - CAM_DTX_THIRDS = (1 << 2), - CAM_DTX_GOLDEN = (1 << 3), - CAM_DTX_GOLDEN_TRI_A = (1 << 4), - CAM_DTX_GOLDEN_TRI_B = (1 << 5), - CAM_DTX_HARMONY_TRI_A = (1 << 6), - CAM_DTX_HARMONY_TRI_B = (1 << 7), + CAM_DTX_CENTER = (1 << 0), + CAM_DTX_CENTER_DIAG = (1 << 1), + CAM_DTX_THIRDS = (1 << 2), + CAM_DTX_GOLDEN = (1 << 3), + CAM_DTX_GOLDEN_TRI_A = (1 << 4), + CAM_DTX_GOLDEN_TRI_B = (1 << 5), + CAM_DTX_HARMONY_TRI_A = (1 << 6), + CAM_DTX_HARMONY_TRI_B = (1 << 7), }; /* flag */ enum { - CAM_SHOWLIMITS = (1 << 0), - CAM_SHOWMIST = (1 << 1), - CAM_SHOWPASSEPARTOUT = (1 << 2), - CAM_SHOW_SAFE_MARGINS = (1 << 3), - CAM_SHOWNAME = (1 << 4), - CAM_ANGLETOGGLE = (1 << 5), - CAM_DS_EXPAND = (1 << 6), + CAM_SHOWLIMITS = (1 << 0), + CAM_SHOWMIST = (1 << 1), + CAM_SHOWPASSEPARTOUT = (1 << 2), + CAM_SHOW_SAFE_MARGINS = (1 << 3), + CAM_SHOWNAME = (1 << 4), + CAM_ANGLETOGGLE = (1 << 5), + CAM_DS_EXPAND = (1 << 6), #ifdef DNA_DEPRECATED - CAM_PANORAMA = (1 << 7), /* deprecated */ + CAM_PANORAMA = (1 << 7), /* deprecated */ #endif - CAM_SHOWSENSOR = (1 << 8), - CAM_SHOW_SAFE_CENTER = (1 << 9), - CAM_SHOW_BG_IMAGE = (1 << 10), + CAM_SHOWSENSOR = (1 << 8), + CAM_SHOW_SAFE_CENTER = (1 << 9), + CAM_SHOW_BG_IMAGE = (1 << 10), }; /* Sensor fit */ enum { - CAMERA_SENSOR_FIT_AUTO = 0, - CAMERA_SENSOR_FIT_HOR = 1, - CAMERA_SENSOR_FIT_VERT = 2, + CAMERA_SENSOR_FIT_AUTO = 0, + CAMERA_SENSOR_FIT_HOR = 1, + CAMERA_SENSOR_FIT_VERT = 2, }; -#define DEFAULT_SENSOR_WIDTH 36.0f -#define DEFAULT_SENSOR_HEIGHT 24.0f +#define DEFAULT_SENSOR_WIDTH 36.0f +#define DEFAULT_SENSOR_HEIGHT 24.0f /* stereo->convergence_mode */ enum { - CAM_S3D_OFFAXIS = 0, - CAM_S3D_PARALLEL = 1, - CAM_S3D_TOE = 2, + CAM_S3D_OFFAXIS = 0, + CAM_S3D_PARALLEL = 1, + CAM_S3D_TOE = 2, }; /* stereo->pivot */ enum { - CAM_S3D_PIVOT_LEFT = 0, - CAM_S3D_PIVOT_RIGHT = 1, - CAM_S3D_PIVOT_CENTER = 2, + CAM_S3D_PIVOT_LEFT = 0, + CAM_S3D_PIVOT_RIGHT = 1, + CAM_S3D_PIVOT_CENTER = 2, }; /* stereo->flag */ enum { - CAM_S3D_SPHERICAL = (1 << 0), - CAM_S3D_POLE_MERGE = (1 << 1), + CAM_S3D_SPHERICAL = (1 << 0), + CAM_S3D_POLE_MERGE = (1 << 1), }; /* CameraBGImage->flag */ /* may want to use 1 for select ? */ enum { - CAM_BGIMG_FLAG_EXPANDED = (1 << 1), - CAM_BGIMG_FLAG_CAMERACLIP = (1 << 2), - CAM_BGIMG_FLAG_DISABLED = (1 << 3), - CAM_BGIMG_FLAG_FOREGROUND = (1 << 4), - - /* Camera framing options */ - CAM_BGIMG_FLAG_CAMERA_ASPECT = (1 << 5), /* don't stretch to fit the camera view */ - CAM_BGIMG_FLAG_CAMERA_CROP = (1 << 6), /* crop out the image */ - - /* Axis flip options */ - CAM_BGIMG_FLAG_FLIP_X = (1 << 7), - CAM_BGIMG_FLAG_FLIP_Y = (1 << 8), + CAM_BGIMG_FLAG_EXPANDED = (1 << 1), + CAM_BGIMG_FLAG_CAMERACLIP = (1 << 2), + CAM_BGIMG_FLAG_DISABLED = (1 << 3), + CAM_BGIMG_FLAG_FOREGROUND = (1 << 4), + + /* Camera framing options */ + CAM_BGIMG_FLAG_CAMERA_ASPECT = (1 << 5), /* don't stretch to fit the camera view */ + CAM_BGIMG_FLAG_CAMERA_CROP = (1 << 6), /* crop out the image */ + + /* Axis flip options */ + CAM_BGIMG_FLAG_FLIP_X = (1 << 7), + CAM_BGIMG_FLAG_FLIP_Y = (1 << 8), }; /* CameraBGImage->source */ /* may want to use 1 for select ?*/ enum { - CAM_BGIMG_SOURCE_IMAGE = 0, - CAM_BGIMG_SOURCE_MOVIE = 1, + CAM_BGIMG_SOURCE_IMAGE = 0, + CAM_BGIMG_SOURCE_MOVIE = 1, }; #ifdef __cplusplus |