diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-22 22:02:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 22:02:09 +0100 |
| commit | 37897dba80ae88785ca1cc7e0a717a6b15081a5b (patch) | |
| tree | a5f03261aac00dd417b6e3ce731527da078d6e26 /core | |
| parent | 91b0be18dcc3ba3b1ecd35e8a7e416883776cf7b (diff) | |
| parent | eaf8e5ce52331d05ee117c21e114ab0990dd3a9b (diff) | |
| download | redot-engine-37897dba80ae88785ca1cc7e0a717a6b15081a5b.tar.gz | |
Merge pull request #35406 from lawnjelly/ortho-shadow
Replace CameraMatrix::get_viewport_size with get_viewport_half_extents, shadow culling with ortho camera and other affected issues
Diffstat (limited to 'core')
| -rw-r--r-- | core/math/camera_matrix.cpp | 10 | ||||
| -rw-r--r-- | core/math/camera_matrix.h | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/core/math/camera_matrix.cpp b/core/math/camera_matrix.cpp index 165bb9f823..380bae871a 100644 --- a/core/math/camera_matrix.cpp +++ b/core/math/camera_matrix.cpp @@ -247,7 +247,7 @@ real_t CameraMatrix::get_z_near() const { return new_plane.d; } -void CameraMatrix::get_viewport_size(real_t &r_width, real_t &r_height) const { +Vector2 CameraMatrix::get_viewport_half_extents() const { const real_t *matrix = (const real_t *)this->matrix; ///////--- Near Plane ---/////// @@ -273,8 +273,7 @@ void CameraMatrix::get_viewport_size(real_t &r_width, real_t &r_height) const { Vector3 res; near_plane.intersect_3(right_plane, top_plane, &res); - r_width = res.x; - r_height = res.y; + return Vector2(res.x, res.y); } bool CameraMatrix::get_endpoints(const Transform &p_transform, Vector3 *p_8points) const { @@ -563,9 +562,8 @@ CameraMatrix::operator String() const { real_t CameraMatrix::get_aspect() const { - real_t w, h; - get_viewport_size(w, h); - return w / h; + Vector2 vp_he = get_viewport_half_extents(); + return vp_he.x / vp_he.y; } int CameraMatrix::get_pixels_per_meter(int p_for_pixel_width) const { diff --git a/core/math/camera_matrix.h b/core/math/camera_matrix.h index 59e34c0855..2eed6d25d6 100644 --- a/core/math/camera_matrix.h +++ b/core/math/camera_matrix.h @@ -73,7 +73,7 @@ struct CameraMatrix { Vector<Plane> get_projection_planes(const Transform &p_transform) const; bool get_endpoints(const Transform &p_transform, Vector3 *p_8points) const; - void get_viewport_size(real_t &r_width, real_t &r_height) const; + Vector2 get_viewport_half_extents() const; void invert(); CameraMatrix inverse() const; |