CR

brayns/Brayns.cpp

@@ -250,13 +250,15 @@ struct Brayns::Impl
 
         scene.buildEnvironment();
 
-        if (_parametersManager->getGeometryParameters()
-                .getLoadCacheFile()
-                .empty())
+        const auto& geomParams = _parametersManager->getGeometryParameters();
+        if (geomParams.getLoadCacheFile().empty())
         {
             scene.buildMaterials();
             loadingProgress.setMessage("Building geometry ...");
             scene.buildGeometry();
+
+            if (!geomParams.getSaveCacheFile().empty())
+                scene.saveCacheFile();
         }
 
         loadingProgress += LOADING_PROGRESS_STEP;
@@ -450,7 +452,7 @@ struct Brayns::Impl
 
         if (!geometryParameters.getLoadCacheFile().empty())
         {
-            scene.loadSceneFromCacheFile();
+            scene.loadromCacheFile();
             loadingProgress += tic;
         }
 
@@ -1182,7 +1184,7 @@ struct Brayns::Impl
     void _saveSceneToCacheFile()
     {
         auto& scene = _engine->getScene();
-        scene.saveSceneToCacheFile();
+        scene.saveToCacheFile();
     }
 
     void _resetCamera()

brayns/common/scene/Scene.h

@@ -245,13 +245,13 @@ class Scene
         Loads geometry a binary cache file defined by the --load-cache-file
        command line parameter
     */
-    BRAYNS_API virtual void loadSceneFromCacheFile() = 0;
+    BRAYNS_API virtual void loadFromCacheFile() = 0;
 
     /**
         Saves geometry a binary cache file defined by the --save-cache-file
        command line parameter
     */
-    BRAYNS_API virtual void saveSceneToCacheFile() = 0;
+    BRAYNS_API virtual void saveToCacheFile() = 0;
 
     /**
      * @return true if the given volume file is supported by the engines' scene.

plugins/engines/livre/LivreScene.cpp

@@ -103,11 +103,11 @@ void LivreScene::commitSimulationData()
 {
 }
 
-void LivreScene::loadSceneFromCacheFile()
+void LivreScene::loadFromCacheFile()
 {
 }
 
-void LivreScene::saveSceneToCacheFile()
+void LivreScene::saveToCacheFile()
 {
 }
 

plugins/engines/livre/LivreScene.h

@@ -57,10 +57,10 @@ class LivreScene : public Scene
     void commitSimulationData() final;
 
     /** Unsupported by Livre. */
-    void loadSceneFromCacheFile() final;
+    void loadFromCacheFile() final;
 
     /** Unsupported by Livre. */
-    void saveSceneToCacheFile() final;
+    void saveToCacheFile() final;
 
     /** @copydoc Scene::isVolumeSupported */
     bool isVolumeSupported(const std::string& volumeFile) const final;

plugins/engines/optix/OptiXScene.cpp

@@ -247,7 +247,7 @@ void OptiXScene::unload()
     _optixTextureSamplers.clear();
 }
 
-void OptiXScene::loadSceneFromCacheFile()
+void OptiXScene::loadFromCacheFile()
 {
 }
 
@@ -1034,10 +1034,9 @@ uint64_t OptiXScene::_getBvhSize(const uint64_t nbElements) const
     return 64 * 1.3f * nbElements;
 }
 
-void OptiXScene::saveSceneToCacheFile()
+void OptiXScene::saveToCacheFile()
 {
-    BRAYNS_ERROR << "OptiXScene::saveSceneToCacheFile not implemented"
-                 << std::endl;
+    BRAYNS_ERROR << "OptiXScene::saveToCacheFile not implemented" << std::endl;
 }
 
 bool OptiXScene::isVolumeSupported(const std::string& volumeFile) const

plugins/engines/optix/OptiXScene.h

@@ -79,11 +79,11 @@ class OptiXScene : public brayns::Scene
     /** @copydoc Scene::unload */
     void unload() final;
 
-    /** @copydoc Scene::loadSceneFromCacheFile */
-    void loadSceneFromCacheFile() final;
+    /** @copydoc Scene::loadFromCacheFile */
+    void loadFromCacheFile() final;
 
-    /** @copydoc Scene::saveSceneToCacheFile */
-    void saveSceneToCacheFile() final;
+    /** @copydoc Scene::saveToCacheFile */
+    void saveToCacheFile() final;
 
     /** @copydoc Scene::isVolumeSupported */
     bool isVolumeSupported(const std::string& volumeFile) const final;

plugins/engines/ospray/OSPRayScene.cpp

@@ -194,7 +194,7 @@ OSPModel OSPRayScene::modelImpl(const uint32_t index)
     return lastModel->second;
 }
 
-void OSPRayScene::_saveCacheFile()
+void OSPRayScene::saveToCacheFile()
 {
     const std::string& filename =
         _parametersManager.getGeometryParameters().getSaveCacheFile();
@@ -369,7 +369,7 @@ void OSPRayScene::_saveCacheFile()
     BRAYNS_INFO << "Scene successfully saved" << std::endl;
 }
 
-void OSPRayScene::loadSceneFromCacheFile()
+void OSPRayScene::loadFromCacheFile()
 {
     const auto& geomParams = _parametersManager.getGeometryParameters();
 
@@ -905,9 +905,6 @@ void OSPRayScene::buildGeometry()
     BRAYNS_INFO << "Total    : " << size << " bytes" << std::endl;
     BRAYNS_INFO << "---------------------------------------------------"
                 << std::endl;
-
-    if (!geomParams.getSaveCacheFile().empty())
-        _saveCacheFile();
 }
 
 uint64_t OSPRayScene::_buildMeshOSPGeometry(const size_t materialId)
@@ -1313,11 +1310,6 @@ OSPTexture2D OSPRayScene::_createTexture2D(const std::string& textureName)
     return ospTexture;
 }
 
-void OSPRayScene::saveSceneToCacheFile()
-{
-    _saveCacheFile();
-}
-
 bool OSPRayScene::isVolumeSupported(const std::string& volumeFile) const
 {
     return boost::algorithm::ends_with(volumeFile, ".raw");

plugins/engines/ospray/OSPRayScene.h

@@ -73,11 +73,11 @@ class OSPRayScene : public brayns::Scene
     /** @copydoc Scene::unload */
     void unload() final;
 
-    /** @copydoc Scene::loadSceneFromCacheFile */
-    void loadSceneFromCacheFile() final;
+    /** @copydoc Scene::loadFromCacheFile */
+    void loadFromCacheFile() final;
 
-    /** @copydoc Scene::saveSceneToCacheFile */
-    void saveSceneToCacheFile() final;
+    /** @copydoc Scene::saveToCacheFile */
+    void saveToCacheFile() final;
 
     /** @copydoc Scene::isVolumeSupported */
     bool isVolumeSupported(const std::string& volumeFile) const final;
@@ -94,8 +94,6 @@ class OSPRayScene : public brayns::Scene
     uint64_t _serializeCones(const size_t materialId);
     uint64_t _buildMeshOSPGeometry(const size_t materialId);
 
-    void _saveCacheFile();
-
     std::map<uint32_t, OSPModel> _models;
     OSPModel _simulationModel;
     std::vector<OSPMaterial> _ospMaterials;