sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Signal: Update comments 

Former-commit-id: 3e802e6ae0b05c67cb7562567f733fd762e97eed
This commit is contained in:
Lynix 2015-06-08 01:00:25 +02:00
parent 5ce3c5a0cb
commit e97cc666a1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/Nazara/Core/Signal.inl
View File

@ -22,6 +22,7 @@ template<typename... Args>
void NzSignal<Args...>::Clear() void NzSignal<Args...>::Clear()
{ {
m_slots.clear(); m_slots.clear();
m_slotIterator = 0;
} }
template<typename... Args> template<typename... Args>
@ -35,6 +36,8 @@ typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(Callback&& fun
{ {
NazaraAssert(func, "Invalid function"); NazaraAssert(func, "Invalid function");
// Since we're incrementing the slot vector size, we need to replace our iterator at the end
// (Except when we are iterating on the signal)
bool resetIt = (m_slotIterator >= m_slots.size()); bool resetIt = (m_slotIterator >= m_slots.size());
auto tempPtr = std::make_shared<Slot>(this); auto tempPtr = std::make_shared<Slot>(this);
@ -42,8 +45,9 @@ typename NzSignal<Args...>::Connection NzSignal<Args...>::Connect(Callback&& fun
tempPtr->index = m_slots.size(); tempPtr->index = m_slots.size();
m_slots.emplace_back(std::move(tempPtr)); m_slots.emplace_back(std::move(tempPtr));
if (resetIt) if (resetIt)
m_slotIterator = m_slots.size(); m_slotIterator = m_slots.size(); //< Replace the iterator to the end
return Connection(m_slots.back()); return Connection(m_slots.back());
} }
@ -123,7 +127,7 @@ void NzSignal<Args...>::Disconnect(const SlotPtr& slot)
// Yes we can // Yes we can
SlotPtr& newSlot = m_slots[slot->index]; SlotPtr& newSlot = m_slots[slot->index];
newSlot = std::move(m_slots.back()); newSlot = std::move(m_slots.back());
newSlot->index = slot->index; //< Update the moved slot index before resizing (imagine this is the last one) newSlot->index = slot->index; //< Update the moved slot index before resizing (in case it's the last one)
} }
else else
{ {
@ -140,7 +144,7 @@ void NzSignal<Args...>::Disconnect(const SlotPtr& slot)
--m_slotIterator; --m_slotIterator;
} }
// Pop the last entry (where we moved our slot) // Pop the last entry (from where we moved our slot)
m_slots.pop_back(); m_slots.pop_back();
} }