From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- source/blender/blenkernel/BKE_camera.h | 145 ++++++++++++++++++++------------- 1 file changed, 89 insertions(+), 56 deletions(-) (limited to 'source/blender/blenkernel/BKE_camera.h') diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index c998aecacdd..10cd129fbf9 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -46,7 +46,10 @@ struct rctf; void BKE_camera_init(struct Camera *cam); void *BKE_camera_add(struct Main *bmain, const char *name); -void BKE_camera_copy_data(struct Main *bmain, struct Camera *cam_dst, const struct Camera *cam_src, const int flag); +void BKE_camera_copy_data(struct Main *bmain, + struct Camera *cam_dst, + const struct Camera *cam_src, + const int flag); struct Camera *BKE_camera_copy(struct Main *bmain, const struct Camera *cam); void BKE_camera_make_local(struct Main *bmain, struct Camera *cam, const bool lib_local); void BKE_camera_free(struct Camera *ca); @@ -64,34 +67,34 @@ float BKE_camera_sensor_size(int sensor_fit, float sensor_x, float sensor_y); * to unify computation of viewplane, window matrix, ... */ typedef struct CameraParams { - /* lens */ - bool is_ortho; - float lens; - float ortho_scale; - float zoom; - - float shiftx; - float shifty; - float offsetx; - float offsety; - - /* sensor */ - float sensor_x; - float sensor_y; - int sensor_fit; - - /* clipping */ - float clip_start; - float clip_end; - - /* computed viewplane */ - float ycor; - float viewdx; - float viewdy; - rctf viewplane; - - /* computed matrix */ - float winmat[4][4]; + /* lens */ + bool is_ortho; + float lens; + float ortho_scale; + float zoom; + + float shiftx; + float shifty; + float offsetx; + float offsety; + + /* sensor */ + float sensor_x; + float sensor_y; + int sensor_fit; + + /* clipping */ + float clip_start; + float clip_end; + + /* computed viewplane */ + float ycor; + float viewdx; + float viewdy; + rctf viewplane; + + /* computed matrix */ + float winmat[4][4]; } CameraParams; /* values for CameraParams.zoom, need to be taken into account for some operations */ @@ -100,43 +103,73 @@ typedef struct CameraParams { void BKE_camera_params_init(CameraParams *params); void BKE_camera_params_from_object(CameraParams *params, const struct Object *camera); -void BKE_camera_params_from_view3d(CameraParams *params, struct Depsgraph *depsgraph, const struct View3D *v3d, const struct RegionView3D *rv3d); +void BKE_camera_params_from_view3d(CameraParams *params, + struct Depsgraph *depsgraph, + const struct View3D *v3d, + const struct RegionView3D *rv3d); -void BKE_camera_params_compute_viewplane(CameraParams *params, int winx, int winy, float aspx, float aspy); +void BKE_camera_params_compute_viewplane( + CameraParams *params, int winx, int winy, float aspx, float aspy); void BKE_camera_params_compute_matrix(CameraParams *params); /* Camera View Frame */ -void BKE_camera_view_frame_ex( - const struct Scene *scene, const struct Camera *camera, - const float drawsize, const bool do_clip, const float scale[3], - float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3]); -void BKE_camera_view_frame( - const struct Scene *scene, const struct Camera *camera, - float r_vec[4][3]); - -bool BKE_camera_view_frame_fit_to_scene( - struct Depsgraph *depsgraph, - struct Scene *scene, struct Object *camera_ob, - float r_co[3], float *r_scale); -bool BKE_camera_view_frame_fit_to_coords( - const struct Depsgraph *depsgraph, - const float (*cos)[3], int num_cos, - struct Object *camera_ob, - float r_co[3], float *r_scale); +void BKE_camera_view_frame_ex(const struct Scene *scene, + const struct Camera *camera, + const float drawsize, + const bool do_clip, + const float scale[3], + float r_asp[2], + float r_shift[2], + float *r_drawsize, + float r_vec[4][3]); +void BKE_camera_view_frame(const struct Scene *scene, + const struct Camera *camera, + float r_vec[4][3]); + +bool BKE_camera_view_frame_fit_to_scene(struct Depsgraph *depsgraph, + struct Scene *scene, + struct Object *camera_ob, + float r_co[3], + float *r_scale); +bool BKE_camera_view_frame_fit_to_coords(const struct Depsgraph *depsgraph, + const float (*cos)[3], + int num_cos, + struct Object *camera_ob, + float r_co[3], + float *r_scale); void BKE_camera_to_gpu_dof(struct Object *camera, struct GPUFXSettings *r_fx_settings); /* Camera multi-view API */ -struct Object *BKE_camera_multiview_render(struct Scene *scene, struct Object *camera, const char *viewname); -void BKE_camera_multiview_view_matrix(struct RenderData *rd, const struct Object *camera, const bool is_left, float r_viewmat[4][4]); -void BKE_camera_multiview_model_matrix(struct RenderData *rd, const struct Object *camera, const char *viewname, float r_modelmat[4][4]); -void BKE_camera_multiview_model_matrix_scaled(struct RenderData *rd, const struct Object *camera, const char *viewname, float r_modelmat[4][4]); -void BKE_camera_multiview_window_matrix(struct RenderData *rd, const struct Object *camera, const char *viewname, float r_winmat[4][4]); -float BKE_camera_multiview_shift_x(struct RenderData *rd, const struct Object *camera, const char *viewname); -void BKE_camera_multiview_params(struct RenderData *rd, struct CameraParams *params, const struct Object *camera, const char *viewname); -bool BKE_camera_multiview_spherical_stereo(struct RenderData *rd, const struct Object *camera); +struct Object *BKE_camera_multiview_render(struct Scene *scene, + struct Object *camera, + const char *viewname); +void BKE_camera_multiview_view_matrix(struct RenderData *rd, + const struct Object *camera, + const bool is_left, + float r_viewmat[4][4]); +void BKE_camera_multiview_model_matrix(struct RenderData *rd, + const struct Object *camera, + const char *viewname, + float r_modelmat[4][4]); +void BKE_camera_multiview_model_matrix_scaled(struct RenderData *rd, + const struct Object *camera, + const char *viewname, + float r_modelmat[4][4]); +void BKE_camera_multiview_window_matrix(struct RenderData *rd, + const struct Object *camera, + const char *viewname, + float r_winmat[4][4]); +float BKE_camera_multiview_shift_x(struct RenderData *rd, + const struct Object *camera, + const char *viewname); +void BKE_camera_multiview_params(struct RenderData *rd, + struct CameraParams *params, + const struct Object *camera, + const char *viewname); +bool BKE_camera_multiview_spherical_stereo(struct RenderData *rd, const struct Object *camera); /* Camera background image API */ struct CameraBGImage *BKE_camera_background_image_new(struct Camera *cam); -- cgit v1.2.3