diff --git a/Source/Game/Game.lua b/Source/Game/Game.lua index c0a308bb..7559d5e3 100644 --- a/Source/Game/Game.lua +++ b/Source/Game/Game.lua @@ -1,4 +1,4 @@ -local mod = Solution.Util.CreateModuleTable("Game", { "base", "fileformat", "input", "network", "gameplay", "renderer", "luau-compiler", "luau-vm", "jolt", "enkits", "refl-cpp", "utfcpp", "base64", "fidelityfx" }) +local mod = Solution.Util.CreateModuleTable("Game", { "base", "fileformat", "input", "network", "gameplay", "renderer", "luau-compiler", "luau-vm", "jolt", "enkits", "refl-cpp", "utfcpp", "base64" }) Solution.Util.CreateStaticLib(mod.Name, Solution.Projects.Current.BinDir, mod.Dependencies, function() local defines = { "_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS", "_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS", "WIN32_LEAN_AND_MEAN", "NOMINMAX" } diff --git a/Source/Game/Game/Rendering/Effect/EffectRenderer.cpp b/Source/Game/Game/Rendering/Effect/EffectRenderer.cpp index 1dce75bb..5ec4ab33 100644 --- a/Source/Game/Game/Rendering/Effect/EffectRenderer.cpp +++ b/Source/Game/Game/Rendering/Effect/EffectRenderer.cpp @@ -12,7 +12,6 @@ #include #include -#include AutoCVar_ShowFlag CVAR_EnablePostProcessing(CVarCategory::Client | CVarCategory::Rendering, "enablePostProcessing", "Enable post processing effects", ShowFlag::ENABLED, CVarFlags::None); @@ -48,7 +47,7 @@ EffectRenderer::~EffectRenderer() void EffectRenderer::Update(f32 deltaTime) { - vec2 renderSize = _renderer->GetRenderSize(); + /*vec2 renderSize = _renderer->GetRenderSize(); if (_lastRenderSize != renderSize) { _lastRenderSize = renderSize; @@ -96,12 +95,12 @@ void EffectRenderer::Update(f32 deltaTime) _cacaoSettings->temporalSupersamplingRadiusOffset = CVAR_SsaoTemporalSupersamplingRadiusOffset.GetFloat(); _cacaoSettings->detailShadowStrength = CVAR_SsaoDetailShadowStrength.GetFloat(); _cacaoSettings->bilateralSigmaSquared = CVAR_SsaoBilateralSigmaSquared.GetFloat(); - _cacaoSettings->bilateralSimilarityDistanceSigma = CVAR_SsaoBilateralSimilarityDistanceSigma.GetFloat(); + _cacaoSettings->bilateralSimilarityDistanceSigma = CVAR_SsaoBilateralSimilarityDistanceSigma.GetFloat();*/ } void EffectRenderer::AddSSAOPass(Renderer::RenderGraph* renderGraph, RenderResources& resources, u8 frameIndex) { - if (CVAR_EnablePostProcessing.Get() == ShowFlag::DISABLED) + /*if (CVAR_EnablePostProcessing.Get() == ShowFlag::DISABLED) return; bool enableSSAO = CVAR_EnableSSAO.Get() == ShowFlag::ENABLED && _cacaoContext != nullptr; @@ -149,13 +148,13 @@ void EffectRenderer::AddSSAOPass(Renderer::RenderGraph* renderGraph, RenderResou const f32 normalUnpackAdd = -1.0f; commandList.DispatchCacao(_cacaoContext, data.depth, data.packedNormals, data.output, &_proj, &_normalsWorldToView, normalUnpackMul, normalUnpackAdd); }); - } + }*/ } void EffectRenderer::CreatePermanentResources() { - _cacaoSettings = new FfxCacaoSettings(); + /*_cacaoSettings = new FfxCacaoSettings(); memcpy(_cacaoSettings, &FFX_CACAO_DEFAULT_SETTINGS, sizeof(FfxCacaoSettings)); - _cacaoSettings->generateNormals = false; + _cacaoSettings->generateNormals = false;*/ } \ No newline at end of file diff --git a/Source/Game/Game/Rendering/Effect/EffectRenderer.h b/Source/Game/Game/Rendering/Effect/EffectRenderer.h index c1bb99bc..09bd7da1 100644 --- a/Source/Game/Game/Rendering/Effect/EffectRenderer.h +++ b/Source/Game/Game/Rendering/Effect/EffectRenderer.h @@ -13,8 +13,8 @@ namespace Renderer } struct RenderResources; -struct FfxCacaoContext; -struct FfxCacaoSettings; +//struct FfxCacaoContext; +//struct FfxCacaoSettings; class EffectRenderer { @@ -32,8 +32,8 @@ class EffectRenderer private: Renderer::Renderer* _renderer; - FfxCacaoContext* _cacaoContext = nullptr; - FfxCacaoSettings* _cacaoSettings = nullptr; + //FfxCacaoContext* _cacaoContext = nullptr; + //FfxCacaoSettings* _cacaoSettings = nullptr; mat4x4 _proj; mat4x4 _normalsWorldToView; diff --git a/Submodules/Engine b/Submodules/Engine index c8ac3a84..fe1e27f7 160000 --- a/Submodules/Engine +++ b/Submodules/Engine @@ -1 +1 @@ -Subproject commit c8ac3a84b26b360398b41ae885030948a58ef730 +Subproject commit fe1e27f75cbc868f64ba8ff9e3b50fd23a86e6fe