eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Intregration of session fading with transition and session source

Browse Source 
management.
This commit is contained in:
brunoherbelin
2020-07-29 19:02:43 +02:00
parent 837eb2d569
commit 4f17620cae
6 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
View.cpp
View File

@@ -305,15 +305,23 @@ void MixingView::selectAll()
}
}
void MixingView::setFading(float f)
void MixingView::update(float dt)
{
// reverse calculate angle from fading
float angle = SIGN(slider_root_->rotation_.z) * asin(f) * 2.f;
// move slider
slider_root_->rotation_.z = angle;
// visual feedback on mixing circle
f = 1.f - f;
mixingCircle_->shader()->color = glm::vec4(f, f, f, 1.f);
View::update(dt);
// a more complete update is requested
if (View::need_deep_update_) {
// reverse calculate angle from fading
float f = Mixer::manager().session()->fading();
float angle = SIGN(slider_root_->rotation_.z) * asin(f) * 2.f;
// move slider
slider_root_->rotation_.z = angle;
// visual feedback on mixing circle
f = 1.f - f;
mixingCircle_->shader()->color = glm::vec4(f, f, f, 1.f);
}
}
View::Cursor MixingView::grab (Source *s, glm::vec2 from, glm::vec2 to, std::pair<Node *, glm::vec2> pick)