Auto stash before merge of "master" and "Gitea/master"

2024-09-25 17:27:21 +02:00
parent 6417ab940d
commit 81f29d1b3f
16 changed files with 518 additions and 147 deletions
@@ -77,6 +77,14 @@ int main() {
        //    .filePath = sourcePath / "import/models/city-suburbs/source/city-suburbs.obj",
        //    .importPath = "suburbs",
        //});
+        //AssetImporter::importMesh(MeshImportArgs{
+        //    .filePath = sourcePath / "import/models/minecraft-medieval-city.fbx",
+        //    .importPath = "minecraft",
+        //});
+        //AssetImporter::importMesh(MeshImportArgs{
+        //    .filePath = sourcePath / "import/models/Volvo/Volvo.fbx",
+        //    .importPath = "Volvo",
+        //});
        getThreadPool().waitIdle();
        vd->commitMeshes();
        WindowCreateInfo mainWindowInfo = {