--[BE Week] Update projection matrix near/far plane calcs #2276
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
also use new magnum implementations of near and far calcs
facebook-github-bot
added
the
CLA Signed
mosra
approved these changes
Dec 6, 2023
src/esp/gfx/RenderCamera.cpp
Outdated
| auto farDistance = | ||
| projectionMatrix()[3][2] / (1.0f + projectionMatrix()[2][2]); | ||
| // If projMat[3][3] == 0 then perpsective, otherwise ortho | ||
| auto farDistance = (projMat[3][3] == 0 ? projMat.perspectiveProjectionFar() |
There was a problem hiding this comment.
(Annoying mode enabled)
Suggested change
| auto farDistance = (projMat[3][3] == 0 ? projMat.perspectiveProjectionFar() | |
| const float farDistance = (projMat[3][3] == 0 ? projMat.perspectiveProjectionFar() |
src/esp/gfx/RenderCamera.cpp
Outdated
| @@ -207,10 +207,12 @@ esp::geo::Ray RenderCamera::unproject(const Mn::Vector2i& viewportPosition, | |||
| 2 * Magnum::Vector2{viewPos} / Magnum::Vector2{viewport()} - | |||
| Magnum::Vector2{1.0f}, | |||
| 1.0}; | |||
| const auto projMat = projectionMatrix(); | |||
There was a problem hiding this comment.
Suggested change
| const auto projMat = projectionMatrix(); | |
| const Mn::Matrix4 projMat = projectionMatrix(); |
jturner65
force-pushed
the
Bugfix_ProjMatrix
branch
from
ac7ec21
to
3ff4b3e
Compare
0mdc
reviewed
Dec 6, 2023
src/esp/gfx/RenderCamera.cpp
Outdated
|
|
||
| // compute the far plane distance | ||
| auto farDistance = | ||
| projectionMatrix()[3][2] / (1.0f + projectionMatrix()[2][2]); | ||
| // If projMat[3][3] == 0 then perpsective, otherwise ortho |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
This PR fixes or updates a few things related to the near/far plane calculation for projection matrices :
RenderCamera::unprojectfunction now not only calls the Magnum function, but also picks the correct calculation based on the nature of the Projection matrix, using the element at mat[3][3] to determine whether the matrix is perspective or orthographic.How Has This Been Tested
Types of changes
Checklist