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

Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

This commit is contained in:
Jérôme Leclercq 2017-09-01 14:26:30 +02:00
parent 38bd348ed6 a1ddce8dfb
commit 7074876d68
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SDK/include/NDK/World.inl
View File

@ -314,7 +314,8 @@ namespace Ndk
m_systems = std::move(world.m_systems); m_systems = std::move(world.m_systems);
for (const auto& systemPtr : m_systems) for (const auto& systemPtr : m_systems)
systemPtr->SetWorld(this); if (systemPtr)
systemPtr->SetWorld(this);
return *this; return *this;
} }

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

@ -396,6 +396,9 @@ namespace Nz
m_lines.back().bounds.ExtendTo(m_glyphs.back().bounds); m_lines.back().bounds.ExtendTo(m_glyphs.back().bounds);
m_bounds.Set(Rectf(std::floor(m_workingBounds.x), std::floor(m_workingBounds.y), std::ceil(m_workingBounds.width), std::ceil(m_workingBounds.height))); m_bounds.Set(Rectf(std::floor(m_workingBounds.x), std::floor(m_workingBounds.y), std::ceil(m_workingBounds.width), std::ceil(m_workingBounds.height)));
m_colorUpdated = true;
m_glyphUpdated = true;
} }
void SimpleTextDrawer::OnFontAtlasLayerChanged(const Font* font, AbstractImage* oldLayer, AbstractImage* newLayer) void SimpleTextDrawer::OnFontAtlasLayerChanged(const Font* font, AbstractImage* oldLayer, AbstractImage* newLayer)