mirror of
https://github.com/brunoherbelin/vimix.git
synced 2025-12-11 18:34:58 +01:00
catchup previous commits
This commit is contained in:
@@ -91,21 +91,18 @@ void Node::copyTransform(const Node *other)
|
|||||||
|
|
||||||
void Node::update( float dt)
|
void Node::update( float dt)
|
||||||
{
|
{
|
||||||
std::list<UpdateCallback *>::iterator iter;
|
for (auto iter=update_callbacks_.begin(); iter != update_callbacks_.end(); )
|
||||||
for (iter=update_callbacks_.begin(); iter != update_callbacks_.end(); )
|
|
||||||
{
|
{
|
||||||
UpdateCallback *callback = *iter;
|
UpdateCallback *callback = *iter;
|
||||||
|
|
||||||
if (callback->enabled())
|
callback->update(this, dt);
|
||||||
callback->update(this, dt);
|
|
||||||
|
|
||||||
if (callback->finished()) {
|
if (callback->finished()) {
|
||||||
iter = update_callbacks_.erase(iter);
|
iter = update_callbacks_.erase(iter);
|
||||||
delete callback;
|
delete callback;
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
++iter;
|
++iter;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// update transform matrix from attributes
|
// update transform matrix from attributes
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ void Session::update(float dt)
|
|||||||
// render the source
|
// render the source
|
||||||
(*it)->render();
|
(*it)->render();
|
||||||
// update the source
|
// update the source
|
||||||
(*it)->setActive( (*it)->mix_distance() < activation_threshold_);
|
(*it)->setActive(activation_threshold_);
|
||||||
(*it)->update(dt);
|
(*it)->update(dt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user