diff --git a/GlitchyEditor/src/EditWindows/AssetViewer.bf b/GlitchyEditor/src/EditWindows/AssetViewer.bf index 9f6f6a3..a1e7c98 100644 --- a/GlitchyEditor/src/EditWindows/AssetViewer.bf +++ b/GlitchyEditor/src/EditWindows/AssetViewer.bf @@ -175,8 +175,8 @@ class TexturererViewerer public this() { - _effect = Content.LoadAsset("Resources/Shaders/textureViewerShader.hlsl"); - _renderTargetEffect = Content.LoadAsset("Resources/Shaders/RenderTargetGroupViewer.hlsl"); + _effect = Content.LoadAsset("Resources/Shaders/textureViewerShader.hlsl", null, true); + _renderTargetEffect = Content.LoadAsset("Resources/Shaders/RenderTargetGroupViewer.hlsl", null, true); } float2 _position; diff --git a/GlitchyEngine/src/Renderer/Renderer.bf b/GlitchyEngine/src/Renderer/Renderer.bf index 4cb551f..56d56a7 100644 --- a/GlitchyEngine/src/Renderer/Renderer.bf +++ b/GlitchyEngine/src/Renderer/Renderer.bf @@ -180,8 +180,8 @@ namespace GlitchyEngine.Renderer static void InitDeferredRenderer() { - TestFullscreenEffect = Content.LoadAsset("Resources/Shaders/simpleLight.hlsl"); - s_tonemappingEffect = Content.LoadAsset("Resources/Shaders/SimpleTonemapping.hlsl"); + TestFullscreenEffect = Content.LoadAsset("Resources/Shaders/simpleLight.hlsl", null, true); + s_tonemappingEffect = Content.LoadAsset("Resources/Shaders/SimpleTonemapping.hlsl", null, true); _gBuffer = new GBuffer(); BlendStateDescription gBufferBlendDesc = .Default; diff --git a/GlitchyEngine/src/Renderer/Text/FontRenderer.bf b/GlitchyEngine/src/Renderer/Text/FontRenderer.bf index c1e482b..ead3129 100644 --- a/GlitchyEngine/src/Renderer/Text/FontRenderer.bf +++ b/GlitchyEngine/src/Renderer/Text/FontRenderer.bf @@ -31,7 +31,8 @@ namespace GlitchyEngine.Renderer.Text InitFreetype(); - _msdfEffect = Content.LoadAsset("Resources/Shaders/msdfShader.hlsl"); + // TODO: We might get away with a non blocking load here, but not for now! + _msdfEffect = Content.LoadAsset("Resources/Shaders/msdfShader.hlsl", null, true); s_isInitialized = true; } diff --git a/GlitchyEngine/src/World/SceneRenderer.bf b/GlitchyEngine/src/World/SceneRenderer.bf index d7500b7..29bc213 100644 --- a/GlitchyEngine/src/World/SceneRenderer.bf +++ b/GlitchyEngine/src/World/SceneRenderer.bf @@ -47,7 +47,7 @@ class SceneRenderer }); _cameraTarget.[Friend]Identifier = "Camera Target"; - _gammaCorrectEffect = Content.LoadAsset("Resources/Shaders/GammaCorrect.hlsl"); + _gammaCorrectEffect = Content.LoadAsset("Resources/Shaders/GammaCorrect.hlsl", null, true); } /// Sets the size of the viewport into which the scene will be rendered.