{
for ( RenderTaskContainer::iterator iter = mTasks.begin(); mTasks.end() != iter; ++iter )
{
- if ( iter->Get() == &task )
+ RenderTask *ptr = iter->Get();
+
+ if ( ptr == &task )
{
const SceneGraph::RenderTask& sceneObject = task.GetRenderTaskSceneObject();
// send a message to remove the scene-graph RenderTask
RemoveTaskMessage( mEventThreadServices, *mSceneObject, sceneObject );
- for ( Vector< Exclusive >::Iterator exclusiveIt = mExclusives.Begin(); exclusiveIt != mExclusives.End(); ++exclusiveIt )
+ for ( auto exclusiveIt = mExclusives.begin(); exclusiveIt != mExclusives.end(); ++exclusiveIt )
{
- if ( exclusiveIt->renderTaskPtr == iter->Get() )
+ if ( exclusiveIt->renderTaskPtr == ptr )
{
- mExclusives.Erase( exclusiveIt );
+ mExclusives.erase( exclusiveIt );
break;
}
}
void RenderTaskList::SetExclusive( RenderTask* task, bool exclusive )
{
// Check to see if this rendertask has an entry?
- for ( Vector< Exclusive >::Iterator exclusiveIt = mExclusives.Begin(); exclusiveIt != mExclusives.End(); ++exclusiveIt )
+ for ( auto exclusiveIt = mExclusives.begin(); exclusiveIt != mExclusives.end(); ++exclusiveIt )
{
if ( exclusiveIt->renderTaskPtr == task )
{
if ( !exclusive )
{
- mExclusives.Erase( exclusiveIt );
+ mExclusives.erase( exclusiveIt );
break;
}
else
{
- exclusiveIt->actorPtr = task->GetSourceActor();
+ exclusiveIt->actor.SetActor( task->GetSourceActor() );
exclusive = false;
break;
}
{
Exclusive exclusiveSlot;
exclusiveSlot.renderTaskPtr = task;
- exclusiveSlot.actorPtr = task->GetSourceActor();
- mExclusives.PushBack( exclusiveSlot );
+ exclusiveSlot.actor.SetActor( task->GetSourceActor() );
+ mExclusives.emplace_back( std::move( exclusiveSlot ) );
}
}