feat(renderer): add ActiveVoxelPalette resource to rendererPlugin

GameDevTecnico · Oct 15, 2023 · d0f93ff · d0f93ff
1 parent b04cfd5
commit d0f93ff
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/engine/include/cubos/engine/assets/assets.hpp b/engine/include/cubos/engine/assets/assets.hpp
@@ -183,7 +183,10 @@ namespace cubos::engine
         /// @param handle Handle to update.
         /// @return Whether the version was updated.
         template <typename T>
-        bool update(Asset<T>& handle) const;
+        bool update(Asset<T>& handle) const
+        {
+            return update(static_cast<AnyAsset&>(handle));
+        }
 
         /// @brief Unloads the given asset. Can be used to force assets to be reloaded.
         /// @param handle Handle to unload.

diff --git a/engine/include/cubos/engine/renderer/plugin.hpp b/engine/include/cubos/engine/renderer/plugin.hpp
@@ -93,6 +93,10 @@ namespace cubos::engine
     {
         /// @brief Asset handle to the currently active palette.
         Asset<VoxelPalette> asset;
+
+        /// @brief Previous asset handle save in order to check if asset changed later.
+        /// TODO: ECS should have a .changed function to make this process easier (#273).
+        Asset<VoxelPalette> prev;
     };
 
     /// @brief Plugin entry function.

diff --git a/engine/src/cubos/engine/assets/assets.cpp b/engine/src/cubos/engine/assets/assets.cpp
@@ -285,12 +285,6 @@ bool Assets::update(AnyAsset& handle) const
     return false;
 }
 
-template <typename T>
-bool Assets::update(Asset<T>& handle) const
-{
-    return update(static_cast<AnyAsset&>(handle));
-}
-
 void Assets::invalidate(const AnyAsset& handle)
 {
     this->invalidate(handle, true);

diff --git a/engine/src/cubos/engine/renderer/plugin.cpp b/engine/src/cubos/engine/renderer/plugin.cpp
@@ -102,12 +102,18 @@ static void frameEnvironment(Write<RendererFrame> frame, Read<RendererEnvironmen
 }
 
 static void checkPaletteUpdateSystem(Write<Assets> assets, Write<Renderer> renderer,
-                                     Read<ActiveVoxelPalette> activePalette)
+                                     Write<ActiveVoxelPalette> activePalette)
 {
-    if (assets->update(activePalette->asset))
+    if (activePalette->asset.isNull())
+    {
+        return;
+    }
+
+    if (assets->update(activePalette->asset) || activePalette->prev.toAny() != activePalette->asset.toAny())
     {
         auto palette = assets->read(activePalette->asset).get();
         (*renderer)->setPalette(palette);
+        activePalette->prev = activePalette->asset;
     }
 }