Replacements must be processed strictly with and after static

sultim-t · Sep 30, 2023 · 028482d · 028482d
1 parent 947d111
commit 028482d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/Source/ASManager.cpp b/Source/ASManager.cpp
@@ -622,6 +622,8 @@ RTGL1::StaticGeometryToken RTGL1::ASManager::BeginStaticGeometry()
 
     // destroy previous static
     builtStaticInstances.clear();
+    // and replacements, because they depend on allocator / vertex collector of static
+    builtReplacements.clear();
     allocStaticGeom->Reset();
 
     erase_if( curFrame_objects, []( const Object& o ) { return o.isStatic; } );
@@ -653,11 +655,6 @@ void RTGL1::ASManager::SubmitStaticGeometry( StaticGeometryToken& token )
     Utils::WaitAndResetFence( device, staticCopyFence );
 }
 
-void RTGL1::ASManager::ClearReplacements()
-{
-    builtReplacements.clear();
-}
-
 RTGL1::DynamicGeometryToken RTGL1::ASManager::BeginDynamicGeometry( VkCommandBuffer cmd,
                                                                     uint32_t        frameIndex )
 {

diff --git a/Source/ASManager.h b/Source/ASManager.h
@@ -58,9 +58,6 @@ class ASManager
     void                              SubmitStaticGeometry( StaticGeometryToken& token );
 
 
-    void ClearReplacements();
-
-
     [[nodiscard]] DynamicGeometryToken BeginDynamicGeometry( VkCommandBuffer cmd,
                                                              uint32_t        frameIndex );
     void                               SubmitDynamicGeometry( DynamicGeometryToken& token,

diff --git a/Source/Scene.cpp b/Source/Scene.cpp
@@ -434,7 +434,6 @@ void RTGL1::Scene::RereadReplacements( VkCommandBuffer              cmdForTextur
     namespace fs = std::filesystem;
 
     replacements.clear();
-    asManager->ClearReplacements();
 
     if( !exists( replacementsFolder ) )
     {
@@ -579,16 +578,17 @@ void RTGL1::SceneImportExport::CheckForNewScene( std::string_view    mapName,
                                                  TextureMetaManager& textureMeta,
                                                  LightManager&       lightManager )
 {
-    if( currentMap != mapName || reimportRequested )
+    if( currentMap != mapName || reimportRequested || reimportReplacementsRequested )
     {
-        reimportRequested = false;
-        debug::Verbose( "Starting new scene..." );
 
-        currentMap = mapName;
+        currentMap                    = mapName;
+        reimportRequested             = false;
+        reimportReplacementsRequested = false;
 
         // before importer, as it relies on texture properties
         textureMeta.RereadFromFiles( GetImportMapName() );
 
+        debug::Verbose( "Starting new scene..." );
         {
             auto staticScene = GltfImporter{ MakeGltfPath( scenesFolder, GetImportMapName() ),
                                              MakeWorldTransform(),
@@ -598,16 +598,15 @@ void RTGL1::SceneImportExport::CheckForNewScene( std::string_view    mapName,
                 cmd, frameIndex, staticScene, textureManager, textureMeta, lightManager );
         }
         debug::Verbose( "New scene is ready" );
-    }
 
-    if( reimportReplacementsRequested )
-    {
-        reimportReplacementsRequested = false;
-        debug::Verbose( "Reading replacements..." );
-
-        scene.RereadReplacements(
-            cmd, frameIndex, replacementsFolder, textureManager, textureMeta );
+        // NOTE: RereadReplacements must happen with NewScene,
+        //       as replacement AS depend on static AS infrastructure
 
+        debug::Verbose( "Reading replacements..." );
+        {
+            scene.RereadReplacements(
+                cmd, frameIndex, replacementsFolder, textureManager, textureMeta );
+        }
         debug::Verbose( "Replacements are ready" );
     }
 }