Merge branch 'NDK' of https://github.com/DigitalPulseSoftware/NazaraEngine into NDK

Former-commit-id: 425b5941925c15c999e2e0d09e685ce603b29e11

src/Nazara/Graphics/SceneNode.cpp

@@ -190,6 +190,8 @@ void NzSceneNode::InvalidateNode()
 
 void NzSceneNode::OnParenting(const NzNode* parent)
 {
+	NzNode::OnParenting(parent);
+
 	if (parent)
 	{
 		///FIXME: Remonter jusqu'au premier parent de type SceneNode plutôt que de s'arrêter au premier venu

src/Nazara/Renderer/RenderTarget.cpp

@@ -6,22 +6,9 @@
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Renderer/Debug.hpp>
 
-NzRenderTarget::NzRenderTarget() :
-m_listenersLocked(false)
-{
-}
-
 NzRenderTarget::~NzRenderTarget()
 {
-	m_listenersLocked = true;
-	for (auto& pair : m_listeners)
-		pair.first->OnRenderTargetReleased(this, pair.second);
-}
-
-void NzRenderTarget::AddListener(Listener* listener, void* userdata) const
-{
-	if (!m_listenersLocked)
-		m_listeners.insert(std::make_pair(listener, userdata));
+	NotifyRelease(Listener::OnRenderTargetReleased);
 }
 
 bool NzRenderTarget::IsActive() const
@@ -29,12 +16,6 @@ bool NzRenderTarget::IsActive() const
 	return NzRenderer::GetTarget() == this;
 }
 
-void NzRenderTarget::RemoveListener(Listener* listener) const
-{
-	if (!m_listenersLocked)
-		m_listeners.erase(listener);
-}
-
 bool NzRenderTarget::SetActive(bool active)
 {
 	if (active)
@@ -50,38 +31,6 @@ void NzRenderTarget::Desactivate() const
 	// Seuls les target sans contextes (ex: NzRenderTexture) nécessitent une désactivation
 }
 
-void NzRenderTarget::NotifyParametersChange()
-{
-	m_listenersLocked = true;
-
-	auto it = m_listeners.begin();
-	while (it != m_listeners.end())
-	{
-		if (!it->first->OnRenderTargetParametersChange(this, it->second))
-			m_listeners.erase(it++);
-		else
-			++it;
-	}
-
-	m_listenersLocked = false;
-}
-
-void NzRenderTarget::NotifySizeChange()
-{
-	m_listenersLocked = true;
-
-	auto it = m_listeners.begin();
-	while (it != m_listeners.end())
-	{
-		if (!it->first->OnRenderTargetSizeChange(this, it->second))
-			m_listeners.erase(it++);
-		else
-			++it;
-	}
-
-	m_listenersLocked = false;
-}
-
 NzRenderTarget::Listener::~Listener() = default;
 
 bool NzRenderTarget::Listener::OnRenderTargetParametersChange(const NzRenderTarget* renderTarget, void* userdata)

src/Nazara/Renderer/RenderTexture.cpp

@@ -376,8 +376,8 @@ bool NzRenderTexture::Create(bool lock)
 		onExit.Reset();
 	}
 
-	NotifyParametersChange();
-	NotifySizeChange();
+	Notify(Listener::OnRenderTargetParametersChange);
+	Notify(Listener::OnRenderTargetSizeChange);
 
 	return true;
 }

src/Nazara/Renderer/RenderWindow.cpp

@@ -278,8 +278,8 @@ bool NzRenderWindow::OnWindowCreated()
 	NzOpenGL::SetScissorBox(NzRecti(0, 0, size.x, size.y));
 	NzOpenGL::SetViewport(NzRecti(0, 0, size.x, size.y));
 
-	NotifyParametersChange();
-	NotifySizeChange();
+	Notify(Listener::OnRenderTargetParametersChange);
+	Notify(Listener::OnRenderTargetSizeChange);
 
 	m_clock.Restart();
 
@@ -300,5 +300,5 @@ void NzRenderWindow::OnWindowDestroy()
 
 void NzRenderWindow::OnWindowResized()
 {
-	NotifySizeChange();
+	Notify(Listener::OnRenderTargetSizeChange);
 }

src/Nazara/Utility/AbstractAtlas.cpp

@@ -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)

src/Nazara/Utility/GuillotineImageAtlas.cpp

@@ -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);

src/Nazara/Utility/Node.cpp

@@ -49,6 +49,8 @@ NzNode::~NzNode()
 	}
 
 	SetParent(nullptr);
+
+	NotifyRelease(Listener::OnNodeReleased);
 }
 
 void NzNode::EnsureDerivedUpdate() const
@@ -652,11 +654,13 @@ void NzNode::InvalidateNode()
 
 	for (NzNode* node : m_childs)
 		node->InvalidateNode();
+
+	Notify(Listener::OnNodeInvalidated);
 }
 
 void NzNode::OnParenting(const NzNode* parent)
 {
-	NazaraUnused(parent);
+	Notify(Listener::OnNodeParented, parent);
 }
 
 void NzNode::RemoveChild(NzNode* node) const
@@ -710,3 +714,28 @@ void NzNode::UpdateTransformMatrix() const
 	m_transformMatrix.MakeTransform(m_derivedPosition, m_derivedRotation, m_derivedScale);
 	m_transformMatrixUpdated = true;
 }
+
+NzNode::Listener::~Listener() = default;
+
+bool NzNode::Listener::OnNodeInvalidated(const NzNode* node, void* userdata)
+{
+	NazaraUnused(node);
+	NazaraUnused(userdata);
+
+	return true;
+}
+
+bool NzNode::Listener::OnNodeParented(const NzNode* node, const NzNode* parent, void* userdata)
+{
+	NazaraUnused(node);
+	NazaraUnused(parent);
+	NazaraUnused(userdata);
+
+	return true;
+}
+
+void NzNode::Listener::OnNodeReleased(const NzNode* node, void* userdata)
+{
+	NazaraUnused(node);
+	NazaraUnused(userdata);
+}