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

Replace Listenable system by signals

Browse Source 
Former-commit-id: 16fb0b3e703ca4b41ceb97fab938cebb05f677d4
This commit is contained in:
Lynix
2015-06-07 15:16:11 +02:00
parent 3e8d2e1e47
commit fe25249136
24 changed files with 182 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,9 @@ namespace Ndk
void CameraComponent::OnAttached()
{
if (m_entity->HasComponent<NodeComponent>())
m_nodeInvalidationSlot = NazaraConnect(m_entity->GetComponent<NodeComponent>(), OnNodeInvalidation, OnNodeInvalidated);
InvalidateViewMatrix();
}
@@ -54,7 +57,7 @@ namespace Ndk
if (IsComponent<NodeComponent>(component))
{
NodeComponent& nodeComponent = static_cast<NodeComponent&>(component);
nodeComponent.AddListener(this);
m_nodeInvalidationSlot = NazaraConnect(nodeComponent, OnNodeInvalidation, OnNodeInvalidated);
InvalidateViewMatrix();
}
@@ -65,7 +68,7 @@ namespace Ndk
if (IsComponent<NodeComponent>(component))
{
NodeComponent& nodeComponent = static_cast<NodeComponent&>(component);
nodeComponent.RemoveListener(this);
NazaraDisconnect(m_nodeInvalidationSlot);
InvalidateViewMatrix();
}
@@ -73,44 +76,33 @@ namespace Ndk
void CameraComponent::OnDetached()
{
NazaraDisconnect(m_nodeInvalidationSlot);
InvalidateViewMatrix();
}
bool CameraComponent::OnNodeInvalidated(const NzNode* node, void* userdata)
void CameraComponent::OnNodeInvalidated(const NzNode* node)
{
NazaraUnused(node);
NazaraUnused(userdata);
// Our view matrix depends on NodeComponent position/rotation
InvalidateViewMatrix();
return true;
}
void CameraComponent::OnRenderTargetReleased(const NzRenderTarget* renderTarget, void* userdata)
void CameraComponent::OnRenderTargetRelease(const NzRenderTarget* renderTarget)
{
NazaraUnused(userdata);
if (renderTarget == m_target)
m_target = nullptr;
else
NazaraInternalError("Not listening to " + NzString::Pointer(renderTarget));
}
bool CameraComponent::OnRenderTargetSizeChange(const NzRenderTarget* renderTarget, void* userdata)
void CameraComponent::OnRenderTargetSizeChange(const NzRenderTarget* renderTarget)
{
NazaraUnused(userdata);
if (renderTarget == m_target)
{
InvalidateViewport();
return true;
}
else
{
NazaraInternalError("Not listening to " + NzString::Pointer(renderTarget));
return false;
}
}
void CameraComponent::UpdateFrustum() const