mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature/time interpolation (#669)

Browse Source 
* Initial implementation
* Better approximation of target time
* Correctly use double precision for time passing
* Cleanup
* Adding proportional adjustment of delta time at end of interpolation
* Keyframe based time interpolation
* Add property for time interpolation duration. Move time interpolation methods to TimeManager.
* Fix bugs with time gui
* Make several clicks on delta time buttons work as expected
* Clean up
* Improve time interpolation for parallel connection
* Improve time API. Fix time interpolation bugs.
* Fix mac compile issue
* Add hour button
* Add missing + sign
* Remove newer images from projection buffer when going back in time
* Add comment about clearing projection buffer
* Fix bug with jumping time in parallel connection
* Rename integrateFromTime to previousFrameTime
* Compile fix for iswa module
* Address code review comments
* Code cleanup
* Fix bug causig unsmooth behaviour when pausing while interpolating in time
This commit is contained in:
Emil Axelsson
2018-07-13 11:07:35 +02:00
committed by GitHub
parent 6007f1d70d
commit 902e3e6dac
42 changed files with 1465 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,7 @@ DashboardItemSimulationIncrement::DashboardItemSimulationIncrement(
}
void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
const double t = OsEng.timeManager().time().deltaTime();
const double t = OsEng.timeManager().targetDeltaTime();
std::pair<double, std::string> deltaTime;
if (_doSimplification) {
deltaTime = simplifyTime(t);
@@ -188,19 +188,22 @@ void DashboardItemSimulationIncrement::render(glm::vec2& penPosition) {
deltaTime = { convertedT, nameForTimeUnit(unit, convertedT != 1.0) };
}
std::string pauseText = OsEng.timeManager().isPaused() ? " (Paused)" : "";
penPosition.y -= _font->height();
RenderFont(
*_font,
penPosition,
fmt::format(
"Simulation increment: {:.1f} {:s} / second",
deltaTime.first, deltaTime.second
"Simulation increment: {:.1f} {:s} / second{:s}",
deltaTime.first, deltaTime.second,
pauseText
)
);
}
glm::vec2 DashboardItemSimulationIncrement::size() const {
double t = OsEng.timeManager().time().deltaTime();
double t = OsEng.timeManager().targetDeltaTime();
std::pair<double, std::string> deltaTime;
if (_doSimplification) {
deltaTime = simplifyTime(t);