made saving faster by copying bitmaps async

Author: Causeless

Source/Managers/ActivityMan.cpp

@@ -28,6 +28,8 @@
 #include "zip.h"
 #include "unzip.h"
 
+#include "tracy/Tracy.hpp"
+
 #include "SDL3/SDL_surface.h"
 #include <SDL3_image/SDL_image.h>
 
@@ -85,6 +87,8 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 		m_SaveGameTask.wait();
 	}
 
+	ZoneScopedN("Save Game");
+
 	Scene* scene = g_SceneMan.GetScene();
 	GAScripted* activity = dynamic_cast<GAScripted*>(GetActivity());
 
@@ -93,6 +97,12 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 		return false;
 	}
 
+	// Get BITMAPS so save into our zip, do this async so we can copy the scene info at the same time
+	std::vector<SceneLayerInfo>* sceneLayerInfos = new std::vector<SceneLayerInfo>();
+	std::future<void> copyBitmaps = g_ThreadMan.GetBackgroundThreadPool().submit([&]() {
+		*sceneLayerInfos = std::move(scene->GetCopiedSceneLayerBitmaps());
+	});
+
 	// We need a copy of our scene, because we have to do some fixup to remove PLACEONLOAD items and only keep the current MovableMan state.
 	std::unique_ptr<Scene> modifiableScene(dynamic_cast<Scene*>(scene->Clone()));
 
@@ -153,11 +163,6 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 	indexWriter->NewPropertyWithValue("ActivityName", activity->GetPresetName());
 	indexWriter->NewPropertyWithValue("OriginalScenePresetName", scene->GetPresetName());
 
-	// Get BITMAPS so save into our zip
-	// I tried std::moving this into the function directly but threadpool really doesn't like that
-	std::vector<SceneLayerInfo>* sceneLayerInfos = new std::vector<SceneLayerInfo>();
-	*sceneLayerInfos = std::move(scene->GetCopiedSceneLayerBitmaps());
-
 	auto saveWriterData = [fileName, sceneLayerInfos, indexWriter](Writer* mainWriter) {
 		// Create zip sav file
 		zipFile zippedSaveFile = zipOpen((g_PresetMan.GetFullModulePath(c_UserScriptedSavesModuleName) + "/" + fileName + ".ccsave").c_str(), APPEND_STATUS_CREATE);
@@ -242,6 +247,8 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 		delete sceneLayerInfos;
 	};
 
+	copyBitmaps.wait();
+
 	// For some reason I can't std::move a unique ptr in, so just releasing and deleting manually...
 	m_SaveGameTask = g_ThreadMan.GetBackgroundThreadPool().submit(saveWriterData, writer.release());