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

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

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