Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improved camera controls #218

Merged
merged 36 commits into from
Jul 2, 2024
Merged

Improved camera controls #218

merged 36 commits into from
Jul 2, 2024

Conversation

reuben-thomas
Copy link
Contributor

New feature implementation

Implemented feature

Improving camera controls for the cursor to address #75 based on picking

Implementation description

I'm going to refactor the camera_controls module to distinguish commands from the mouse, keyboard (#98) and eventually touchscreen (#97). This should allow us to separately configure each input type and manage conflicts.

@reuben-thomas
Refactor camera_control to distinguish camera state from user input s…
00176b8 
…tate

Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
Selection based pan, zoom, orbit for perspective camera
fd6f4fa 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
Preserve cursor selection between camera control updates, corrected p…
6b5d790 
…revious pan calculation

Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
Reverted to prior orbit method
2b3da96 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
Add orthographic control with rotation
4b21ea4 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
Added selection based orthographic panning, support fov zoom
b85c3cb 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
Fix styling
51ba52b 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
fixed picking based orbits
0726cb2 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
update cursor command type
b806ef6 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
orbit camera around fixed point
fb63ade 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
fix styling, stability when camera horizontal
e6fd8a3 
Signed-off-by: Reuben Thomas <[email protected]>

fix fov clamp

remove print

Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
fix stability near small angles
addc613 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
Selectable orbit center
a8b04af 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
Add marker with depth bias
593a7af 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
add wireframe sphere and persistent dot as orbit marker
b0cd322 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
keyboard camera control prototype
387f6b3 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
keyboard controls
e3d5149 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
fix styling
d798f98 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
orbit around cursor initital selection
465b9c3 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
orbit proportional to cursor direction
7939a27 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
proportional orbits
c437a87 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
consistent camera controls, selecting orbit center from plane ahead
ddf5aa2 
Signed-off-by: Reuben Thomas <[email protected]>
@mxgrey mxgrey marked this pull request as ready for review June 19, 2024 04:00
mxgrey
mxgrey requested changes Jun 19, 2024
View reviewed changes
Copy link
Collaborator

@mxgrey mxgrey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really awesome! The camera interaction is much smoother and more intuitive with these improvements.

I'm just leaving a few small comments, in addition to the things we've already discussed offline.

rmf_site_editor/src/interaction/camera_controls/cursor.rs Outdated Show resolved Hide resolved
rmf_site_editor/src/interaction/camera_controls/cursor.rs Outdated Show resolved Hide resolved
rmf_site_editor/src/interaction/camera_controls/keyboard.rs Outdated Show resolved Hide resolved
rmf_site_editor/src/interaction/camera_controls/keyboard.rs Outdated Show resolved Hide resolved
@reuben-thomas
smoothen zoom while panning
2be0ed9 
Signed-off-by: Reuben Thomas <[email protected]>
reuben-thomas and others added 6 commits June 20, 2024 15:09
@reuben-thomas
ignore egui panels for keyboard camera control
aeec885 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
ignore egui borders for camera zoom
431cc99 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
address review comments
52ce07e 
Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
reduce duplicate code
ff4f21a 
Signed-off-by: Reuben Thomas <[email protected]>
@mxgrey
Fix merge with main
3840065 
Signed-off-by: Michael X. Grey <[email protected]>
@reuben-thomas
Merge pull request #2 from open-rmf/camera_controls
c09e359 
Fix merge conflicts with latest main of upstream

Signed-off-by: Reuben Thomas <[email protected]>
@reuben-thomas
fix styling
09b5bf0 
Signed-off-by: Reuben Thomas <[email protected]>
@mxgrey mxgrey mentioned this pull request Jul 2, 2024
Closed
mxgrey
mxgrey approved these changes Jul 2, 2024
View reviewed changes
Copy link
Collaborator

@mxgrey mxgrey left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for these huge UX improvements!

@mxgrey mxgrey merged commit 9c44fe0 into open-rmf:main Jul 2, 2024
5 checks passed
@mxgrey mxgrey mentioned this pull request Jul 2, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arjo129 arjo129 arjo129 left review comments

@mxgrey mxgrey mxgrey approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@reuben-thomas @arjo129 @mxgrey