A little progress

Author: Causeless

Source/Entities/SLTerrain.cpp

@@ -308,6 +308,12 @@ int SLTerrain::SaveData(const std::string& pathBase, bool doAsyncSaves) {
 	return 0;
 }
 
+void SLTerrain::CopyBitmapData(std::vector<SceneLayerInfo>& layerInfos) const {
+	layerInfos.emplace_back(std::string("Mat"), SceneLayer::CopyBitmap());
+	layerInfos.emplace_back(std::string("FG"), m_FGColorLayer->CopyBitmap());
+	layerInfos.emplace_back(std::string("BG"), m_BGColorLayer->CopyBitmap());
+}
+
 int SLTerrain::ClearData() {
 	RTEAssert(SceneLayer::ClearData() == 0, "Failed to clear material bitmap data of an SLTerrain!");
 	RTEAssert(m_FGColorLayer && m_FGColorLayer->ClearData() == 0, "Failed to clear the foreground color bitmap data of an SLTerrain!");

Source/Entities/SLTerrain.h

@@ -68,6 +68,10 @@ namespace RTE {
 		/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.
 		int SaveData(const std::string& pathBase, bool doAsyncSaves = true) override;
 
+		/// Copies bitmap data into layerInfos.
+		/// @param layerInfos List of SceneLayerInfo to emplace our copied data into.
+		void CopyBitmapData(std::vector<SceneLayerInfo>& layerInfos) const;
+
 		/// Clears out any previously loaded bitmap data from memory.
 		/// @return An error return value signaling success or any particular failure. Anything below 0 is an error signal.
 		int ClearData() override;

Source/Entities/Scene.cpp

@@ -850,11 +850,8 @@ int Scene::SaveData(std::string pathBase, bool doAsyncSaves) {
 std::vector<SceneLayerInfo> Scene::GetCopiedSceneLayerBitmaps() {
 	std::vector<SceneLayerInfo> layerInfos;
 
-	// TODO- implement this. Basically just copy each scene layer to the vector
-	// This is for saving- we block to copy these layers, but it means the actual saving (compression, write to disk etc) can be done async
-	/*
 	// Save Terrain's data
-	m_pTerrain
+	m_pTerrain->CopyBitmapData(layerInfos);
 
 	// Don't bother saving background layers to disk, as they are never altered
 
@@ -864,10 +861,10 @@ std::vector<SceneLayerInfo> Scene::GetCopiedSceneLayerBitmaps() {
 	{
 	    if (m_apUnseenLayer[team])
 	    {
-	        m_apUnseenLayer[team]
+			std::snprintf(str, sizeof(str), "US T%d", team);
+			layerInfos.emplace_back(std::string(str), m_apUnseenLayer[team]->CopyBitmap());
 	    }
 	}
-	*/
 
 	return layerInfos;
 }

Source/Entities/SceneLayer.cpp

@@ -246,7 +246,7 @@ int SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::SaveData(const std::string&
 }
 
 template <bool TRACK_DRAWINGS, bool STATIC_TEXTURE>
-std::unique_ptr<BITMAP> SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::CopyBitmap() {
+std::unique_ptr<BITMAP> SceneLayerImpl<TRACK_DRAWINGS, STATIC_TEXTURE>::CopyBitmap() const {
 	BITMAP* outputBitmap = create_bitmap_ex(bitmap_color_depth(m_MainBitmap), m_MainBitmap->w, m_MainBitmap->h);
 	if (m_MainBitmap) {
 		outputBitmap = create_bitmap_ex(bitmap_color_depth(m_MainBitmap), m_MainBitmap->w, m_MainBitmap->h);

Source/Entities/SceneLayer.h

@@ -92,7 +92,7 @@ namespace RTE {
 
 		/// Copies the bitmap.
 		/// @return The copied bitmap.
-		std::unique_ptr<BITMAP> CopyBitmap();
+		std::unique_ptr<BITMAP> CopyBitmap() const;
 #pragma endregion
 
 #pragma region Getters and Setters

Source/Managers/ActivityMan.cpp

@@ -136,7 +136,10 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 	writer->NewPropertyWithValue("PlaceUnitsIfSceneIsRestarted", g_SceneMan.GetPlaceUnitsOnLoad());
 	writer->NewPropertyWithValue("Scene", modifiableScene.get());
 
-	auto saveWriterData = [&](Writer* writerToSave) {
+	// Get BITMAPS so save into our zip
+	std::vector<SceneLayerInfo> sceneLayerInfos = scene->GetCopiedSceneLayerBitmaps();
+
+	auto saveWriterData = [&](Writer* writerToSave, std::vector<SceneLayerInfo>&& sceneLayerInfos) {
 		std::stringstream* stream = static_cast<std::stringstream*>(writerToSave->GetStream());
 		stream->flush();
 
@@ -150,13 +153,25 @@ bool ActivityMan::SaveCurrentGame(const std::string& fileName) {
 		zipWriteInFileInZip(zippedSaveFile, streamAsString.data(), streamAsString.size());
 		zipCloseFileInZip(zippedSaveFile);
 
+		PALETTE palette;
+		get_palette(palette);
+
+		for (const SceneLayerInfo& layerInfo : sceneLayerInfos)
+		{
+			// Allego lacks the fucking ability to save/load png from a byte stream
+			// AAAAAAAAAAAAAAAAAAAAAAAAAAA
+			//zipOpenNewFileInZip(zippedSaveFile, (fileName + " " + layerInfo.name + ".png").c_str(), &zfi, nullptr, 0, nullptr, 0, nullptr, Z_DEFLATED, defaultCompression);
+			//zipWriteInFileInZip(zippedSaveFile, streamAsString.data(), streamAsString.size());
+			//zipCloseFileInZip(zippedSaveFile);
+		}
+
 		zipClose(zippedSaveFile, fileName.c_str());
 
 		delete writerToSave;
 	};
 
 	// For some reason I can't std::move a unique ptr in, so just releasing and deleting manually...
-	m_SaveGameTask.push_back(g_ThreadMan.GetBackgroundThreadPool().submit(saveWriterData, writer.release()));
+	m_SaveGameTask.push_back(g_ThreadMan.GetBackgroundThreadPool().submit(saveWriterData, writer.release(), std::move(sceneLayerInfos)));
 
 	// We didn't transfer ownership, so we must be very careful that sceneAltered's deletion doesn't touch the stuff we got from MovableMan.
 	modifiableScene->ClearPlacedObjectSet(Scene::PlacedObjectSets::PLACEONLOAD, false);