diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-19 01:19:03 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-19 01:19:03 +0400 |
| commit | 5429a701c4f2674e6fa4c0eef8c285c13e16af0c (patch) | |
| tree | c37b3f17b3e4c80c2dcbee6655aabdfd6c62b2c3 /source/blender/blenkernel/BKE_camera.h | |
| parent | c26c5f38529fd490638aa4b8a8070715ecf4a3fc (diff) | |
Camera: more code refactoring, adding a function to create CameraParams from
3d view, deduplicating the complex code for setting up the viewplane.
Diffstat (limited to 'source/blender/blenkernel/BKE_camera.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_camera.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index 4a0f38d926c..8aec576b963 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -40,21 +40,27 @@ extern "C" { struct Camera; struct Object; +struct RegionView3D; struct RenderData; struct Scene; struct rctf; struct View3D; +/* Camera Datablock */ + void *add_camera(const char *name); struct Camera *copy_camera(struct Camera *cam); void make_local_camera(struct Camera *cam); void free_camera(struct Camera *ca); -/* Camera Object */ +/* Camera Usage */ float object_camera_dof_distance(struct Object *ob); void object_camera_mode(struct RenderData *rd, struct Object *ob); +int camera_sensor_fit(int sensor_fit, float sizex, float sizey); +float camera_sensor_size(int sensor_fit, float sensor_x, float sensor_y); + /* Camera Parameters: * * Intermediate struct for storing camera parameters from various sources, @@ -65,9 +71,12 @@ typedef struct CameraParams { int is_ortho; float lens; float ortho_scale; + float zoom; float shiftx; float shifty; + float offsetx; + float offsety; /* sensor */ float sensor_x; @@ -95,6 +104,7 @@ typedef struct CameraParams { void camera_params_init(CameraParams *params); void camera_params_from_object(CameraParams *params, struct Object *camera); +void camera_params_from_view3d(CameraParams *params, struct View3D *v3d, struct RegionView3D *rv3d); void camera_params_compute(CameraParams *params, int winx, int winy, float aspx, float aspy); /* Camera View Frame */ |