Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
OpenSpace
Commits
43e115d6
Commit
43e115d6
authored
6 years ago
by
Emil Axelsson
Committed by
Alexander Bock
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Add shortcut to change focus interpolation time (#707)
Closes #707
parent
04846e3a
master
content/2012EventProfile
elumenati/spout-implementation
elumenati/spoutImplementation
feature/2012Fieldlines
feature/WSA
feature/apollo-missions
feature/arrow-renderable
feature/asset-helper
feature/asset-meta-update-part2
feature/asset-require
feature/atmosphere-stars-rendering
feature/bufferTransferTestings
feature/camera-control-during-path
feature/camera-path-stability
feature/cef-update
feature/change-renderbin-runtime
feature/cmake
feature/codegen-lua
feature/codegen-lua-jenkins
feature/compile-times
feature/direction-hint-renderable
feature/downscaledATM
feature/du-meshes-selection
feature/fieldlines
feature/gamma-correction
feature/geojson
feature/geojson-renderable
feature/getting-started-tour
feature/grid-labels
feature/grids-update
feature/gui-mouseinteraction-fix
feature/horizons-framework
feature/horizons-unit-tests
feature/idle-behavior-updates
feature/imageTestKeys2Actions
feature/jenkins-codegen
feature/jenkins-fix
feature/jenkins-timeout
feature/juice
feature/jwst-pointing
feature/jwst-trail-update
feature/jwst-update
feature/labels-rendering
feature/location-measure
feature/macos
feature/mars-moons
feature/mas-model
feature/missions
feature/model-opacity
feature/molecule_rendering
feature/mollwide-projection
feature/multiple-endpoints
feature/orientation-check
feature/paper-atmosphere
feature/properties-visibility
feature/renderable-enabled-event
feature/rover-visualization
feature/satellites
feature/saturn-shepherd-moons
feature/science-on-the-sphere
feature/sgct-framebuffer-fixes
feature/sgct-gui
feature/sgct-gui-editable
feature/sgct-gui-jenkins
feature/sgct-json
feature/sgct-ui
feature/side-by-side-removal
feature/skybrowser
feature/skybrowser-cleanup
feature/skybrowser-drag-and-drop
feature/skybrowser-reload
feature/solarbrowsing
feature/spacecraft-instruments
feature/spaceweather-stream
feature/spice-update
feature/state-with-time
feature/tileprovider-minlevel
feature/tileproviders
feature/tle-bodymass
feature/touchEventListener
feature/transparency-rendering-last
feature/ubuntu2204
feature/unit-tests
feature/userproperties
feature/various-changes
feature/video-on-globe
feature/visual-testing
feature/visual-testing-try2
feature/volume-fixes
feature/warnings
feature/wormhole
feature/xbox-update
hotfix/scaling
integration/atm-paper-fixes-2
integration/moon-mars-show
integration/paper-atmosphere
issue/1043
issue/1161
issue/1279
issue/1366-2
issue/1479
issue/1559
issue/1607
issue/1666
issue/1707
issue/1751
issue/1814
issue/1827
issue/1842
issue/1845
issue/1851
issue/1905
issue/1908
issue/1910
issue/1911
issue/1964
issue/1989
issue/1995
issue/2029
issue/2055
issue/2093
issue/2111
issue/2118
issue/2121
issue/2127
issue/2133
issue/2137
issue/2194
issue/2207
issue/2209
issue/2212
issue/2236
issue/2259
issue/2261
issue/2266
issue/2269
issue/843
issue/888
issue/hdrModels
jenkins/1
jenkins/2
jenkins/2286
jenkins/utah-test-1
project/2021-wisdome-installation
project/climate
project/exoplanet-explorer
project/exoplanets-expert-tool
project/lights-2020-installation
project/spaceship-installation
project/spvl
rc/0.18.1
temp/skybrowser-animation-fixes-merge
thesis/2018/data-loader
thesis/2018/dsn
thesis/2018/flightcontroller
thesis/2019/spaceDebris
thesis/2019/spaceweather-stream
thesis/2020/software-integration
thesis/2020/sonification
thesis/2021/airtraffic
thesis/2021/fieldlines
thesis/2021/multiuser-collab
thesis/2021/multiuser-collab3
thesis/2021/skybrowser
thesis/2022/climate
thesis/2022/cosmic-view
thesis/2022/fieldline-rendering
thesis/2022/remote-streaming
thesis/2022/software-integration
thesis/2022/software-integration_dod
thesis/2022/software-integration_receive-ra-dec
thesis/2022/software-integration_refactor-simp
thesis/2022/software-integration_velocity-support
thesis/2022/streaming
vislabs/release/2.1
research/atmospheres
releases/v0.18.0
releases/v0.17.2
releases/v0.17.1
releases/v0.17.0
releases/v0.16.1
releases/v0.16.0
releases/v0.15.2
releases/v0.15.1
releases/v0.15.0
releases/v0.14.1
releases/v0.14.0
releases/v0.13.0
releases/beta/beta-9
releases/beta/beta-8
releases/beta/beta-7
releases/beta/beta-5
releases/beta/beta-4_2
releases/beta/beta-4
releases/beta/beta-3
dev/fc-port-change
beta/beta-4_2
beta/beta-4
beta/beta-3
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
include/openspace/interaction/navigationhandler.h
+2
-0
include/openspace/interaction/navigationhandler.h
include/openspace/interaction/orbitalnavigator.h
+2
-0
include/openspace/interaction/orbitalnavigator.h
modules/imgui/src/guispacetimecomponent.cpp
+13
-0
modules/imgui/src/guispacetimecomponent.cpp
src/interaction/navigationhandler.cpp
+8
-0
src/interaction/navigationhandler.cpp
src/interaction/orbitalnavigator.cpp
+8
-0
src/interaction/orbitalnavigator.cpp
with
33 additions
and
0 deletions
+33
-0
include/openspace/interaction/navigationhandler.h
+
2
-
0
View file @
43e115d6
...
...
@@ -58,6 +58,7 @@ public:
void
setFocusNode
(
SceneGraphNode
*
node
);
void
setCamera
(
Camera
*
camera
);
void
resetCameraDirection
();
void
setInterpolationTime
(
float
durationInSeconds
);
void
setCameraStateFromDictionary
(
const
ghoul
::
Dictionary
&
cameraDict
);
...
...
@@ -72,6 +73,7 @@ public:
const
InputState
&
inputState
()
const
;
const
OrbitalNavigator
&
orbitalNavigator
()
const
;
KeyframeNavigator
&
keyframeNavigator
()
const
;
float
interpolationTime
()
const
;
// Callback functions
void
keyboardCallback
(
Key
key
,
KeyModifier
modifier
,
KeyAction
action
);
...
...
This diff is collapsed.
Click to expand it.
include/openspace/interaction/orbitalnavigator.h
+
2
-
0
View file @
43e115d6
...
...
@@ -55,6 +55,8 @@ public:
void
setFocusNode
(
SceneGraphNode
*
focusNode
);
void
startInterpolateCameraDirection
(
const
Camera
&
camera
);
float
rotateToFocusInterpolationTime
()
const
;
void
setRotateToFocusInterpolationTime
(
float
durationInSeconds
);
JoystickCameraStates
&
joystickStates
();
...
...
This diff is collapsed.
Click to expand it.
modules/imgui/src/guispacetimecomponent.cpp
+
13
-
0
View file @
43e115d6
...
...
@@ -153,6 +153,19 @@ void GuiSpaceTimeComponent::render() {
);
}
float
interpolationTime
=
global
::
navigationHandler
.
interpolationTime
();
const
bool
interpolationTimeChanged
=
ImGui
::
SliderFloat
(
"Interpolation Time"
,
&
interpolationTime
,
0.
f
,
10.
f
,
"%.1f seconds"
);
if
(
interpolationTimeChanged
)
{
global
::
navigationHandler
.
setInterpolationTime
(
interpolationTime
);
}
ImGui
::
SetCursorPosY
(
ImGui
::
GetCursorPosY
()
+
20.
f
);
ImGui
::
Separator
();
...
...
This diff is collapsed.
Click to expand it.
src/interaction/navigationhandler.cpp
+
8
-
0
View file @
43e115d6
...
...
@@ -135,6 +135,14 @@ KeyframeNavigator& NavigationHandler::keyframeNavigator() const {
return
*
_keyframeNavigator
;
}
float
NavigationHandler
::
interpolationTime
()
const
{
return
_orbitalNavigator
->
rotateToFocusInterpolationTime
();
}
void
NavigationHandler
::
setInterpolationTime
(
float
durationInSeconds
)
{
_orbitalNavigator
->
setRotateToFocusInterpolationTime
(
durationInSeconds
);
}
void
NavigationHandler
::
updateCamera
(
double
deltaTime
)
{
ghoul_assert
(
_inputState
!=
nullptr
,
"InputState must not be nullptr"
);
ghoul_assert
(
_camera
!=
nullptr
,
"Camera must not be nullptr"
);
...
...
This diff is collapsed.
Click to expand it.
src/interaction/orbitalnavigator.cpp
+
8
-
0
View file @
43e115d6
...
...
@@ -404,6 +404,14 @@ void OrbitalNavigator::startInterpolateCameraDirection(const Camera& camera) {
_cameraToSurfaceDistanceInterpolator
.
start
();
}
float
OrbitalNavigator
::
rotateToFocusInterpolationTime
()
const
{
return
_rotateToFocusInterpolationTime
;
}
void
OrbitalNavigator
::
setRotateToFocusInterpolationTime
(
float
durationInSeconds
)
{
_rotateToFocusInterpolationTime
=
durationInSeconds
;
}
bool
OrbitalNavigator
::
followingNodeRotation
()
const
{
return
_followRotationInterpolator
.
value
()
>=
1.0
;
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help