Updating vcpkg

.vscode/settings.json

@@ -10,7 +10,6 @@
     },
     "git.ignoreSubmodules": true,
     "cmake.parallelJobs": 0,
-    "cmake.buildDirectory": "${workspaceFolder}/build",
     "C_Cpp.files.exclude": {
         "**/.vs": true,
         "**/.vscode": true,
@@ -23,7 +22,7 @@
     "lldb.showDisassembly": "auto",
     "lldb.dereferencePointers": true,
     "lldb.consoleMode": "commands",
-    "cmake.generator": "Xcode",
+    "cmake.generator": "Ninja",
     "editor.tabSize": 4,
     "slang.additionalSearchPaths": [
         "res/shaders/",

CMakeLists.txt

@@ -34,18 +34,6 @@ project (Seele)
 
 include(cmake/SuperBuild.cmake)
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/build)
-#Workaround for vs, because it places artifacts into an additional subfolder
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/build)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/build)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_SOURCE_DIR}/build)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_CURRENT_SOURCE_DIR}/build)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/build)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/build)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_SOURCE_DIR}/build)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_CURRENT_SOURCE_DIR}/build)
-
 find_package(Vulkan REQUIRED)
 find_package(assimp CONFIG REQUIRED)
 find_package(Stb REQUIRED)
@@ -57,7 +45,7 @@ find_package(glm CONFIG REQUIRED)
 find_package(Ktx CONFIG REQUIRED)
 find_package(nlohmann_json CONFIG REQUIRED)
 find_package(fmt CONFIG REQUIRED)
-find_package(unofficial-lunasvg CONFIG REQUIRED)
+find_package(lunasvg CONFIG REQUIRED)
 find_package(VulkanMemoryAllocator CONFIG REQUIRED)
 
 if(UNIX)
@@ -85,7 +73,7 @@ target_link_libraries(Engine PUBLIC KTX::ktx)
 target_link_libraries(Engine PUBLIC nlohmann_json::nlohmann_json)
 target_link_libraries(Engine PUBLIC crcpp)
 target_link_libraries(Engine PUBLIC fmt::fmt)
-target_link_libraries(Engine PUBLIC unofficial::lunasvg::lunasvg)
+target_link_libraries(Engine PUBLIC lunasvg::lunasvg)
 target_link_libraries(Engine PUBLIC GPUOpen::VulkanMemoryAllocator)
 if(WIN32)
     target_link_libraries(Engine PUBLIC ${VCPKG_BASE_FOLDER}/lib/slang.lib)
@@ -140,7 +128,7 @@ target_compile_options(Engine PUBLIC "$<$<CONFIG:DEBUG>:-DENABLE_VALIDATION>")
 target_compile_options(Engine PUBLIC "$<$<CONFIG:DEBUG>:-DSEELE_DEBUG>")
 
 add_subdirectory(src/)
-add_subdirectory(tests/)
+#add_subdirectory(tests/)
 
 if(WIN32)
     add_custom_target(dll_copy ALL

CMakeSettings.json

@@ -5,7 +5,7 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "configurationType": "Debug",
-      "generator": "Ninja",
+      "generator": "Ninja Multi-Config",
       "intelliSenseMode": "windows-msvc-x64",
       "inheritEnvironments": [ "msvc_x64" ],
       "cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=\"\" -DCMAKE_PLATFORM=x64",
@@ -14,9 +14,9 @@
     },
     {
       "name": "Release",
-      "generator": "Ninja",
+      "generator": "Ninja Multi-Config",
       "configurationType": "Release",
-      "buildRoot": "${workspaceRoot}/build",
+      "buildRoot": "${workspaceRoot}/build/",
       "cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=\"\" -DCMAKE_PLATFORM=x64",
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
@@ -26,7 +26,7 @@
     },
     {
       "name": "RelWithDebInfo",
-      "generator": "Ninja",
+      "generator": "Ninja Multi-Config",
       "configurationType": "RelWithDebInfo",
       "buildRoot": "${workspaceRoot}/build",
       "installRoot": "C:/Program Files/Seele",
@@ -41,7 +41,7 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "configurationType": "Debug",
-      "generator": "Visual Studio 17 2022 Win64",
+      "generator": "Ninja Multi-Config",
       "intelliSenseMode": "windows-msvc-x64",
       "inheritEnvironments": [ "msvc_x64" ],
       "cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=\"\" -DCMAKE_PLATFORM=x64",
@@ -51,7 +51,7 @@
     },
     {
       "name": "MinSizeRel",
-      "generator": "Ninja",
+      "generator": "Ninja Multi-Config",
       "configurationType": "MinSizeRel",
       "buildRoot": "${workspaceRoot}/build",
       "installRoot": "C:/Program Files/Seele",

src/Editor/Asset/EnvironmentLoader.cpp

@@ -6,18 +6,21 @@
 
 using namespace Seele;
 
+static constexpr uint32 SOURCE_RESOLUTION = 2048;
+static constexpr uint32 CONVOLUTED_RESOLUTION = 64;
+
 EnvironmentLoader::EnvironmentLoader(Gfx::PGraphics graphics) : graphics(graphics) {
     cubeRenderViewport = graphics->createViewport(nullptr, ViewportCreateInfo{
                                                                .dimensions =
                                                                    {
-                                                                       .size = {1024, 1024},
+                                                                       .size = {SOURCE_RESOLUTION, SOURCE_RESOLUTION},
                                                                        .offset = {0, 0},
                                                                    },
                                                            });
     convolutionViewport = graphics->createViewport(nullptr, ViewportCreateInfo{
                                                                 .dimensions =
                                                                     {
-                                                                       .size = {32, 32},
+                                                                        .size = {CONVOLUTED_RESOLUTION, CONVOLUTED_RESOLUTION},
                                                                         .offset = {0, 0},
                                                                     },
                                                             });
@@ -120,8 +123,8 @@ void EnvironmentLoader::import(EnvironmentImportArgs args, PEnvironmentMapAsset
     set->writeChanges();
     Gfx::OTextureCube cubeMap = graphics->createTextureCube(TextureCreateInfo{
         .format = Gfx::SE_FORMAT_R32G32B32A32_SFLOAT,
-        .width = 1024,
+        .width = SOURCE_RESOLUTION,
-        .height = 1024,
+        .height = SOURCE_RESOLUTION,
         .usage = Gfx::SE_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | Gfx::SE_IMAGE_USAGE_SAMPLED_BIT,
     });
     Gfx::ORenderPass cubeRenderPass = graphics->createRenderPass(
@@ -132,7 +135,7 @@ void EnvironmentLoader::import(EnvironmentImportArgs args, PEnvironmentMapAsset
         },
         {},
         URect{
-            .size = {1024, 1024},
+            .size = {SOURCE_RESOLUTION, SOURCE_RESOLUTION},
             .offset = {0, 0},
         },
         "EnvironmentRenderPass", {0b111111}, {0b111111});
@@ -157,8 +160,8 @@ void EnvironmentLoader::import(EnvironmentImportArgs args, PEnvironmentMapAsset
 
     Gfx::OTextureCube convolutedMap = graphics->createTextureCube(TextureCreateInfo{
         .format = Gfx::SE_FORMAT_R32G32B32A32_SFLOAT,
-        .width = 32,
+        .width = CONVOLUTED_RESOLUTION,
-        .height = 32,
+        .height = CONVOLUTED_RESOLUTION,
         .usage = Gfx::SE_IMAGE_USAGE_COLOR_ATTACHMENT_BIT,
     });
     Gfx::ORenderPass convolutionPass = graphics->createRenderPass(
@@ -169,7 +172,7 @@ void EnvironmentLoader::import(EnvironmentImportArgs args, PEnvironmentMapAsset
         },
         {},
         URect{
-            .size = {32, 32},
+            .size = {CONVOLUTED_RESOLUTION, CONVOLUTED_RESOLUTION},
             .offset = {0, 0},
         },
         "EnvironmentRenderPass", {0b111111}, {0b111111});

src/Editor/Asset/TextureLoader.cpp

@@ -67,7 +67,7 @@ void TextureLoader::import(TextureImportArgs args, PTextureAsset textureAsset) {
         .numLevels = 1,
         .numLayers = 1,
         .isArray = false,
-        .generateMipmaps = false,
+        .generateMipmaps = true,
     };
 
     if (args.type == TextureImportType::TEXTURE_CUBEMAP) {
@@ -110,14 +110,14 @@ void TextureLoader::import(TextureImportArgs args, PTextureAsset textureAsset) {
     }
     ktxBasisParams basisParams = {
         .structSize = sizeof(ktxBasisParams),
-        .uastc = true,
+        .uastc = false,
         .threadCount = 1,
-        .compressionLevel = 2,
+        .compressionLevel = KTX_ETC1S_DEFAULT_COMPRESSION_LEVEL,
-        .uastcFlags = KTX_PACK_UASTC_LEVEL_FASTER,
+        .uastcFlags = KTX_PACK_UASTC_LEVEL_DEFAULT,
         .uastcRDO = true,
     };
     KTX_ASSERT(ktxTexture2_CompressBasisEx(kTexture, &basisParams));
-    KTX_ASSERT(ktxTexture2_DeflateZstd(kTexture, 10));
+    //KTX_ASSERT(ktxTexture2_DeflateZstd(kTexture, 10));
 
     char writer[100];
     snprintf(writer, sizeof(writer), "%s version %s", "SeeleEngine", "0.0.1");
@@ -149,4 +149,5 @@ void TextureLoader::import(TextureImportArgs args, PTextureAsset textureAsset) {
     AssetRegistry::saveAsset(textureAsset, TextureAsset::IDENTIFIER, textureAsset->getFolderPath(), textureAsset->getName());
 
     textureAsset->setStatus(Asset::Status::Ready);
+    std::cout << "Done importing " << textureAsset->getName() << std::endl;
 }

src/Engine/Physics/BVH.cpp

@@ -315,7 +315,6 @@ void BVH::validateBVH() const {
             continue;
         while (dynamicNodes[nodeIdx].parentIndex != -1) {
             nodeIdx = dynamicNodes[nodeIdx].parentIndex;
-            assert(counter-- > 0 && dynamicNodes[nodeIdx].isValid);
         }
     }
 }