mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 13:12:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add option to press Shift while clicking the time shifting to immediately jump, instead of interpolate

Browse Source
This commit is contained in:
Alexander Bock
2018-10-08 18:12:50 -06:00
parent 3b23d9d26d
commit 635df258d4
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/imgui/src/guispacetimecomponent.cpp
View File

@@ -224,7 +224,7 @@ void GuiSpaceTimeComponent::render() {
_tooltipDelay
);
auto incrementTime = [](float days) {
auto incrementTime = [shift = ImGui::GetIO().KeyShift](float days) {
using namespace std::chrono;
const float duration = global::timeManager.defaultTimeInterpolationDuration();
@@ -241,11 +241,20 @@ void GuiSpaceTimeComponent::render() {
j2000 - seconds :
j2000 + seconds;
global::scriptEngine.queueScript(
"openspace.time.interpolateTime(" + std::to_string(newTime) + ", " +
std::to_string(duration) + ")",
scripting::ScriptEngine::RemoteScripting::No
);
if (shift) {
// If any shift key is pressed we want to always jump to the time
global::scriptEngine.queueScript(
"openspace.time.setTime(" + std::to_string(newTime) + ")",
scripting::ScriptEngine::RemoteScripting::No
);
}
else {
global::scriptEngine.queueScript(
"openspace.time.interpolateTime(" + std::to_string(newTime) + ", " +
std::to_string(duration) + ")",
scripting::ScriptEngine::RemoteScripting::No
);
}
};
const bool minusMonth = ImGui::Button("-Month");
@@ -369,8 +378,7 @@ void GuiSpaceTimeComponent::render() {
// value to the new unit
_deltaTime = static_cast<float>(
convertTime(dt, TimeUnit::Second, static_cast<TimeUnit>(_deltaTimeUnit)
)
convertTime(dt, TimeUnit::Second, static_cast<TimeUnit>(_deltaTimeUnit))
);
}
}