diff options
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 85ee16fc5c6..25ff7f73888 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -268,7 +268,15 @@ typedef enum LightType { enum CameraType { CAMERA_PERSPECTIVE, CAMERA_ORTHOGRAPHIC, - CAMERA_ENVIRONMENT + CAMERA_PANORAMA +}; + +/* Panorama Type */ + +enum PanoramaType { + PANORAMA_EQUIRECTANGULAR, + PANORAMA_FISHEYE_EQUIDISTANT, + PANORAMA_FISHEYE_EQUISOLID }; /* Differential */ @@ -452,7 +460,11 @@ typedef struct ShaderData { typedef struct KernelCamera { /* type */ int type; - int pad1, pad2, pad3; + + /* panorama */ + int panorama_type; + float fisheye_fov; + float fisheye_lens; /* matrices */ Transform cameratoworld; @@ -476,6 +488,11 @@ typedef struct KernelCamera { float nearclip; float cliplength; + /* sensor size */ + float sensorwidth; + float sensorheight; + int pad1, pad2; + /* more matrices */ Transform screentoworld; Transform rastertoworld; |