diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-08-10 16:24:39 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-10 16:24:39 -0300 |
| commit | 52e6f1f25c86891381ca3ce9e03422db586ecd16 (patch) | |
| tree | b0b4b1e9325775e590e931f43c360a1c809758df | |
| parent | 783fd23deab0360366b52c551b3717a894f42ab7 (diff) | |
| parent | ec5c96dbe11f3f62f7a47204d65392ff25b5a62a (diff) | |
Merge pull request #20072 from RandomShaper/fix-camera-offsets
Fix camera offsets not applied always
| -rw-r--r-- | scene/3d/camera.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp index 0fe427d5fc..2176b45faf 100644 --- a/scene/3d/camera.cpp +++ b/scene/3d/camera.cpp @@ -74,10 +74,7 @@ void Camera::_update_camera() { if (!is_inside_tree()) return; - Transform tr = get_camera_transform(); - tr.origin += tr.basis.get_axis(1) * v_offset; - tr.origin += tr.basis.get_axis(0) * h_offset; - VisualServer::get_singleton()->camera_set_transform(camera, tr); + VisualServer::get_singleton()->camera_set_transform(camera, get_camera_transform()); // here goes listener stuff /* @@ -143,7 +140,10 @@ void Camera::_notification(int p_what) { Transform Camera::get_camera_transform() const { - return get_global_transform().orthonormalized(); + Transform tr = get_global_transform().orthonormalized(); + tr.origin += tr.basis.get_axis(1) * v_offset; + tr.origin += tr.basis.get_axis(0) * h_offset; + return tr; } void Camera::set_perspective(float p_fovy_degrees, float p_z_near, float p_z_far) { |