diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-16 09:06:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-16 09:06:34 +0200 |
| commit | 90a1e5193366e57069951cf2703616248e5f515d (patch) | |
| tree | 4efb789ff3d5673c38dc439eb91127870183f392 /servers/rendering/renderer_scene_render.cpp | |
| parent | 96410f55b24e47af045e3ad31545331ce124d999 (diff) | |
| parent | b4eeeb315a74682d299c7ec1555ce06a9dc2641a (diff) | |
Merge pull request #37842 from MennoMax/plane-constructor
Swap args of Plane(point, normal) constructor
Diffstat (limited to 'servers/rendering/renderer_scene_render.cpp')
| -rw-r--r-- | servers/rendering/renderer_scene_render.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/servers/rendering/renderer_scene_render.cpp b/servers/rendering/renderer_scene_render.cpp index 3a230ac89d..38d1218dee 100644 --- a/servers/rendering/renderer_scene_render.cpp +++ b/servers/rendering/renderer_scene_render.cpp @@ -68,7 +68,7 @@ void RendererSceneRender::CameraData::set_multiview_camera(uint32_t p_view_count main_transform.basis.set(x, y, z); // 3. create a horizon plane with one of the eyes and the up vector as normal. - Plane horizon(p_transforms[0].origin, y); + Plane horizon(y, p_transforms[0].origin); // 4. Intersect horizon, left and right to obtain the combined camera origin. ERR_FAIL_COND_MSG( @@ -79,7 +79,7 @@ void RendererSceneRender::CameraData::set_multiview_camera(uint32_t p_view_count // 5. figure out far plane, this could use some improvement, we may have our far plane too close like this, not sure if this matters Vector3 far_center = (planes[0][CameraMatrix::PLANE_FAR].center() + planes[1][CameraMatrix::PLANE_FAR].center()) * 0.5; - Plane far(far_center, -z); + Plane far(-z, far_center); ///////////////////////////////////////////////////////////////////////////// // Figure out our top/bottom planes @@ -137,9 +137,9 @@ void RendererSceneRender::CameraData::set_multiview_camera(uint32_t p_view_count Plane near; Vector3 neg_z = -z; if (neg_z.dot(p_transforms[1].origin) < neg_z.dot(p_transforms[0].origin)) { - near = Plane(p_transforms[0].origin, neg_z); + near = Plane(neg_z, p_transforms[0].origin); } else { - near = Plane(p_transforms[1].origin, neg_z); + near = Plane(neg_z, p_transforms[1].origin); } // 13. Intersect near plane with bottm/left planes, to obtain min_vec then top/right to obtain max_vec |