material serialization fixes

.vscode/launch.json

@@ -8,10 +8,10 @@
             "name": "Editor",
             "type": "cppvsdbg",
             "request": "launch",
-            "program": "${workspaceRoot}/bin/Debug/Editor.exe",
+            "program": "${workspaceRoot}/bin/Editor.exe",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${workspaceRoot}/bin/Debug",
+            "cwd": "${workspaceRoot}/bin",
             "console": "internalConsole",
             "environment": [],
             "symbolSearchPath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.25.28610\\lib\\x64",

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "telemetry.enableTelemetry": false,
-    "cmake.buildDirectory": "${workspaceFolder}/bin/${buildType}",
+    "cmake.buildDirectory": "${workspaceFolder}/bin",
     "files.associations": {
         "*.h": "cpp",
         "*.ush": "hlsl",

CMakeLists.txt

@@ -39,13 +39,15 @@ project (Seele)
 
 include(cmake/Superbuild.cmake)
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 #Workaround for vs, because it places artifacts into an additional subfolder
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin/Debug)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin/Release)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin/Debug)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_SOURCE_DIR}/bin)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin/Release)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 
 set(Boost_USE_STATIC_LIBS OFF)
 if(WIN32)
@@ -113,6 +115,7 @@ target_precompile_headers(Engine
 if(MSVC)
     set(_CRT_SECURE_NO_WARNINGS)
     target_compile_options(Engine PUBLIC /Zi /MP14 /W4 /DEBUG "/WX-")
+    target_compile_options(Editor PUBLIC /Zi /MP14 /W4 /DEBUG "/WX-")
     target_sources(Engine INTERFACE   
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Seele.natvis>
         $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/Seele.natvis>

cmake-variants.json

@@ -6,20 +6,17 @@
             "debug": {
                 "short": "Debug",
                 "long": "Enable debugging and validation",
-                "buildType": "Debug",
+                "buildType": "Debug"
-                "settings": {
-                    "CMAKE_DEBUG_POSTFIX": "d",
-                    "CMAKE_BUILD_TYPE": "Debug"
-                }
             },
             "release": {
                 "short": "Release",
                 "long": "Optimize binary for speed",
-                "buildType": "Release",
+                "buildType": "Release"
-                "settings": {
+            },
-                    "CMAKE_DEBUG_POSTFIX": "",
+            "relwithdebinfo": {
-                    "CMAKE_BUILD_TYPE": "Release"
+                "short": "RelWithDebInfo",
-                }
+                "long": "Release with debug symbols",
+                "buildType": "RelWithDebInfo"
             }
         }
     },

src/Editor/main.cpp

@@ -19,12 +19,19 @@ extern AssetRegistry* instance;
 
 int main()
 {
+
+    std::string outputPath = "C:/Users/Dynamitos/TrackClearGame";
+    std::string cmakePath = "C:/Users/Dynamitos/TrackClearGame/cmake";
+    std::string gameName = "TrackClear";
+    std::string sourcePath = "C:/Users/Dynamitos/TrackClear/";
+    std::string binaryPath = "C:/Users/Dynamitos/TrackClear/bin/TrackClear.dll";
+
     Gfx::PGraphics graphics = new Vulkan::Graphics();
 
     GraphicsInitializer initializer;
     graphics->init(initializer);
     PWindowManager windowManager = new WindowManager();
-    AssetRegistry::init(std::string("C:\\Users\\Dynamitos\\TrackClear\\Assets"), graphics);
+    AssetRegistry::init(std::string("C:/Users/Dynamitos/TrackClear/Assets"), graphics);
     AssetImporter::init(graphics, instance);
     AssetImporter::importFont(FontImportArgs{
         .filePath = "./fonts/Calibri.ttf",
@@ -213,7 +220,7 @@ int main()
     sceneViewInfo.dimensions.size.y = 720;
     sceneViewInfo.dimensions.offset.x = 0;
     sceneViewInfo.dimensions.offset.y = 0;
-    PGameView sceneView = new Editor::PlayView(graphics, window, sceneViewInfo, "C:\\Users\\Dynamitos\\TrackClear\\bin\\TrackCleard.dll");
+    PGameView sceneView = new Editor::PlayView(graphics, window, sceneViewInfo, binaryPath);
     
     //ViewportCreateInfo inspectorViewInfo;
     //inspectorViewInfo.dimensions.size.x = 640;
@@ -226,9 +233,18 @@ int main()
 
     window->render();
     //export game
-    std::string outputPath = "C:\\Users\\Dynamitos\\TrackClearGame";
+
-    
+    std::filesystem::create_directories(outputPath);
-    std::system("cmake --configure");
+    std::system(std::format("cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGAME_TITLE=\"{}\" -DGAME_DESTINATION=\"{}\" -DGAME_BINARY=\"{}\" -P ./cmake/ExportProject.cmake", gameName, outputPath, binaryPath).c_str());
+    std::system(std::format("cmake -S {} -B {}", cmakePath, cmakePath).c_str());
+    std::system(std::format("cmake --build {}", cmakePath).c_str());
+    std::filesystem::copy(std::filesystem::path(sourcePath) / "Assets", std::filesystem::path(outputPath) / "Assets", std::filesystem::copy_options::recursive);
+    std::filesystem::copy("shaders", std::filesystem::path(outputPath) / "shaders", std::filesystem::copy_options::recursive);
+    std::filesystem::copy("textures", std::filesystem::path(outputPath) / "textures", std::filesystem::copy_options::recursive);
+    std::filesystem::copy_file("assimp-vc143-mt.dll", std::filesystem::path(outputPath) / "assimp-vc143-mt.dll");
+    std::filesystem::copy_file("slang.dll", std::filesystem::path(outputPath) / "slang.dll");
+    std::filesystem::copy_file("slang-glslang.dll", std::filesystem::path(outputPath) / "slang-glslang.dll");
+    std::filesystem::copy_file("slang-llvm.dll", std::filesystem::path(outputPath) / "slang-llvm.dll");
 
     return 0;
 }

src/Engine/Asset/MaterialAsset.cpp

@@ -26,5 +26,6 @@ void MaterialAsset::load(ArchiveBuffer& buffer)
 {
     material = new Material();
     material->load(buffer);
+    material->compile();
 }
 

src/Engine/Concepts.h

@@ -7,10 +7,12 @@ template<class F, class... Args>
 concept invocable = std::invocable<F, Args...>;
 
 template<class T, class Archive>
-concept serializable = requires(T t, Archive& a)
+concept serializable = requires(const T t, Archive& a)
 {
-    t->save(a);
+    t.save(a);
-    t->load(a);
+} && requires(T t, Archive& a)
+{
+    t.load(a);
 };
 template<typename T>
 concept enumeration = std::is_enum_v<T>;

src/Engine/Material/Material.cpp

@@ -52,8 +52,9 @@ Gfx::PDescriptorSet Material::createDescriptorSet()
 void Material::save(ArchiveBuffer& buffer) const
 {
     MaterialInterface::save(buffer);
-    Serialization::save(buffer,materialName);
+    Serialization::save(buffer, materialName);
     Serialization::save(buffer, layout->getSetIndex());
+    Serialization::save2(buffer, brdf);
     const auto& bindings = layout->getBindings();
     Serialization::save(buffer, bindings.size());
     for (const auto& binding : bindings)
@@ -73,6 +74,7 @@ void Material::load(ArchiveBuffer& buffer)
     Serialization::load(buffer, materialName);
     uint32 setIndex;
     Serialization::load(buffer, setIndex);
+    Serialization::load2(buffer, brdf);
     uint64 numBindings;
     Serialization::load(buffer, numBindings);
     layout = graphics->createDescriptorLayout();

src/Engine/Serialization/ArchiveBuffer.h

@@ -65,6 +65,16 @@ namespace Serialization
     {
         buffer.readBytes(&type, sizeof(type));
     }
+    template<typename T>
+    static void save2(ArchiveBuffer& buffer, const T& type) requires(serializable<T>)
+    {
+        type.save(buffer);
+    }
+    template<typename T>
+    static void load2(ArchiveBuffer& buffer, T& type) requires(serializable<T>)
+    {
+        type.load(buffer);
+    }
     //template<class T>
     //static void save(ArchiveBuffer& buffer, const T& type)
     //{

src/Engine/Window/GameView.cpp

@@ -19,11 +19,7 @@ GameView::GameView(Gfx::PGraphics graphics, PWindow window, const ViewportCreate
         SkyboxRenderPass(graphics)
     ))
 {
-    scene = new Scene(graphics);
+    reloadGame();
-    gameInterface.reload(instance);
-    
-    systemGraph = new SystemGraph();
-    gameInterface.getGame()->setupScene(scene, systemGraph);
     renderGraph.updateViewport(viewport);
 }
 
@@ -74,6 +70,15 @@ void GameView::render()
     });
 }
 
+void GameView::reloadGame()
+{
+    scene = new Scene(graphics);
+    gameInterface.reload(instance);
+    
+    systemGraph = new SystemGraph();
+    gameInterface.getGame()->setupScene(scene, systemGraph);
+}
+
 void GameView::keyCallback(KeyCode code, InputAction action, KeyModifier)
 {
     scene->view<Component::KeyboardInput>([=](Component::KeyboardInput& input)
@@ -99,6 +104,10 @@ void GameView::keyCallback(KeyCode code, InputAction action, KeyModifier)
         //    showDebug = !showDebug;
         //    debugPassData.vertices.clear();
         //}
+        if(code == KeyCode::KEY_R && action == InputAction::PRESS)
+        {
+            reloadGame();
+        }
 
         input.keys[code] = action != InputAction::RELEASE;
     });

src/Engine/Window/GameView.h

@@ -20,6 +20,8 @@ public:
 
 	virtual void prepareRender() override;
 	virtual void render() override;
+
+	void reloadGame();
 private:
 	GameInterface gameInterface;
     RenderGraph<