mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-11 18:34:58 +01:00
Output session fading fixed for OSC and animation.
Linear interpolation (instead of dichotomy converge) for fading at Session update. Mixing View update reads value of session fading to animate the cursor (which was preventing other manipulation of fading). Cleanup fading in OSC controller, with animation options and fade-in and fade-out controls.
This commit is contained in:
@@ -134,7 +134,7 @@ void TransitionView::update(float dt)
|
||||
transition_source_->group(View::MIXING)->translation_.y = 0.f;
|
||||
|
||||
// no fading when cross fading
|
||||
Mixer::manager().session()->setFading( 0.f );
|
||||
Mixer::manager().session()->setFadingTarget( 0.f );
|
||||
}
|
||||
// fade to black
|
||||
else
|
||||
@@ -151,7 +151,7 @@ void TransitionView::update(float dt)
|
||||
f = ( 2.f * d + 1.f); // quadratic
|
||||
f *= f;
|
||||
}
|
||||
Mixer::manager().session()->setFading( 1.f - f );
|
||||
Mixer::manager().session()->setFadingTarget( 1.f - f );
|
||||
}
|
||||
|
||||
// request update
|
||||
|
||||
Reference in New Issue
Block a user