ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak fade-in/fade-out times in cutscenes and remove hardcoded values

Browse Source
This commit is contained in:
Marianne Gagnon 2014-09-14 19:06:19 -04:00
parent 0d982e55f0
commit 3536e13c49
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modes/cutscene_world.cpp
View File

@ -59,6 +59,7 @@ CutsceneWorld::CutsceneWorld() : World()
WorldStatus::setClockMode(CLOCK_NONE);
m_use_highscores = false;
m_play_racestart_sounds = false;
m_fade_duration = 1.0f;
} // CutsceneWorld
//-----------------------------------------------------------------------------
@ -240,13 +241,13 @@ void CutsceneWorld::update(float dt)
float fade = 0.0f;
float fadeIn = -1.0f;
float fadeOut = -1.0f;
if (m_time < 2.0f)
if (m_time < m_fade_duration)
{
fadeIn = 1.0f - (float)m_time / 2.0f;
fadeIn = 1.0f - (float)m_time / m_fade_duration;
}
if (m_time > m_duration - 2.0f)
if (m_time > m_duration - m_fade_duration)
{
fadeOut = (float)(m_time - (m_duration - 2.0f)) / 2.0f;
fadeOut = (float)(m_time - (m_duration - m_fade_duration)) / m_fade_duration;
}
if (fadeIn >= 0.0f && fadeOut >= 0.0f)

4
src/modes/cutscene_world.hpp
View File

@ -45,6 +45,8 @@ class CutsceneWorld : public World
double m_duration;
bool m_aborted;
float m_fade_duration;
// TODO find a better way than static
static bool s_use_duration;
@ -109,7 +111,7 @@ public:
// ------------------------------------------------------------------------
void abortCutscene()
{
if (m_time < m_duration - 2.0f) m_duration = m_time + 2.0f;
if (m_time < m_duration - m_fade_duration) m_duration = m_time + m_fade_duration;
m_aborted = true;
}