mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 10:28:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Create animation class to clean up animation code

Browse Source
This commit is contained in:
Ylva Selling
2022-03-30 16:05:26 -04:00
parent 4063a49297
commit badd2e2ff2
4 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/skybrowser/src/targetbrowserpair.cpp
+9 -28
View File
@@ -303,12 +303,10 @@ void TargetBrowserPair::incrementallyAnimateToCoordinate(double deltaTime) {
void TargetBrowserPair::startFading(float goal, float fadeTime)
{
_startTarget = _targetRenderable->opacity();
_startBrowser = _browser->opacity();
_goal = goal;
_fadeTime = std::chrono::milliseconds(static_cast<int>(fadeTime * 1000));
_fadeStart = std::chrono::system_clock::now();
_isFading = true;
_fadeTarget = skybrowser::Animation(_targetRenderable->opacity(), goal, fadeTime);
_fadeBrowser = skybrowser::Animation(_browser->opacity(), goal, fadeTime);
_fadeTarget.start();
_fadeBrowser.start();
}
void TargetBrowserPair::startAnimation(glm::dvec3 galacticCoords, double fovEnd,
@@ -367,7 +365,7 @@ void TargetBrowserPair::centerTargetOnScreen() {
}
bool TargetBrowserPair::hasFinishedFading() const {
return !_isFading;
return _fadeBrowser.isFinished() && _fadeTarget.isFinished();
}
bool TargetBrowserPair::isFacingCamera() const {
@@ -388,28 +386,11 @@ ScreenSpaceSkyBrowser* TargetBrowserPair::browser() const {
void TargetBrowserPair::incrementallyFade(float deltaTime)
{
using namespace std::chrono;
system_clock::time_point now = system_clock::now();
std::chrono::duration<double, std::milli> timeSpent = now - _fadeStart;
if (timeSpent.count() > _fadeTime.count()) {
_isFading = false;
_browser->setOpacity(_goal);
_targetRenderable->setOpacity(_goal);
if (!_fadeBrowser.isFinished()) {
_browser->setOpacity(_fadeBrowser.getNewValue());
}
else {
float percentage = timeSpent / _fadeTime;
float newOpacityTarget;
float newOpacityBrowser;
if (_goal > _startTarget || _goal > _startBrowser) {
newOpacityTarget, newOpacityBrowser = _goal * percentage;
}
else {
newOpacityTarget = _startTarget * (1.f - percentage);
newOpacityBrowser = _startBrowser * (1.f - percentage);
}
_browser->setOpacity(newOpacityBrowser);
_targetRenderable->setOpacity(newOpacityTarget);
if (!_fadeTarget.isFinished()) {
_targetRenderable->setOpacity(_fadeTarget.getNewValue());
}
}