From cb3cca8a64668e87896b0eb329ce1d14f4bcfd20 Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Mon, 20 Dec 2021 00:28:12 +0100 Subject: [PATCH] catchup previous commits --- Scene.cpp | 9 +++------ Session.cpp | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Scene.cpp b/Scene.cpp index 7b3414c..7fdd419 100644 --- a/Scene.cpp +++ b/Scene.cpp @@ -91,21 +91,18 @@ void Node::copyTransform(const Node *other) void Node::update( float dt) { - std::list::iterator iter; - for (iter=update_callbacks_.begin(); iter != update_callbacks_.end(); ) + for (auto iter=update_callbacks_.begin(); iter != update_callbacks_.end(); ) { UpdateCallback *callback = *iter; - if (callback->enabled()) - callback->update(this, dt); + callback->update(this, dt); if (callback->finished()) { iter = update_callbacks_.erase(iter); delete callback; } - else { + else ++iter; - } } // update transform matrix from attributes diff --git a/Session.cpp b/Session.cpp index 40b501a..4bbd30d 100644 --- a/Session.cpp +++ b/Session.cpp @@ -132,7 +132,7 @@ void Session::update(float dt) // render the source (*it)->render(); // update the source - (*it)->setActive( (*it)->mix_distance() < activation_threshold_); + (*it)->setActive(activation_threshold_); (*it)->update(dt); } }