Merging r50049 through r50076 from trunk into soc-2011-tomato
[blender.git] / intern / cycles / render / camera.h
index 935489711c84f9dc39863eadefaec223f01d71ce..a539510029f7d26ffbcbb1fc8e940b575ea54261 100644 (file)
@@ -50,6 +50,15 @@ public:
        CameraType type;
        float fov;
 
+       /* panorama */
+       PanoramaType panorama_type;
+       float fisheye_fov;
+       float fisheye_lens;
+
+       /* sensor */
+       float sensorwidth;
+       float sensorheight;
+
        /* clipping */
        float nearclip;
        float farclip;
@@ -58,6 +67,9 @@ public:
        int width, height;
        float left, right, bottom, top;
 
+       /* border */
+       float border_left, border_right, border_bottom, border_top;
+
        /* transformation */
        Transform matrix;
 
@@ -66,7 +78,7 @@ public:
        bool use_motion;
 
        /* computed camera parameters */
-    Transform screentoworld;
+       Transform screentoworld;
        Transform rastertoworld;
        Transform ndctoworld;
        Transform rastertocamera;
@@ -79,6 +91,7 @@ public:
        /* update */
        bool need_update;
        bool need_device_update;
+       int previous_motion;
 
        /* functions */
        Camera();