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

Fix: Add shortcut to rotate camera by 90degrees #14 #1634

Merged
merged 12 commits into from
Sep 27, 2024
Merged

Fix: Add shortcut to rotate camera by 90degrees #14 #1634

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a3be21b
Fix#14: added keypress '2' for rotating camera by 90 degrees
dk1242 Sep 25, 2024
8ca338c
Merge pull request #1 from f3d-app/master
dk1242 Sep 25, 2024
a28fd4b
Fix#14: removed rotateCamera method, using roll
dk1242 Sep 26, 2024
632cd80
Fix#14: added tests for interaction: camera rotation by 90 & -90
dk1242 Sep 26, 2024
fb17381
Fix#14: updated the test name
dk1242 Sep 26, 2024
7df76ec
Fix#14: added the output images for test
dk1242 Sep 27, 2024
ac68068
trigger GitHub actions
dk1242 Sep 27, 2024
77ff696
Fix#14: added the docs
dk1242 Sep 27, 2024
685cdff
Fix#14: added the respected baseline images for TestInteractionCheatS…
dk1242 Sep 27, 2024
115ef0a
Fix#14: added new images for TestInteractionCheatSheet... tests
dk1242 Sep 27, 2024
e63367b
Fix#14: updated docs
dk1242 Sep 27, 2024
f3781c4
Fix#14: updated baselines according to new docs
dk1242 Sep 27, 2024
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: 2 additions & 0 deletions application/testing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,6 +754,8 @@ f3d_test(NAME TestInteractionCameraHotkeys DATA cow.vtp INTERACTION)
f3d_test(NAME TestInteractionZoomToMouse DATA cow.vtp INTERACTION)
f3d_test(NAME TestInteractionOrthographicProjection DATA cow.vtp INTERACTION) #5;5
f3d_test(NAME TestInteractionZoomToggleOrthographicProjection DATA cow.vtp INTERACTION) #MouseWheel;5;Mousewheelx6;5
f3d_test(NAME TestInteractionRotateCameraMinus90 DATA f3d.glb INTERACTION)
f3d_test(NAME TestInteractionRotateCamera90 DATA f3d.glb INTERACTION)

# Progress test
f3d_test(NAME TestProgress DATA cow.vtp ARGS --progress NO_BASELINE)
Expand Down
8 changes: 8 additions & 0 deletions library/src/interactor_impl.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,18 @@ class interactor_impl::internals
self->SetViewOrbit(ViewType::VT_RIGHT, self);
render = true;
break;
case '4':
self->Window.getCamera().roll(-90);
render = true;
break;
case '5':
self->Options.scene.camera.orthographic = !self->Options.scene.camera.orthographic;
render = true;
break;
case '6':
self->Window.getCamera().roll(90);
render = true;
break;
case '7':
self->SetViewOrbit(ViewType::VT_TOP, self);
render = true;
Expand Down
3 changes: 3 additions & 0 deletions testing/baselines/TestInteractionRotateCamera90.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions testing/baselines/TestInteractionRotateCameraMinus90.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
133 changes: 133 additions & 0 deletions testing/recordings/TestInteractionRotateCamera90.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
# StreamVersion 1.2
ExposeEvent 0 599 0 0 0 0 0
RenderEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
ExposeEvent 0 599 0 0 0 0 0
RenderEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
TimerEvent 0 599 0 0 0 0 0
KeyPressEvent 1051 -293 0 54 1 6 0
CharEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
KeyReleaseEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
TimerEvent 1051 -293 0 54 1 6 0
Loading