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

mxgrey merged 36 commits into open-rmf:main from reuben-thomas:main

Jul 2, 2024

Contributor

reuben-thomas commented May 23, 2024

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 force-pushed the main branch 2 times, most recently from 1ff3fda to 63fcdcf Compare

May 29, 2024 05:32

reuben-thomas force-pushed the main branch from 9ee08bc to ae0aaf7 Compare

May 30, 2024 04:59

mxgrey reviewed

View reviewed changes

rmf_site_editor/src/interaction/camera_controls/cursor.rs Outdated Show resolved Hide resolved

reuben-thomas force-pushed the main branch from a7cff31 to 4472361 Compare

June 17, 2024 14:54

reuben-thomas added 22 commits

June 18, 2024 08:36


          Refactor camera_control to distinguish camera state from user input s…

00176b8

…tate

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Selection based pan, zoom, orbit for perspective camera

fd6f4fa

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Preserve cursor selection between camera control updates, corrected p…

6b5d790

…revious pan calculation

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Reverted to prior orbit method

2b3da96

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Add orthographic control with rotation

4b21ea4

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Added selection based orthographic panning, support fov zoom

b85c3cb

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Fix styling

51ba52b

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          fixed picking based orbits

0726cb2

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          update cursor command type

b806ef6

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          orbit camera around fixed point

fb63ade

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          fix styling, stability when camera horizontal

e6fd8a3

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>

fix fov clamp

remove print

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          fix stability near small angles

addc613

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Selectable orbit center

a8b04af

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Add marker with depth bias

593a7af

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          add wireframe sphere and persistent dot as orbit marker

b0cd322

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          keyboard camera control prototype

387f6b3

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          keyboard controls

e3d5149

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          fix styling

d798f98

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          orbit around cursor initital selection

465b9c3

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          orbit proportional to cursor direction

7939a27

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          proportional orbits

c437a87

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          consistent camera controls, selecting orbit center from plane ahead

ddf5aa2

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>

reuben-thomas force-pushed the main branch from 4472361 to ddf5aa2 Compare

June 18, 2024 00:38


          Merge branch 'main' into main

513839c

mxgrey marked this pull request as ready for review

June 19, 2024 04:00

mxgrey and others added 2 commits

June 19, 2024 13:10


          Clear deltas as they get used and stay in control mode when cursor ex…

c17bef5

…its screen

Signed-off-by: Michael X. Grey <grey@openrobotics.org>


          don't use cursor selection for orbits

5febdd6

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>

mxgrey requested changes

View reviewed changes

Collaborator

mxgrey left a comment

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 added 3 commits

June 19, 2024 14:22


          show selection for both orbits and panning

d63be04

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Merge branch 'camera_controls' of github.com:open-rmf/rmf_site

bbd6eb4

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          address review comments: fixed new file dates, cleaned dead code

f4429a9

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>

reuben-thomas force-pushed the main branch from 7ce7178 to f4429a9 Compare

June 19, 2024 07:06


          smoothen zoom while panning

2be0ed9

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>

mxgrey reviewed

View reviewed changes

rmf_site_editor/src/interaction/camera_controls/keyboard.rs Outdated Show resolved Hide resolved

mxgrey reviewed

View reviewed changes

rmf_site_editor/src/interaction/camera_controls/mod.rs Outdated Show resolved Hide resolved

reuben-thomas and others added 6 commits

June 20, 2024 15:09


          ignore egui panels for keyboard camera control

aeec885

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          ignore egui borders for camera zoom

431cc99

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          address review comments

52ce07e

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          reduce duplicate code

ff4f21a

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>


          Fix merge with main

Signed-off-by: Michael X. Grey <grey@openrobotics.org>


          Merge pull request #2 from open-rmf/camera_controls

c09e359

Fix merge conflicts with latest main of upstream

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>

reuben-thomas force-pushed the main branch from 0711052 to c09e359 Compare

June 27, 2024 07:36


          fix styling

09b5bf0

Signed-off-by: Reuben Thomas <reubenthomas123@gmail.com>

mxgrey mentioned this pull request

WASD Controls #98

Closed

mxgrey approved these changes

View reviewed changes

Collaborator

mxgrey left a comment •

edited

Loading

Thanks for these huge UX improvements!

mxgrey merged commit 9c44fe0 into open-rmf:main

5 checks passed

mxgrey mentioned this pull request

Improve pan/tilt/zoom controls #75

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet