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

Change roll-shortcut from ALT to SHIFT #1715

Merged
merged 2 commits into from
Mar 27, 2023
+3 −3
Merged

Change roll-shortcut from ALT to SHIFT #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3037d90
Change roll-shortcut from ALT to SHIFT
emilk Mar 27, 2023
2f251a5
Fix: make sure up-axis is respected after resetting the camera
emilk Mar 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/re_viewer/src/ui/view_spatial/eye.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ impl OrbitEye {
if response.drag_delta().length() > drag_threshold {
if response.dragged_by(egui::PointerButton::Middle)
|| (response.dragged_by(egui::PointerButton::Primary)
&& response.ctx.input(|i| i.modifiers.alt))
&& response.ctx.input(|i| i.modifiers.shift))
{
if let Some(pointer_pos) = response.ctx.pointer_latest_pos() {
self.roll(&response.rect, pointer_pos, response.drag_delta());
Expand Down
4 changes: 2 additions & 2 deletions crates/re_viewer/src/ui/view_spatial/ui_3d.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl Default for View3DState {

impl View3DState {
pub fn reset_camera(&mut self, scene_bbox_accum: &BoundingBox) {
self.interpolate_to_eye(default_eye(scene_bbox_accum, &self.space_specs).to_eye());
self.interpolate_to_orbit_eye(default_eye(scene_bbox_accum, &self.space_specs));
self.tracked_camera = None;
self.camera_before_tracked_camera = None;
}
Expand Down Expand Up @@ -242,7 +242,7 @@ fn find_camera(space_cameras: &[SpaceCamera3D], needle: &InstancePathHash) -> Op

pub const HELP_TEXT_3D: &str = "Drag to rotate.\n\
Drag with secondary mouse button to pan.\n\
Drag with middle mouse button (or primary mouse button + holding Alt/⌥ key) to roll the view.\n\
Drag with middle mouse button (or primary mouse button + holding SHIFT) to roll the view.\n\
Scroll to zoom.\n\
\n\
While hovering the 3D view, navigate with WSAD and QE.\n\
Expand Down