From 5795e8939bcd5e849c5e63e2c443bada03c93a20 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 3 Apr 2026 14:17:38 +0100 Subject: Create mix-ins for handling asset and instance lights --- game/mixins/lights.cpp | 30 ++++++++++++++++++++++++++++++ game/mixins/lights.h | 26 ++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 game/mixins/lights.cpp create mode 100644 game/mixins/lights.h (limited to 'game/mixins') diff --git a/game/mixins/lights.cpp b/game/mixins/lights.cpp new file mode 100644 index 0000000..6829bbb --- /dev/null +++ b/game/mixins/lights.cpp @@ -0,0 +1,30 @@ +#include "lights.h" +#include "gfx/renderable.h" + +bool +AssetLights::persist(Persistence::PersistenceStore & store) +{ + return STORE_HELPER(pointLight, Persistence::Appender) + && STORE_HELPER(spotLight, Persistence::Appender); +} + +void +InstanceLights::lightsEnable(AnyPtr asset, uint32_t owner) +{ + auto createLights = [owner](const auto & assetLights, auto & lightInstances, auto commonLights) { + std::ranges::transform(assetLights | std::views::enumerate, std::inserter(lightInstances, lightInstances.end()), + [&commonLights, owner](const auto & idxAndLight) { + const auto & [idx, light] = idxAndLight; + return std::make_pair(idx, commonLights->acquire(*light, owner)); + }); + }; + createLights(asset->spotLight, spotLightInstances, Renderable::commonSpotLights.lock()); + createLights(asset->pointLight, pointLightInstances, Renderable::commonPointLights.lock()); +} + +void +InstanceLights::lightsDisable() +{ + spotLightInstances.clear(); + pointLightInstances.clear(); +} diff --git a/game/mixins/lights.h b/game/mixins/lights.h new file mode 100644 index 0000000..c2207a5 --- /dev/null +++ b/game/mixins/lights.h @@ -0,0 +1,26 @@ +#pragma once + +#include "assetFactory/lights.h" +#include "gfx/gl/instanceVertices.h" +#include + +class AssetLights { +protected: + bool persist(Persistence::PersistenceStore & store); + template using LightVec = std::vector; + + LightVec spotLight; + LightVec pointLight; + + friend class InstanceLights; +}; + +class InstanceLights { +protected: + template using LightInstanceMap = std::flat_map::InstanceProxy>; + LightInstanceMap spotLightInstances; + LightInstanceMap pointLightInstances; + + void lightsEnable(AnyPtr, uint32_t); + void lightsDisable(); +}; -- cgit v1.3