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

Core/Signals: Remove Connect/Disconnect macros 

And make interface easier to use


Former-commit-id: 5b789c9acb694839cb173ae96392650d80d383b7
This commit is contained in:
Lynix 2015-06-07 17:28:19 +02:00
parent 004b53c590
commit 4e5cdea454
10 changed files with 77 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SDK/include/NDK/Components/CameraComponent.inl
View File

@ -140,9 +140,9 @@ namespace Ndk
{ {
m_target = renderTarget; m_target = renderTarget;
if (m_target) if (m_target)
m_targetReleaseSlot = NazaraConnectThis(*m_target, OnRenderTargetRelease, OnRenderTargetRelease); m_targetReleaseSlot.Connect(m_target->OnRenderTargetRelease, this, OnRenderTargetRelease);
else else
NazaraDisconnect(m_targetReleaseSlot); m_targetReleaseSlot.Disconnect();
} }
inline void CameraComponent::SetTargetRegion(const NzRectf& region) inline void CameraComponent::SetTargetRegion(const NzRectf& region)

9
SDK/src/NDK/Components/CameraComponent.cpp
View File

@ -47,7 +47,7 @@ namespace Ndk
void CameraComponent::OnAttached() void CameraComponent::OnAttached()
{ {
if (m_entity->HasComponent<NodeComponent>()) if (m_entity->HasComponent<NodeComponent>())
m_nodeInvalidationSlot = NazaraConnectThis(m_entity->GetComponent<NodeComponent>(), OnNodeInvalidation, OnNodeInvalidated); m_nodeInvalidationSlot.Connect(m_entity->GetComponent<NodeComponent>().OnNodeInvalidation, this, OnNodeInvalidated);
InvalidateViewMatrix(); InvalidateViewMatrix();
} }
@ -57,7 +57,7 @@ namespace Ndk
if (IsComponent<NodeComponent>(component)) if (IsComponent<NodeComponent>(component))
{ {
NodeComponent& nodeComponent = static_cast<NodeComponent&>(component); NodeComponent& nodeComponent = static_cast<NodeComponent&>(component);
m_nodeInvalidationSlot = NazaraConnectThis(nodeComponent, OnNodeInvalidation, OnNodeInvalidated); m_nodeInvalidationSlot.Connect(nodeComponent.OnNodeInvalidation, this, OnNodeInvalidated);
InvalidateViewMatrix(); InvalidateViewMatrix();
} }
@ -67,8 +67,7 @@ namespace Ndk
{ {
if (IsComponent<NodeComponent>(component)) if (IsComponent<NodeComponent>(component))
{ {
NodeComponent& nodeComponent = static_cast<NodeComponent&>(component); m_nodeInvalidationSlot.Disconnect();
NazaraDisconnect(m_nodeInvalidationSlot);
InvalidateViewMatrix(); InvalidateViewMatrix();
} }
@ -76,7 +75,7 @@ namespace Ndk
void CameraComponent::OnDetached() void CameraComponent::OnDetached()
{ {
NazaraDisconnect(m_nodeInvalidationSlot); m_nodeInvalidationSlot.Disconnect();
InvalidateViewMatrix(); InvalidateViewMatrix();
} }

12
include/Nazara/Core/Signal.hpp
View File

@ -17,10 +17,6 @@
#define NazaraSlotType(Class, SignalName) Class::SignalName ## Type::ConnectionGuard #define NazaraSlotType(Class, SignalName) Class::SignalName ## Type::ConnectionGuard
#define NazaraSlot(Class, SignalName, SlotName) NazaraSlotType(Class, SignalName) SlotName #define NazaraSlot(Class, SignalName, SlotName) NazaraSlotType(Class, SignalName) SlotName
#define NazaraConnect(Instance, SignalName, Callback) (Instance).SignalName.Connect(Callback)
#define NazaraConnectThis(Instance, SignalName, Callback) (Instance).SignalName.Connect(this, Callback)
#define NazaraDisconnect(SlotName) SlotName.GetConnection().Disconnect()
template<typename... Args> template<typename... Args>
class NzSignal class NzSignal
@ -82,6 +78,8 @@ class NzSignal<Args...>::Connection
Connection(Connection&& connection) = default; Connection(Connection&& connection) = default;
~Connection() = default; ~Connection() = default;
template<typename... ConnectArgs>
void Connect(BaseClass& signal, ConnectArgs&&... args);
void Disconnect(); void Disconnect();
bool IsConnected() const; bool IsConnected() const;
@ -109,8 +107,14 @@ class NzSignal<Args...>::ConnectionGuard
ConnectionGuard(ConnectionGuard&& connection) = default; ConnectionGuard(ConnectionGuard&& connection) = default;
~ConnectionGuard(); ~ConnectionGuard();
template<typename... ConnectArgs>
void Connect(BaseClass& signal, ConnectArgs&&... args);
void Disconnect();
Connection& GetConnection(); Connection& GetConnection();
bool IsConnected() const;
ConnectionGuard& operator=(const Connection& connection); ConnectionGuard& operator=(const Connection& connection);
ConnectionGuard& operator=(const ConnectionGuard& connection) = delete; ConnectionGuard& operator=(const ConnectionGuard& connection) = delete;
ConnectionGuard& operator=(Connection&& connection); ConnectionGuard& operator=(Connection&& connection);

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

@ -100,6 +100,13 @@ m_ptr(slot)
{ {
} }
template<typename... Args>
template<typename... ConnectArgs>
void NzSignal<Args...>::Connection::Connect(BaseClass& signal, ConnectArgs&&... args)
{
operator=(signal.Connect(std::forward<ConnectArgs>(args)...));
}
template<typename... Args> template<typename... Args>
void NzSignal<Args...>::Connection::Disconnect() void NzSignal<Args...>::Connection::Disconnect()
{ {
@ -132,12 +139,32 @@ NzSignal<Args...>::ConnectionGuard::~ConnectionGuard()
m_connection.Disconnect(); m_connection.Disconnect();
} }
template<typename... Args>
template<typename... ConnectArgs>
void NzSignal<Args...>::ConnectionGuard::Connect(BaseClass& signal, ConnectArgs&&... args)
{
m_connection.Disconnect();
m_connection.Connect(signal, std::forward<ConnectArgs>(args)...);
}
template<typename... Args>
void NzSignal<Args...>::ConnectionGuard::Disconnect()
{
m_connection.Disconnect();
}
template<typename... Args> template<typename... Args>
typename NzSignal<Args...>::Connection& NzSignal<Args...>::ConnectionGuard::GetConnection() typename NzSignal<Args...>::Connection& NzSignal<Args...>::ConnectionGuard::GetConnection()
{ {
return m_connection; return m_connection;
} }
template<typename... Args>
bool NzSignal<Args...>::ConnectionGuard::IsConnected() const
{
return m_connection.IsConnected();
}
template<typename... Args> template<typename... Args>
typename NzSignal<Args...>::ConnectionGuard& NzSignal<Args...>::ConnectionGuard::operator=(const Connection& connection) typename NzSignal<Args...>::ConnectionGuard& NzSignal<Args...>::ConnectionGuard::operator=(const Connection& connection)
{ {

8
src/Nazara/Graphics/Camera.cpp
View File

@ -163,13 +163,13 @@ void NzCamera::SetTarget(const NzRenderTarget* renderTarget)
if (m_target) if (m_target)
{ {
m_targetReleaseSlot = NazaraConnectThis(*m_target, OnRenderTargetRelease, OnRenderTargetRelease); m_targetReleaseSlot.Connect(m_target->OnRenderTargetRelease, this, OnRenderTargetRelease);
m_targetResizeSlot = NazaraConnectThis(*m_target, OnRenderTargetSizeChange, OnRenderTargetSizeChange); m_targetResizeSlot.Connect(m_target->OnRenderTargetSizeChange, this, OnRenderTargetSizeChange);
} }
else else
{ {
NazaraDisconnect(m_targetReleaseSlot); m_targetReleaseSlot.Disconnect();
NazaraDisconnect(m_targetResizeSlot); m_targetResizeSlot.Disconnect();
} }
m_frustumUpdated = false; m_frustumUpdated = false;

18
src/Nazara/Graphics/TextSprite.cpp
View File

@ -36,9 +36,9 @@ m_verticesUpdated(sprite.m_verticesUpdated)
const NzAbstractAtlas* atlas = it->first; const NzAbstractAtlas* atlas = it->first;
AtlasSlots& slots = m_atlases[atlas]; AtlasSlots& slots = m_atlases[atlas];
slots.clearSlot = NazaraConnectThis(*atlas, OnAtlasCleared, OnAtlasInvalidated); slots.clearSlot.Connect(atlas->OnAtlasCleared, this, OnAtlasInvalidated);
slots.layerChangeSlot = NazaraConnectThis(*atlas, OnAtlasLayerChange, OnAtlasLayerChange); slots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, OnAtlasLayerChange);
slots.releaseSlot = NazaraConnectThis(*atlas, OnAtlasRelease, OnAtlasInvalidated); slots.releaseSlot.Connect(atlas->OnAtlasRelease, this, OnAtlasInvalidated);
} }
} }
@ -153,9 +153,9 @@ void NzTextSprite::Update(const NzAbstractTextDrawer& drawer)
{ {
AtlasSlots& slots = m_atlases[atlas]; AtlasSlots& slots = m_atlases[atlas];
slots.clearSlot = NazaraConnectThis(*atlas, OnAtlasCleared, OnAtlasInvalidated); slots.clearSlot.Connect(atlas->OnAtlasCleared, this, OnAtlasInvalidated);
slots.layerChangeSlot = NazaraConnectThis(*atlas, OnAtlasLayerChange, OnAtlasLayerChange); slots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, OnAtlasLayerChange);
slots.releaseSlot = NazaraConnectThis(*atlas, OnAtlasRelease, OnAtlasInvalidated); slots.releaseSlot.Connect(atlas->OnAtlasRelease, this, OnAtlasInvalidated);
} }
} }
@ -277,9 +277,9 @@ NzTextSprite& NzTextSprite::operator=(const NzTextSprite& text)
const NzAbstractAtlas* atlas = it->first; const NzAbstractAtlas* atlas = it->first;
AtlasSlots& slots = m_atlases[atlas]; AtlasSlots& slots = m_atlases[atlas];
slots.clearSlot = NazaraConnectThis(*atlas, OnAtlasCleared, OnAtlasInvalidated); slots.clearSlot.Connect(atlas->OnAtlasCleared, this, OnAtlasInvalidated);
slots.layerChangeSlot = NazaraConnectThis(*atlas, OnAtlasLayerChange, OnAtlasLayerChange); slots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, OnAtlasLayerChange);
slots.releaseSlot = NazaraConnectThis(*atlas, OnAtlasRelease, OnAtlasInvalidated); slots.releaseSlot.Connect(atlas->OnAtlasRelease, this, OnAtlasInvalidated);
} }
// On ne copie pas les sommets finaux car il est très probable que nos paramètres soient modifiés et qu'ils doivent être régénérés de toute façon // On ne copie pas les sommets finaux car il est très probable que nos paramètres soient modifiés et qu'ils doivent être régénérés de toute façon

8
src/Nazara/Graphics/View.cpp
View File

@ -218,13 +218,13 @@ void NzView::SetTarget(const NzRenderTarget* renderTarget)
m_target = renderTarget; m_target = renderTarget;
if (m_target) if (m_target)
{ {
m_targetReleaseSlot = NazaraConnectThis(*m_target, OnRenderTargetRelease, OnRenderTargetRelease); m_targetReleaseSlot.Connect(m_target->OnRenderTargetRelease, this, OnRenderTargetRelease);
m_targetResizeSlot = NazaraConnectThis(*m_target, OnRenderTargetSizeChange, OnRenderTargetSizeChange); m_targetResizeSlot.Connect(m_target->OnRenderTargetSizeChange, this, OnRenderTargetSizeChange);
} }
else else
{ {
NazaraDisconnect(m_targetReleaseSlot); m_targetReleaseSlot.Disconnect();
NazaraDisconnect(m_targetResizeSlot); m_targetResizeSlot.Disconnect();
} }
} }

10
src/Nazara/Renderer/Renderer.cpp
View File

@ -1621,7 +1621,7 @@ bool NzRenderer::EnsureStateUpdate()
if (it == s_vaos.end()) if (it == s_vaos.end())
{ {
Context_Entry entry; Context_Entry entry;
entry.onReleaseSlot = context->OnContextRelease.Connect(OnContextRelease); entry.onReleaseSlot.Connect(context->OnContextRelease, OnContextRelease);
it = s_vaos.insert(std::make_pair(context, std::move(entry))).first; it = s_vaos.insert(std::make_pair(context, std::move(entry))).first;
} }
@ -1647,13 +1647,13 @@ bool NzRenderer::EnsureStateUpdate()
// Connect the slots // Connect the slots
if (s_indexBuffer) if (s_indexBuffer)
entry.onIndexBufferReleaseSlot = s_indexBuffer->OnIndexBufferRelease.Connect(OnIndexBufferRelease); entry.onIndexBufferReleaseSlot.Connect(s_indexBuffer->OnIndexBufferRelease, OnIndexBufferRelease);
if (instancingDeclaration) if (instancingDeclaration)
entry.onInstancingDeclarationReleaseSlot = instancingDeclaration->OnVertexDeclarationRelease.Connect(OnVertexDeclarationRelease); entry.onInstancingDeclarationReleaseSlot.Connect(instancingDeclaration->OnVertexDeclarationRelease, OnVertexDeclarationRelease);
entry.onVertexBufferReleaseSlot = s_vertexBuffer->OnVertexBufferRelease.Connect(OnVertexBufferRelease); entry.onVertexBufferReleaseSlot.Connect(s_vertexBuffer->OnVertexBufferRelease, OnVertexBufferRelease);
entry.onVertexDeclarationReleaseSlot = vertexDeclaration->OnVertexDeclarationRelease.Connect(OnVertexDeclarationRelease); entry.onVertexDeclarationReleaseSlot.Connect(vertexDeclaration->OnVertexDeclarationRelease, OnVertexDeclarationRelease);
vaoIt = vaoMap.insert(std::make_pair(key, std::move(entry))).first; vaoIt = vaoMap.insert(std::make_pair(key, std::move(entry))).first;

12
src/Nazara/Utility/Font.cpp
View File

@ -298,15 +298,15 @@ void NzFont::SetAtlas(const std::shared_ptr<NzAbstractAtlas>& atlas)
m_atlas = atlas; m_atlas = atlas;
if (m_atlas) if (m_atlas)
{ {
m_atlasClearedSlot = NazaraConnectThis(*m_atlas, OnAtlasCleared, OnAtlasCleared); m_atlasClearedSlot.Connect(m_atlas->OnAtlasCleared, this, OnAtlasCleared);
m_atlasLayerChangeSlot = NazaraConnectThis(*m_atlas, OnAtlasLayerChange, OnAtlasLayerChange); m_atlasLayerChangeSlot.Connect(m_atlas->OnAtlasLayerChange, this, OnAtlasLayerChange);
m_atlasReleaseSlot = NazaraConnectThis(*m_atlas, OnAtlasRelease, OnAtlasRelease); m_atlasReleaseSlot.Connect(m_atlas->OnAtlasRelease, this, OnAtlasRelease);
} }
else else
{ {
NazaraDisconnect(m_atlasClearedSlot); m_atlasClearedSlot.Disconnect();
NazaraDisconnect(m_atlasLayerChangeSlot); m_atlasLayerChangeSlot.Disconnect();
NazaraDisconnect(m_atlasReleaseSlot); m_atlasReleaseSlot.Disconnect();
} }
OnFontAtlasChanged(this); OnFontAtlasChanged(this);

16
src/Nazara/Utility/SimpleTextDrawer.cpp
View File

@ -112,17 +112,17 @@ void NzSimpleTextDrawer::SetFont(NzFont* font)
m_font = font; m_font = font;
if (m_font) if (m_font)
{ {
m_atlasChangedSlot = NazaraConnectThis(*m_font, OnFontAtlasChanged, OnFontInvalidated); m_atlasChangedSlot.Connect(m_font->OnFontAtlasChanged, this, OnFontInvalidated);
m_atlasLayerChangedSlot = NazaraConnectThis(*m_font, OnFontAtlasLayerChanged, OnFontInvalidated); m_atlasLayerChangedSlot.Connect(m_font->OnFontAtlasLayerChanged, this, OnFontInvalidated);
m_fontReleaseSlot = NazaraConnectThis(*m_font, OnFontRelease, OnFontRelease); m_fontReleaseSlot.Connect(m_font->OnFontRelease, this, OnFontRelease);
m_glyphCacheClearedSlot = NazaraConnectThis(*m_font, OnFontGlyphCacheCleared, OnFontInvalidated); m_glyphCacheClearedSlot.Connect(m_font->OnFontAtlasChanged, this, OnFontInvalidated);
} }
else else
{ {
NazaraDisconnect(m_atlasChangedSlot); m_atlasChangedSlot.Disconnect();
NazaraDisconnect(m_atlasLayerChangedSlot); m_atlasLayerChangedSlot.Disconnect();
NazaraDisconnect(m_fontReleaseSlot); m_fontReleaseSlot.Disconnect();
NazaraDisconnect(m_glyphCacheClearedSlot); m_glyphCacheClearedSlot.Disconnect();
} }
m_glyphUpdated = false; m_glyphUpdated = false;