mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 06:19:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup of distance and time conversion classes, Modifies GuiSpaceTimeComponent

Browse Source 
Changed previous slider into text field + dropbox
Added acceleration slider
Added shuffle slider (closes #479)
This commit is contained in:
Alexander Bock
2018-02-08 17:42:22 -05:00
parent d5f158ad0b
commit cd33ec06c9
9 changed files with 575 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/base/dashboard/dashboarditemsimulationincrement.cpp
View File

@@ -171,7 +171,7 @@ DashboardItemSimulationIncrement::DashboardItemSimulationIncrement(
_requestedUnit = static_cast<int>(TimeUnit::Second);
if (dictionary.hasKey(RequestedUnitInfo.identifier)) {
std::string value = dictionary.value<std::string>(RequestedUnitInfo.identifier);
TimeUnit unit = timeUnitFromString(value);
TimeUnit unit = timeUnitFromString(value.c_str());
_requestedUnit = static_cast<int>(unit);
}
_requestedUnit.setVisibility(properties::Property::Visibility::Hidden);
@@ -188,7 +188,7 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
}
else {
TimeUnit unit = static_cast<TimeUnit>(_requestedUnit.value());
double convertedT = convertTime(t, unit);
double convertedT = convertTime(t, TimeUnit::Second, unit);
deltaTime = { convertedT, nameForTimeUnit(unit, convertedT != 1.0) };
}
@@ -210,7 +210,7 @@ glm::vec2 DashboardItemSimulationIncrement::size() const {
}
else {
TimeUnit unit = static_cast<TimeUnit>(_requestedUnit.value());
double convertedT = convertTime(t, unit);
double convertedT = convertTime(t, TimeUnit::Second, unit);
deltaTime = { convertedT, nameForTimeUnit(unit, convertedT != 1.0) };
}