From c6767a0fbd49a078241c9fc985da286b4613f7db 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: a3410af1934a462a4fe197700379ed64bbd6c76b [formerly 318faba08dbf1a4216a1fa5626be22c3b4973e92] [formerly 3f938befd96d748b6261b20301b8cb4afde287a5 [formerly 2dcf1a7bd016c4c81d9ecf08056ea202ac0c47ef]] Former-commit-id: 742fa64e7f5954bca97ac7dd7ae11697fe47eea9 [formerly bd0de568838add11360d8dbd27af5c7ae0ddb1bb] Former-commit-id: 35ca6c90855d4b3956e0cea3f7c265a286b121b5 --- 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 7346c2926aed48bd78affb522e0e491b87a980d6 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: a0a2e6a82405e07a8b6a4368117819c9e62a0085 [formerly 421f7bfb54896e1a0422faef047faaab39847fdf] [formerly 13b796a812ff951ebe87c060466926bc76208bbf [formerly 6199fe41191725ddb9a96873079a5dd8f4f33217]] Former-commit-id: d6fd2d5405c228052e30e6dfa7cc41f17c1d669b [formerly 6a6596e7af6e1ca4ab85f85545b8b42a243baf7d] Former-commit-id: 988451787c7c374d258f1bd91eb840a16a57fe8c --- 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 487c9da2356081cc52ea37c593e93645e1fbda3b 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: bd50a23eba3b5c305ecc98a1f1df010281e4e7a5 [formerly d3650d65ed6e57e7cfc6291639289c765ba9382a] [formerly 7e41ad12a23a6729e7626216567a5696115424f2 [formerly 6c80a2e25fd9f8336e441e09276983964a2b971d]] Former-commit-id: 96e347d714a329b8cf46ae566bac33572498a3f0 [formerly 11c3246462c05eaab2b74374142b4d33b567ca16] Former-commit-id: be2165ad8478c1a8136c95da9b96ce255ea66e70 --- 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.*"