From f5f107b0b47eb89ae8ae62f3fe942524038b86d3 Mon Sep 17 00:00:00 2001 From: redstrate <54911369+redstrate@users.noreply.github.com> Date: Fri, 5 Feb 2021 20:21:25 -0500 Subject: [PATCH] Disable IBL on Windows There isn't enough features on the Vulkan backend to prevent it from crashing :V --- engine/renderer/include/render_options.hpp | 8 ++++++++ tools/common/src/commoneditor.cpp | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/engine/renderer/include/render_options.hpp b/engine/renderer/include/render_options.hpp index 434105b..f37a1b4 100755 --- a/engine/renderer/include/render_options.hpp +++ b/engine/renderer/include/render_options.hpp @@ -27,6 +27,14 @@ constexpr bool default_enable_normal_mapping = false; constexpr bool default_enable_point_shadows = false; constexpr ShadowFilter default_shadow_filter = ShadowFilter::PCF; constexpr int default_shadow_resolution = 1024; +#endif + +#if defined(PLATFORM_WINDOWS) +constexpr bool default_enable_ibl = false; +constexpr bool default_enable_normal_mapping = true; +constexpr bool default_enable_point_shadows = true; +constexpr ShadowFilter default_shadow_filter = ShadowFilter::PCSS; +constexpr int default_shadow_resolution = 2048; #else constexpr bool default_enable_ibl = true; constexpr bool default_enable_normal_mapping = true; diff --git a/tools/common/src/commoneditor.cpp b/tools/common/src/commoneditor.cpp index 936dee7..59fa3ab 100755 --- a/tools/common/src/commoneditor.cpp +++ b/tools/common/src/commoneditor.cpp @@ -763,10 +763,9 @@ bool material_readable(const file::Path path) { } void cacheAssetFilesystem() { -#ifndef PLATFORM_WINDOWS asset_files.clear(); - auto data_directory = "../../../data"; + auto data_directory = "data"; for(auto& p : std::filesystem::recursive_directory_iterator(data_directory)) { if(p.path().extension() == ".model" && mesh_readable(p.path())) { asset_files[std::filesystem::relative(p, data_directory)] = AssetType::Mesh; @@ -778,7 +777,6 @@ void cacheAssetFilesystem() { } filesystem_cached = true; -#endif } void CommonEditor::drawAssets() { @@ -989,7 +987,9 @@ GFXTexture* CommonEditor::generate_common_preview(Scene& scene, const Vector3 ca GFXCommandBuffer* command_buffer = gfx->acquire_command_buffer(); renderer->shadow_pass->render(command_buffer, scene); - renderer->scene_capture->render(command_buffer, &scene); + + if(render_options.enable_ibl) + renderer->scene_capture->render(command_buffer, &scene); GFXRenderPassBeginInfo begin_info = {}; begin_info.framebuffer = offscreen_framebuffer;