diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-10-07 11:34:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-07 11:34:11 +0200 |
| commit | 58ca3031419cacb35c530cebe68e87a4c27dde06 (patch) | |
| tree | b0965bb65919bc1495ee02204a91e5ed3a9b56a7 /core/math/projection.cpp | |
| parent | 5b7f62af55b7f322192f95258d825b163cbf9dc1 (diff) | |
| parent | 0103af1ddda6a2aa31227965141dd7d3a513e081 (diff) | |
Merge pull request #66808 from bruvzg/msvc_warn
Diffstat (limited to 'core/math/projection.cpp')
| -rw-r--r-- | core/math/projection.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/math/projection.cpp b/core/math/projection.cpp index c628bf0bde..30c4f12795 100644 --- a/core/math/projection.cpp +++ b/core/math/projection.cpp @@ -169,7 +169,7 @@ Projection Projection::perspective_znear_adjusted(real_t p_new_znear) const { } Plane Projection::get_projection_plane(Planes p_plane) const { - const real_t *matrix = (const real_t *)this->columns; + const real_t *matrix = (const real_t *)columns; switch (p_plane) { case PLANE_NEAR: { @@ -402,7 +402,7 @@ void Projection::set_frustum(real_t p_size, real_t p_aspect, Vector2 p_offset, r } real_t Projection::get_z_far() const { - const real_t *matrix = (const real_t *)this->columns; + const real_t *matrix = (const real_t *)columns; Plane new_plane = Plane(matrix[3] - matrix[2], matrix[7] - matrix[6], matrix[11] - matrix[10], @@ -415,7 +415,7 @@ real_t Projection::get_z_far() const { } real_t Projection::get_z_near() const { - const real_t *matrix = (const real_t *)this->columns; + const real_t *matrix = (const real_t *)columns; Plane new_plane = Plane(matrix[3] + matrix[2], matrix[7] + matrix[6], matrix[11] + matrix[10], @@ -426,7 +426,7 @@ real_t Projection::get_z_near() const { } Vector2 Projection::get_viewport_half_extents() const { - const real_t *matrix = (const real_t *)this->columns; + const real_t *matrix = (const real_t *)columns; ///////--- Near Plane ---/////// Plane near_plane = Plane(matrix[3] + matrix[2], matrix[7] + matrix[6], @@ -454,7 +454,7 @@ Vector2 Projection::get_viewport_half_extents() const { } Vector2 Projection::get_far_plane_half_extents() const { - const real_t *matrix = (const real_t *)this->columns; + const real_t *matrix = (const real_t *)columns; ///////--- Far Plane ---/////// Plane far_plane = Plane(matrix[3] - matrix[2], matrix[7] - matrix[6], @@ -514,7 +514,7 @@ Vector<Plane> Projection::get_projection_planes(const Transform3D &p_transform) Vector<Plane> planes; planes.resize(6); - const real_t *matrix = (const real_t *)this->columns; + const real_t *matrix = (const real_t *)columns; Plane new_plane; @@ -807,7 +807,7 @@ bool Projection::is_orthogonal() const { } real_t Projection::get_fov() const { - const real_t *matrix = (const real_t *)this->columns; + const real_t *matrix = (const real_t *)columns; Plane right_plane = Plane(matrix[3] - matrix[0], matrix[7] - matrix[4], |