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

Core/Signals: Remove Connect/Disconnect macros

Browse Source 
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
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;
if (m_target)
m_targetReleaseSlot = NazaraConnectThis(*m_target, OnRenderTargetRelease, OnRenderTargetRelease);
m_targetReleaseSlot.Connect(m_target->OnRenderTargetRelease, this, OnRenderTargetRelease);
else
NazaraDisconnect(m_targetReleaseSlot);
m_targetReleaseSlot.Disconnect();
}
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()
{
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();
}
@@ -57,7 +57,7 @@ namespace Ndk
if (IsComponent<NodeComponent>(component))
{
NodeComponent& nodeComponent = static_cast<NodeComponent&>(component);
m_nodeInvalidationSlot = NazaraConnectThis(nodeComponent, OnNodeInvalidation, OnNodeInvalidated);
m_nodeInvalidationSlot.Connect(nodeComponent.OnNodeInvalidation, this, OnNodeInvalidated);
InvalidateViewMatrix();
}
@@ -67,8 +67,7 @@ namespace Ndk
{
if (IsComponent<NodeComponent>(component))
{
NodeComponent& nodeComponent = static_cast<NodeComponent&>(component);
NazaraDisconnect(m_nodeInvalidationSlot);
m_nodeInvalidationSlot.Disconnect();
InvalidateViewMatrix();
}
@@ -76,7 +75,7 @@ namespace Ndk
void CameraComponent::OnDetached()
{
NazaraDisconnect(m_nodeInvalidationSlot);
m_nodeInvalidationSlot.Disconnect();
InvalidateViewMatrix();
}