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

53
src/Nazara/Renderer/RenderTarget.cpp
View File

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

4
src/Nazara/Renderer/RenderTexture.cpp
View File

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

6
src/Nazara/Renderer/RenderWindow.cpp
View File

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