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

Core: Added Listenable class (Made class Listener system generic)

Browse Source 
Former-commit-id: 3baed32d6720c6455f50af51f262292ece9943fa
This commit is contained in:
Lynix
2015-05-06 18:17:18 +02:00
parent 3195a50114
commit 44ff678002
11 changed files with 121 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/Nazara/Utility/AbstractAtlas.cpp
View File

@@ -5,63 +5,11 @@
#include <Nazara/Utility/AbstractAtlas.hpp>
#include <Nazara/Utility/Debug.hpp>
NzAbstractAtlas::NzAbstractAtlas() :
m_listenersLocked(false)
{
}
NzAbstractAtlas::~NzAbstractAtlas()
{
m_listenersLocked = true;
for (auto& pair : m_listeners)
pair.first->OnAtlasReleased(this, pair.second);
NotifyRelease(Listener::OnAtlasReleased);
}
void NzAbstractAtlas::AddListener(Listener* listener, void* userdata) const
{
if (!m_listenersLocked)
m_listeners.insert(std::make_pair(listener, userdata));
}
void NzAbstractAtlas::RemoveListener(Listener* listener) const
{
if (!m_listenersLocked)
m_listeners.erase(listener);
}
void NzAbstractAtlas::NotifyCleared()
{
m_listenersLocked = true;
auto it = m_listeners.begin();
while (it != m_listeners.end())
{
if (!it->first->OnAtlasCleared(this, it->second))
m_listeners.erase(it++);
else
++it;
}
m_listenersLocked = false;
}
void NzAbstractAtlas::NotifyLayerChange(NzAbstractImage* oldLayer, NzAbstractImage* newLayer)
{
m_listenersLocked = true;
auto it = m_listeners.begin();
while (it != m_listeners.end())
{
if (!it->first->OnAtlasLayerChange(this, oldLayer, newLayer, it->second))
m_listeners.erase(it++);
else
++it;
}
m_listenersLocked = false;
}
NzAbstractAtlas::Listener::~Listener() = default;
bool NzAbstractAtlas::Listener::OnAtlasCleared(const NzAbstractAtlas* atlas, void* userdata)

4
src/Nazara/Utility/GuillotineImageAtlas.cpp
View File

@@ -22,7 +22,7 @@ NzGuillotineImageAtlas::~NzGuillotineImageAtlas() = default;
void NzGuillotineImageAtlas::Clear()
{
m_layers.clear();
NotifyCleared();
Notify(Listener::OnAtlasCleared);
}
void NzGuillotineImageAtlas::Free(NzSparsePtr<const NzRectui> rects, NzSparsePtr<unsigned int> layers, unsigned int count)
@@ -187,7 +187,7 @@ bool NzGuillotineImageAtlas::ResizeLayer(Layer& layer, const NzVector2ui& size)
// On indique à ceux que ça intéresse qu'on a changé de pointeur
// (chose très importante pour ceux qui le stockent)
NotifyLayerChange(layer.image.get(), newImage.get());
Notify(Listener::OnAtlasLayerChange, layer.image.get(), newImage.get());
// Et on ne met à jour le pointeur qu'après (car cette ligne libère également l'ancienne image)
layer.image = std::move(newImage);

52
src/Nazara/Utility/Node.cpp
View File

@@ -50,15 +50,7 @@ NzNode::~NzNode()
SetParent(nullptr);
m_listenersLocked = true;
for (auto& pair : m_listeners)
pair.first->OnNodeReleased(this, pair.second);
}
void NzNode::AddListener(Listener* listener, void* userdata) const
{
if (!m_listenersLocked)
m_listeners.insert(std::make_pair(listener, userdata));
NotifyRelease(Listener::OnNodeReleased);
}
void NzNode::EnsureDerivedUpdate() const
@@ -293,12 +285,6 @@ NzNode& NzNode::Move(float moveX, float moveY, float moveZ, nzCoordSys coordSys)
return Move(NzVector3f(moveX, moveY, moveZ), coordSys);
}
void NzNode::RemoveListener(Listener* listener) const
{
if (!m_listenersLocked)
m_listeners.erase(listener);
}
NzNode& NzNode::Rotate(const NzQuaternionf& rotation, nzCoordSys coordSys)
{
// Évitons toute mauvaise surprise ..
@@ -662,12 +648,12 @@ void NzNode::InvalidateNode()
for (NzNode* node : m_childs)
node->InvalidateNode();
NotifyInvalidation();
Notify(Listener::OnNodeInvalidated);
}
void NzNode::OnParenting(const NzNode* parent)
{
NotifyParented(parent);
Notify(Listener::OnNodeParented, parent);
}
void NzNode::RemoveChild(NzNode* node) const
@@ -722,38 +708,6 @@ void NzNode::UpdateTransformMatrix() const
m_transformMatrixUpdated = true;
}
void NzNode::NotifyInvalidation()
{
m_listenersLocked = true;
auto it = m_listeners.begin();
while (it != m_listeners.end())
{
if (!it->first->OnNodeInvalidated(this, it->second))
m_listeners.erase(it++);
else
++it;
}
m_listenersLocked = false;
}
void NzNode::NotifyParented(const NzNode* parent)
{
m_listenersLocked = true;
auto it = m_listeners.begin();
while (it != m_listeners.end())
{
if (!it->first->OnNodeParented(this, parent, it->second))
m_listeners.erase(it++);
else
++it;
}
m_listenersLocked = false;
}
NzNode::Listener::~Listener() = default;
bool NzNode::Listener::OnNodeInvalidated(const NzNode* node, void* userdata)