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

Simplify fading functions

Browse Source
This commit is contained in:
sylvass
2021-11-05 12:03:38 -04:00
parent 1e4f4dc19a
commit 89e483c748
4 changed files with 401 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
modules/skybrowser/skybrowsermodule.cpp
View File

@@ -416,7 +416,6 @@ SkyBrowserModule::SkyBrowserModule()
_cameraInSolarSystem = glm::length(cameraPos) < _solarSystemRadius;
// Fading flags
bool fadeIsFinished{ false };
if (_cameraInSolarSystem != camWasInSolarSystem) {
_isTransitioningVizMode = true;
@@ -429,20 +428,15 @@ SkyBrowserModule::SkyBrowserModule()
// Fade pairs if the camera moved in or out the solar system
if (_isTransitioningVizMode) {
if (_cameraInSolarSystem) {
fadeIsFinished = fadeBrowserTargetsToOpaque(deltaTime);
incrementallyFadeBrowserTargets(Transparency::Opaque, deltaTime);
}
else {
fadeIsFinished = fadeBrowserTargetsToTransparent(deltaTime);
}
// The transition is over when the fade is finished
if (fadeIsFinished) {
_isTransitioningVizMode = false;
incrementallyFadeBrowserTargets(Transparency::Transparent, deltaTime);
}
}
if (_cameraInSolarSystem) {
animateTargets(deltaTime);
incrementallyAnimateTargets(deltaTime);
}
if (_cameraIsRotating) {
incrementallyRotateCamera(deltaTime);
@@ -776,33 +770,29 @@ void SkyBrowserModule::incrementallyRotateCamera(double deltaTime) {
}
}
bool SkyBrowserModule::fadeBrowserTargetsToTransparent(double deltaTime)
void SkyBrowserModule::incrementallyFadeBrowserTargets(Transparency goal, float deltaTime)
{
bool fadeIsFinished{ false };
for (Pair pair : _targetsBrowsers) {
if (pair.isEnabled()) {
bool finished = pair.fadeToTransparent(_fadingTime, deltaTime);
if (finished) {
pair.disable();
}
fadeIsFinished &= finished;
}
}
return fadeIsFinished;
}
bool SkyBrowserModule::fadeBrowserTargetsToOpaque(double deltaTime)
{
bool fadeIsFinished{ false };
float transparency = static_cast<float>(goal);
bool isAllFinished{ false };
for (Pair pair : _targetsBrowsers) {
if (pair.isEnabled()) {
fadeIsFinished &= pair.fadeToOpaque(_fadingTime, deltaTime);
}
}
return fadeIsFinished;
if (pair.isEnabled()) {
pair.incrementallyFade(transparency, _fadingTime, deltaTime);
bool isPairFinished = pair.isFinishedFading(transparency);
if (isPairFinished && goal == Transparency::Transparent) {
pair.disable();
}
isAllFinished &= isPairFinished;
}
}
// The transition is over when the fade is finished
if (isAllFinished) {
_isTransitioningVizMode = false;
}
}
void SkyBrowserModule::animateTargets(double deltaTime)
void SkyBrowserModule::incrementallyAnimateTargets(double deltaTime)
{
for (Pair pair : _targetsBrowsers) {
if (pair.isEnabled()) {
@@ -825,8 +815,6 @@ std::string SkyBrowserModule::selectedBrowserId() {
return _selectedBrowser;
}
bool SkyBrowserModule::cameraInSolarSystem() {
return _cameraInSolarSystem;
}