From 9b416a8662f3d816c9b42dfcfb4c5b3509f59882 Mon Sep 17 00:00:00 2001
From: myk002 <myk002@yahoo.com>
Date: Sun, 25 Apr 2021 09:43:40 -0700
Subject: [PATCH] speed up dig blueprint creation by 70%

remove the unneeded cache layer. the cache is for writing. we're just
reading. all the cache is doing is adding latency as it makes its copies
of map data structures.

generating a 190x190x100 dig blueprint:
before change: 1.7s
after change:  1.0s

the performance gains aren't as important here as the reduced complexity
of the algorithm, though. for reasonably-sized blueprints, the time
savings are unnoticeable.
---
 plugins/blueprint.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/blueprint.cpp b/plugins/blueprint.cpp
index 4653b469c..2bc39df29 100644
--- a/plugins/blueprint.cpp
+++ b/plugins/blueprint.cpp
@@ -1,6 +1,9 @@
-//Blueprint
-//By cdombroski
-//Translates a region of tiles specified by the cursor and arguments/prompts into a series of blueprint files suitable for digfort/buildingplan/quickfort
+/**
+ * Translates a region of tiles specified by the cursor and arguments/prompts
+ * into a series of blueprint files suitable for replay via quickfort.
+ *
+ * Written by cdombroski.
+ */
 
 #include <algorithm>
 #include <sstream>
@@ -43,7 +46,7 @@ command_result blueprint(color_ostream &out, vector <string> &parameters);
 
 DFhackCExport command_result plugin_init(color_ostream &out, vector<PluginCommand> &commands)
 {
-    commands.push_back(PluginCommand("blueprint", "Convert map tiles into a blueprint", blueprint, false));
+    commands.push_back(PluginCommand("blueprint", "Record the structure of a live game map in a quickfort blueprint", blueprint, false));
     return CR_OK;
 }
 
@@ -76,10 +79,9 @@ pair<uint32_t, uint32_t> get_building_size(df::building* b)
     return pair<uint32_t, uint32_t>(b->x2 - b->x1 + 1, b->y2 - b->y1 + 1);
 }
 
-char get_tile_dig(MapExtras::MapCache mc, int32_t x, int32_t y, int32_t z)
+char get_tile_dig(int32_t x, int32_t y, int32_t z)
 {
-    df::tiletype tt = mc.tiletypeAt(DFCoord(x, y, z));
-    df::tiletype_shape ts = tileShape(tt);
+    df::tiletype_shape ts = tileShape(*Maps::getTileType(x, y , z));
     switch (ts)
     {
     case tiletype_shape::EMPTY:
@@ -102,7 +104,6 @@ char get_tile_dig(MapExtras::MapCache mc, int32_t x, int32_t y, int32_t z)
         return 'r';
     default:
         return ' ';
-
     }
 }
 
@@ -629,7 +630,6 @@ command_result do_transform(DFCoord start, DFCoord end, string name, uint32_t ph
         end.z++;
     }
 
-    MapExtras::MapCache mc;
     for (int32_t z = start.z; z < end.z; z++)
     {
         for (int32_t y = start.y; y < end.y; y++)
@@ -644,7 +644,7 @@ command_result do_transform(DFCoord start, DFCoord end, string name, uint32_t ph
                 if (phases & BUILD)
                     build << get_tile_build(x, y, b) << ',';
                 if (phases & DIG)
-                    dig << get_tile_dig(mc, x, y, z) << ',';
+                    dig << get_tile_dig(x, y, z) << ',';
             }
             if (phases & QUERY)
                 query << "#" << endl;