fix zooming when in ortho mode #151
Merged
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
toloudis
requested review from
meganrm,
blairlyons,
interim17,
ShrimpCryptid,
frasercl and
ascibisz
|
|
||
| float factor = 1.0f; |
There was a problem hiding this comment.
Maybe could use a more descriptive name... dragFactor? zoomFactor?
| @@ -676,8 +675,14 @@ cameraManipulation(const glm::vec2 viewportSize, Gesture& gesture, CCamera& came | |||
| inline CCamera& | |||
| operator+=(CCamera& camera, const CameraModifier& mod) | |||
| { | |||
| // update OrthoScale as well - remember percentage change in distance | |||
| // from target to eye is the same as percentage change in ortho scale | |||
| float dold = glm::distance(camera.m_From, camera.m_Target); | |||
ShrimpCryptid
approved these changes
Nov 1, 2023
|
Oops forgot to write this, but I did build AGAVE locally and test it, and things seemed to be working as expected. |
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.
Orthographic camera zoom has been broken since the camera controls were redone. This fixes it.