From 3f200edeb6218fb62b42a75505da4d7925f8fd1f Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sun, 29 Jan 2023 11:38:08 +0100 Subject: [PATCH] Graphics: Set default render mask for LightComponent and GraphicsComponent --- examples/Showcase/main.cpp | 18 +++++++++--------- examples/Tut01/main.cpp | 14 ++++++-------- examples/Tut02/main.cpp | 2 +- .../Graphics/Components/GraphicsComponent.hpp | 2 +- .../Graphics/Components/LightComponent.hpp | 2 +- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/examples/Showcase/main.cpp b/examples/Showcase/main.cpp index 8c2180cb6..0ae3fcebd 100644 --- a/examples/Showcase/main.cpp +++ b/examples/Showcase/main.cpp @@ -155,7 +155,7 @@ int main() //bobNode.SetScale(1.f / 40.f * 0.5f); auto& bobGfx = registry.emplace(bobEntity); - bobGfx.AttachRenderable(bobModel, 0xFFFFFFFF); + bobGfx.AttachRenderable(bobModel); } }*/ @@ -168,7 +168,7 @@ int main() auto& cameraLight = lightEntity1.emplace(); - auto& spotLight = cameraLight.AddLight(0xFFFFFFFF); + auto& spotLight = cameraLight.AddLight(); spotLight.UpdateColor(Nz::Color::Red()); spotLight.UpdateInnerAngle(Nz::DegreeAnglef(15.f)); spotLight.UpdateOuterAngle(Nz::DegreeAnglef(20.f)); @@ -183,7 +183,7 @@ int main() auto& cameraLight = lightEntity2.emplace(); - auto& spotLight = cameraLight.AddLight(0xFFFFFFFF); + auto& spotLight = cameraLight.AddLight(); spotLight.UpdateColor(Nz::Color::Green()); spotLight.EnableShadowCasting(true); spotLight.UpdateShadowMapSize(1024); @@ -198,7 +198,7 @@ int main() //bobNode.SetPosition(Nz::Vector3f(0.f, -1.f, 0.f)); auto& bobGfx = bobEntity.emplace(); - bobGfx.AttachRenderable(bobModel, 0xFFFFFFFF); + bobGfx.AttachRenderable(bobModel); auto& sharedSkeleton = bobEntity.emplace(skeleton); @@ -232,7 +232,7 @@ int main() sphereBody.SetGeom(std::make_shared(0.1f)); auto& sphereGfx = sphereEntity.emplace(); - sphereGfx.AttachRenderable(sphereModel, 0xFFFFFFFF); + sphereGfx.AttachRenderable(sphereModel); } entt::handle smallBobEntity = world.CreateEntity(); @@ -240,7 +240,7 @@ int main() smallBobNode.SetParentJoint(bobEntity, "LeftHand"); auto& smallBobGfx = smallBobEntity.emplace(); - smallBobGfx.AttachRenderable(bobModel, 0xFFFFFFFF); + smallBobGfx.AttachRenderable(bobModel); smallBobEntity.emplace(skeleton); @@ -253,7 +253,7 @@ int main() auto& cameraLight = lightEntity3.emplace(); - auto& pointLight = cameraLight.AddLight(0xFFFFFFFF); + auto& pointLight = cameraLight.AddLight(); pointLight.UpdateColor(Nz::Color::Blue()); pointLight.UpdateRadius(3.f); pointLight.EnableShadowCasting(true); @@ -329,7 +329,7 @@ int main() planeModel->SetMaterial(0, planeMat); auto& planeGfx = planeEntity.emplace(); - planeGfx.AttachRenderable(planeModel, 0xFFFFFFFF); + planeGfx.AttachRenderable(planeModel); planeEntity.emplace(); @@ -348,7 +348,7 @@ int main() entt::handle boxEntity = world.CreateEntity(); boxEntity.emplace().SetPosition(Nz::Vector3f(0.f, 0.25f, -0.5f)); - boxEntity.emplace().AttachRenderable(boxModel, 0xFFFFFFFF); + boxEntity.emplace().AttachRenderable(boxModel); } Nz::MillisecondClock fpsClock, updateClock; diff --git a/examples/Tut01/main.cpp b/examples/Tut01/main.cpp index 9bce72436..2feae9d29 100644 --- a/examples/Tut01/main.cpp +++ b/examples/Tut01/main.cpp @@ -17,16 +17,14 @@ int main() auto& ecs = app.AddComponent(); auto& world = ecs.AddWorld(); - Nz::RenderSystem& renderSystem = world.AddSystem(); - auto& windowSwapchain = renderSystem.CreateSwapchain(mainWindow); + auto& renderSystem = world.AddSystem(); + Nz::WindowSwapchain& windowSwapchain = renderSystem.CreateSwapchain(mainWindow); entt::handle cameraEntity = world.CreateEntity(); - { - cameraEntity.emplace(); + cameraEntity.emplace(); - auto& cameraComponent = cameraEntity.emplace(&windowSwapchain, Nz::ProjectionType::Orthographic); - cameraComponent.UpdateClearColor(Nz::Color(0.46f, 0.48f, 0.84f, 1.f)); - } + auto& cameraComponent = cameraEntity.emplace(&windowSwapchain, Nz::ProjectionType::Orthographic); + cameraComponent.UpdateClearColor(Nz::Color(0.f, 0.f, 0.f, 1.f)); Nz::SimpleTextDrawer textDrawer; textDrawer.SetCharacterSize(72); @@ -40,7 +38,7 @@ int main() { auto& nodeComponent = textEntity.emplace(); auto& gfxComponent = textEntity.emplace(); - gfxComponent.AttachRenderable(textSprite, 0xFFFFFFFF); + gfxComponent.AttachRenderable(textSprite); Nz::Boxf textBox = textSprite->GetAABB(); Nz::Vector2ui windowSize = mainWindow.GetSize(); diff --git a/examples/Tut02/main.cpp b/examples/Tut02/main.cpp index ed5864b5e..f29a00821 100644 --- a/examples/Tut02/main.cpp +++ b/examples/Tut02/main.cpp @@ -40,7 +40,7 @@ int main() { auto& nodeComponent = textEntity.emplace(); auto& gfxComponent = textEntity.emplace(); - gfxComponent.AttachRenderable(textSprite, 0xFFFFFFFF); + gfxComponent.AttachRenderable(textSprite); Nz::Boxf textBox = textSprite->GetAABB(); Nz::Vector2ui windowSize = mainWindow.GetSize(); diff --git a/include/Nazara/Graphics/Components/GraphicsComponent.hpp b/include/Nazara/Graphics/Components/GraphicsComponent.hpp index 864fccc30..9f700aad4 100644 --- a/include/Nazara/Graphics/Components/GraphicsComponent.hpp +++ b/include/Nazara/Graphics/Components/GraphicsComponent.hpp @@ -28,7 +28,7 @@ namespace Nz GraphicsComponent(GraphicsComponent&&) = default; ~GraphicsComponent() = default; - inline void AttachRenderable(std::shared_ptr renderable, UInt32 renderMask); + inline void AttachRenderable(std::shared_ptr renderable, UInt32 renderMask = 0xFFFFFFFF); inline void Clear(); diff --git a/include/Nazara/Graphics/Components/LightComponent.hpp b/include/Nazara/Graphics/Components/LightComponent.hpp index ef53676d1..d1a33d09f 100644 --- a/include/Nazara/Graphics/Components/LightComponent.hpp +++ b/include/Nazara/Graphics/Components/LightComponent.hpp @@ -28,7 +28,7 @@ namespace Nz LightComponent(LightComponent&&) = default; ~LightComponent() = default; - template T& AddLight(UInt32 renderMask, Args&&... args); + template T& AddLight(UInt32 renderMask = 0xFFFFFFFF, Args&&... args); inline void Clear();