From 653c9e00289244118de4fcf4a668a84556c5e5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Wed, 1 Dec 2021 18:58:25 +0100 Subject: [PATCH] Graphics/GraphicsComponent: Make renderMask a mandatory parameter --- examples/PhysicsDemo/main.cpp | 10 ++++------ .../Nazara/Graphics/Components/GraphicsComponent.hpp | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/examples/PhysicsDemo/main.cpp b/examples/PhysicsDemo/main.cpp index 5c6db93c9..36f8bafe8 100644 --- a/examples/PhysicsDemo/main.cpp +++ b/examples/PhysicsDemo/main.cpp @@ -202,7 +202,7 @@ int main() entt::entity textEntity = registry.create(); { auto& entityGfx = registry.emplace(textEntity); - entityGfx.AttachRenderable(sprite); + entityGfx.AttachRenderable(sprite, 1); auto& entityNode = registry.emplace(textEntity); entityNode.SetPosition(0.f, 5.f, 0.f); @@ -297,7 +297,7 @@ int main() { auto view = registry.view(); for (auto [entity, gfxComponent] : view.each()) - gfxComponent.AttachRenderable(colliderModel); + gfxComponent.AttachRenderable(colliderModel, 1); } else { @@ -310,9 +310,9 @@ int main() { entt::entity entity = registry.create(); auto& entityGfx = registry.emplace(entity); - entityGfx.AttachRenderable(model); + entityGfx.AttachRenderable(model, 1); if (showColliders) - entityGfx.AttachRenderable(colliderModel); + entityGfx.AttachRenderable(colliderModel, 1); registry.emplace(entity); @@ -416,7 +416,5 @@ int main() } } - registry.clear(); - return EXIT_SUCCESS; } diff --git a/include/Nazara/Graphics/Components/GraphicsComponent.hpp b/include/Nazara/Graphics/Components/GraphicsComponent.hpp index 2001b85f7..c474fcfd0 100644 --- a/include/Nazara/Graphics/Components/GraphicsComponent.hpp +++ b/include/Nazara/Graphics/Components/GraphicsComponent.hpp @@ -26,7 +26,7 @@ namespace Nz GraphicsComponent(GraphicsComponent&&) = default; ~GraphicsComponent() = default; - inline void AttachRenderable(std::shared_ptr renderable, UInt32 renderMask = 0xFFFFFFFF); + inline void AttachRenderable(std::shared_ptr renderable, UInt32 renderMask); inline void Clear();