From b94bc43c457394888e2d321042f859680627f5a9 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 13 Sep 2016 19:51:46 +0200 Subject: [PATCH 1/3] Graphics/Sprite: Fix warning in Sprite.inl Former-commit-id: d98effab8708be30ad3005c3bca55d41dfad7374 [formerly 0b5277e1c02f1e72176b75050c3b079773dc236a] [formerly ea744cb5ec679e07b5f1899eb43c774d9f243512 [formerly d00d22f33e729a7da00a8419649aa8df99bf31ef]] Former-commit-id: fb3627a89717615b3e865f08a076cbeffba45cf6 [formerly d1f9986651979a37c581d94854843600780b7484] Former-commit-id: 1fc32e9067bb08f741ebf20ace85b43060353aa1 --- include/Nazara/Graphics/Sprite.inl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Nazara/Graphics/Sprite.inl b/include/Nazara/Graphics/Sprite.inl index bc27bf67c..35885a94a 100644 --- a/include/Nazara/Graphics/Sprite.inl +++ b/include/Nazara/Graphics/Sprite.inl @@ -89,7 +89,7 @@ namespace Nz */ inline const Color& Sprite::GetCornerColor(RectCorner corner) const { - NazaraAssert(corner < m_cornerColor.size(), "Invalid corner"); + NazaraAssert(static_cast(corner) < m_cornerColor.size(), "Invalid corner"); return m_cornerColor[corner]; } @@ -164,7 +164,7 @@ namespace Nz */ inline void Sprite::SetCornerColor(RectCorner corner, const Color& color) { - NazaraAssert(corner < m_cornerColor.size(), "Invalid corner"); + NazaraAssert(static_cast(corner) < m_cornerColor.size(), "Invalid corner"); m_cornerColor[corner] = color; From 220a7263b14b6c59123ea02d129df322b30eca2c Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 13 Sep 2016 19:55:39 +0200 Subject: [PATCH 2/3] Sdk/ButtonWidget: Fix compilation Former-commit-id: b45ba6c55c8942083b3bee3b742c300a1890eb0e [formerly f223376c239bab00acc4c560077c0bf691f8988d] [formerly e39b7c76edf6008b7a67c096714d1824705416c5 [formerly 9139170e026fc9c493f971ac55ac268249e32c77]] Former-commit-id: cf7e25cde5cc09839e0cd7364a0fff5fe77ed39b [formerly 7fd5a315ec88b6c0512505874970ee45f06c5f86] Former-commit-id: 3d85e1aad535da46085731400bfc153868972aea --- SDK/src/NDK/Widgets/ButtonWidget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/SDK/src/NDK/Widgets/ButtonWidget.cpp b/SDK/src/NDK/Widgets/ButtonWidget.cpp index 5afcb8ad8..0a941d070 100644 --- a/SDK/src/NDK/Widgets/ButtonWidget.cpp +++ b/SDK/src/NDK/Widgets/ButtonWidget.cpp @@ -21,7 +21,6 @@ namespace Ndk m_gradientEntity = CreateEntity(); m_gradientEntity->AddComponent().SetParent(this); m_gradientEntity->AddComponent().Attach(m_gradientSprite); - m_gradientEntity->GetComponent().Attach(m_borderSprite, Nz::Matrix4f::Translate(Nz::Vector2f(-1.f, -1.f)), -1); m_textSprite = Nz::TextSprite::New(); From 320ce3e1d5596abb5abe47ce7ecd7f623bc9f504 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 13 Sep 2016 20:25:50 +0200 Subject: [PATCH 3/3] Build: Exclude widgets from server Former-commit-id: 6413518ac424e52e8e38ebfeac097968bbb153b6 [formerly dab972657333b67cbc27b0c03c928289617db977] [formerly d90816f1d8a4643f089f1a14d3afb189a4f7d5ab [formerly 521bcf5d4fba8ff2866fb52b0cafaa38fd79c036]] Former-commit-id: 81a120be306c06ce0ae1e1e0506939f2a099e772 [formerly 7b61d9cdf0547c9a813059710e70aad0e4de41ba] Former-commit-id: 57ebe4da311643188488a370ec5d30f248854a04 --- build/scripts/tools/ndk_server.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/build/scripts/tools/ndk_server.lua b/build/scripts/tools/ndk_server.lua index cebd158c6..f8550878f 100644 --- a/build/scripts/tools/ndk_server.lua +++ b/build/scripts/tools/ndk_server.lua @@ -33,6 +33,7 @@ TOOL.FilesExcluded = { "../SDK/**/Particle*Component.*", "../SDK/**/ParticleSystem.*", "../SDK/**/RenderSystem.*", + "../SDK/**/*Widget*.*", "../SDK/**/LuaBinding_Audio.*", "../SDK/**/LuaBinding_Graphics.*", "../SDK/**/LuaBinding_Renderer.*"