diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-08 08:19:17 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 06:54:05 +0300 |
commit | 623141f339d5066ed6b96ad70ab45fb294e3e612 (patch) | |
tree | 4af00e5d967a66829db1bec4bbf369c0529b9bd7 /intern/cycles/render | |
parent | 516e82a90012da3911518103829158215d94215f (diff) |
Code refactor: add DecomposedTransform.
This is in preparation of making Transform affine only, and also gives us
a little extra type safety so we don't accidentally treat it as a regular
4x4 matrix.
Diffstat (limited to 'intern/cycles/render')
-rw-r--r-- | intern/cycles/render/camera.cpp | 8 | ||||
-rw-r--r-- | intern/cycles/render/object.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp index e6585b2de55..5e8c5db6c0e 100644 --- a/intern/cycles/render/camera.cpp +++ b/intern/cycles/render/camera.cpp @@ -341,12 +341,12 @@ void Camera::update(Scene *scene) /* TODO(sergey): Support perspective (zoom, fov) motion. */ if(type == CAMERA_PANORAMA) { if(use_motion) { - kcam->motion.pre = transform_inverse(motion.pre); - kcam->motion.post = transform_inverse(motion.post); + kcam->pass_motion.pre = transform_inverse(motion.pre); + kcam->pass_motion.post = transform_inverse(motion.post); } else { - kcam->motion.pre = kcam->worldtocamera; - kcam->motion.post = kcam->worldtocamera; + kcam->pass_motion.pre = kcam->worldtocamera; + kcam->pass_motion.post = kcam->worldtocamera; } } else { diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index c992469cb39..f632f7c4a53 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -97,7 +97,7 @@ void Object::compute_bounds(bool motion_blur) mtfm.post = tfm; } - MotionTransform decomp; + DecomposedMotionTransform decomp; transform_motion_decompose(&decomp, &mtfm, &tfm); bounds = BoundBox::empty; @@ -401,7 +401,7 @@ void ObjectManager::device_update_object_transform(UpdateObjectTransformState *s else if(state->need_motion == Scene::MOTION_BLUR) { if(ob->use_motion) { /* decompose transformations for interpolation. */ - MotionTransform decomp; + DecomposedMotionTransform decomp; transform_motion_decompose(&decomp, &ob->motion, &ob->tfm); kobject.tfm = decomp; |