diff --git a/hydra b/hydra index 516e143..7e38a43 160000 --- a/hydra +++ b/hydra @@ -1 +1 @@ -Subproject commit 516e143901d68f59bbe57f0a1c322c89c341a401 +Subproject commit 7e38a43301c37fe7112d352b2335fe52cab7f3b8 diff --git a/kraken/KRContext.h b/kraken/KRContext.h index 9aa0e2f..4eb191c 100755 --- a/kraken/KRContext.h +++ b/kraken/KRContext.h @@ -49,6 +49,7 @@ #include "KRDeviceManager.h" #include "KRDevice.h" #include "KRSurface.h" +#include "arena.h" class KRAudioManager; class KRPresentationThread; @@ -225,4 +226,6 @@ private: unordered_map m_surfaceHandleMap; virtual bool getShaderValue(const KRCamera* camera, ShaderValue value, float* output) const; + + mimir::Arena m_frameAllocators[KRENGINE_MAX_FRAMES_IN_FLIGHT]; }; diff --git a/kraken/KREngine-common.h b/kraken/KREngine-common.h index 7566ce3..abd40cc 100755 --- a/kraken/KREngine-common.h +++ b/kraken/KREngine-common.h @@ -32,7 +32,7 @@ #pragma once #define KRENGINE_MAX_GPU_COUNT 4 -#define KRENGINE_MAX_FRAMES_IN_FLIGHT 2 +#define KRENGINE_MAX_FRAMES_IN_FLIGHT 3 #define KRENGINE_DEBUG_GPU_LABELS 1 #define KRENGINE_DEBUG_GPU_LABEL_MAX_LEN 128 diff --git a/kraken/nodes/KRCamera.cpp b/kraken/nodes/KRCamera.cpp index c8f3315..ada2820 100755 --- a/kraken/nodes/KRCamera.cpp +++ b/kraken/nodes/KRCamera.cpp @@ -486,7 +486,7 @@ void KRCamera::renderPost(RenderInfo& ri) void KRCamera::renderDebug(RenderInfo& ri) { - settings.m_debug_text = std::format("Frame Number {}", getContext().getCurrentFrame()); // FNIDME!! KIPG!! HACK!! Debug text debugging... + // settings.m_debug_text = std::format("Frame Number {}", getContext().getCurrentFrame()); // FINDME!! KIPG!! HACK!! Debug text debugging... const char* szText = settings.m_debug_text.c_str(); if (*szText == '\0') { diff --git a/kraken/resources/material/KRMaterial.h b/kraken/resources/material/KRMaterial.h index ac96025..848c985 100755 --- a/kraken/resources/material/KRMaterial.h +++ b/kraken/resources/material/KRMaterial.h @@ -45,6 +45,8 @@ #include "nodes/KRBone.h" #include "KRShaderReflection.h" +#include + enum class CullMode : __uint32_t; enum class ModelFormat : __uint8_t; enum class Topology : __uint8_t; @@ -178,7 +180,7 @@ public: TextureMap m_thicknessMap{ KRTexture::TEXTURE_USAGE_MATERIAL_THICKNESS }; float m_thicknessFactor{ 0.f }; - float m_attenuationDistance{ std::numeric_limits::max() }; + float m_attenuationDistance{ std::numeric_limits::max()}; hydra::Vector3 m_attenuationColor{ 1.f, 1.f, 1.f }; TextureMap m_transmissionMap{ KRTexture::TEXTURE_USAGE_MATERIAL_TRANSMISSION }; diff --git a/mimir b/mimir index da5f3ec..7dd0eb9 160000 --- a/mimir +++ b/mimir @@ -1 +1 @@ -Subproject commit da5f3ec981f78815e0540a47872d7d06ee52c595 +Subproject commit 7dd0eb961a830230e8a3c57427a9107f5a6f6be5