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

Graphics: Qt-friendly change 

Former-commit-id: b4b278897d681ea5361ce9f751a0ecba7acd34ee
This commit is contained in:
Lynix 2015-12-07 22:45:07 +01:00
parent 6284503da6
commit 93fae53ea5
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/Nazara/Graphics/TextSprite.inl
View File

@ -26,11 +26,11 @@ namespace Nz
for (auto it = sprite.m_atlases.begin(); it != sprite.m_atlases.end(); ++it) for (auto it = sprite.m_atlases.begin(); it != sprite.m_atlases.end(); ++it)
{ {
const AbstractAtlas* atlas = it->first; const AbstractAtlas* atlas = it->first;
AtlasSlots& slots = m_atlases[atlas]; AtlasSlots& atlasSlots = m_atlases[atlas];
slots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated); atlasSlots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated);
slots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange); atlasSlots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange);
slots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated); atlasSlots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated);
} }
} }
@ -111,11 +111,11 @@ namespace Nz
for (auto it = text.m_atlases.begin(); it != text.m_atlases.end(); ++it) for (auto it = text.m_atlases.begin(); it != text.m_atlases.end(); ++it)
{ {
const AbstractAtlas* atlas = it->first; const AbstractAtlas* atlas = it->first;
AtlasSlots& slots = m_atlases[atlas]; AtlasSlots& atlasSlots = m_atlases[atlas];
slots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated); atlasSlots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated);
slots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange); atlasSlots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange);
slots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated); atlasSlots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated);
} }
InvalidateBoundingVolume(); InvalidateBoundingVolume();

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

@ -49,11 +49,11 @@ namespace Nz
if (m_atlases.find(atlas) == m_atlases.end()) if (m_atlases.find(atlas) == m_atlases.end())
{ {
AtlasSlots& slots = m_atlases[atlas]; AtlasSlots& atlasSlots = m_atlases[atlas];
slots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated); atlasSlots.clearSlot.Connect(atlas->OnAtlasCleared, this, &TextSprite::OnAtlasInvalidated);
slots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange); atlasSlots.layerChangeSlot.Connect(atlas->OnAtlasLayerChange, this, &TextSprite::OnAtlasLayerChange);
slots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated); atlasSlots.releaseSlot.Connect(atlas->OnAtlasRelease, this, &TextSprite::OnAtlasInvalidated);
} }
} }