diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-08 01:28:21 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-05-28 15:07:19 +0300 |
| commit | 98ad47332466b13f35de80639a54b3493786fddb (patch) | |
| tree | 697f738d070c8a9965e7c9956201ebb1bc3be634 /intern/cycles/render/camera.h | |
| parent | 9d5aead88f4d62152f7f4a36f84fe0e1dc3463d7 (diff) | |
Code refactor: nodify Cycles camera and fix some mistakes in XML node read.
Differential Revision: https://developer.blender.org/D2016
Diffstat (limited to 'intern/cycles/render/camera.h')
| -rw-r--r-- | intern/cycles/render/camera.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/intern/cycles/render/camera.h b/intern/cycles/render/camera.h index 57b9960e70b..9069cc6d53d 100644 --- a/intern/cycles/render/camera.h +++ b/intern/cycles/render/camera.h @@ -19,6 +19,8 @@ #include "kernel_types.h" +#include "node.h" + #include "util_boundbox.h" #include "util_transform.h" #include "util_types.h" @@ -35,8 +37,10 @@ class Scene; * Renderman, and Blender after remapping. */ -class Camera { +class Camera : public Node { public: + NODE_DECLARE; + /* Specifies an offset for the shutter's time interval. */ enum MotionPosition { /* Shutter opens at the current frame. */ @@ -69,7 +73,7 @@ public: /* motion blur */ float shuttertime; MotionPosition motion_position; - float shutter_curve[RAMP_TABLE_SIZE]; + array<float> shutter_curve; size_t shutter_table_offset; /* ** Rolling shutter effect. ** */ @@ -177,7 +181,6 @@ public: void device_update_volume(Device *device, DeviceScene *dscene, Scene *scene); void device_free(Device *device, DeviceScene *dscene, Scene *scene); - bool modified(const Camera& cam); bool motion_modified(const Camera& cam); void tag_update(); |