mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-09 00:45:46 +00:00
Code Issues Projects Releases Wiki Activity

Make preset transitions use TimeKeeper instead of the system clock

Browse Source
This commit is contained in:
Kai Blaschke
2024-06-09 13:04:01 +02:00
parent 2914d85ec3
commit f94f99d888
3 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libprojectM/ProjectM.cpp
View File

@ -150,7 +150,7 @@ void ProjectM::RenderFrame(uint32_t targetFramebufferObject /*= 0*/)
if (m_transition != nullptr && m_transitioningPreset != nullptr)
{
if (m_transition->IsDone())
if (m_transition->IsDone(m_timeKeeper->GetFrameTime()))
{
m_activePreset = std::move(m_transitioningPreset);
m_transitioningPreset.reset();
@ -170,7 +170,7 @@ void ProjectM::RenderFrame(uint32_t targetFramebufferObject /*= 0*/)
if (m_transition != nullptr && m_transitioningPreset != nullptr)
{
m_transition->Draw(*m_activePreset, *m_transitioningPreset, renderContext, audioData);
m_transition->Draw(*m_activePreset, *m_transitioningPreset, renderContext, audioData, m_timeKeeper->GetFrameTime());
}
else
{
@ -254,7 +254,7 @@ void ProjectM::StartPresetTransition(std::unique_ptr<Preset>&& preset, bool hard
{
m_transitioningPreset = std::move(preset);
m_timeKeeper->StartSmoothing();
m_transition = std::make_unique<Renderer::PresetTransition>(m_transitionShaderManager->RandomTransition(), m_softCutDuration);
m_transition = std::make_unique<Renderer::PresetTransition>(m_transitionShaderManager->RandomTransition(), m_softCutDuration, m_timeKeeper->GetFrameTime());
}
}