Merge branch 'master' of github.com:blind-coder/pz-mapmap

blind-coder · Jan 6, 2021 · 6e023fa · 6e023fa
2 parents 52157b2 + 6ffbf87
commit 6e023fa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/MapMap/Main.cs b/MapMap/Main.cs
@@ -33,6 +33,7 @@ class Main
 		private bool bigtree = false;
 		private static int numThreads = 0;
 		private int maxThreads = 1;
+		private int scale = 1;
 
 		private MMCellData childMapData;
 
@@ -117,7 +118,7 @@ private void parseMapData()
 								}
 								MapMap.Main.numThreads++;
 								Console.WriteLine("Threads: {0}/{1}", MapMap.Main.numThreads, maxThreads);
-								MMPlotter plotter = new MMPlotter(this.divider, this.tex, this.dolayers, this.bigtree);
+								MMPlotter plotter = new MMPlotter(this.divider, this.tex, this.dolayers, this.bigtree, this.scale);
 								//ThreadStart childref = new ThreadStart(this.RunPlotter);
 								//Thread childThread = new Thread(childref);
 								Thread childThread = new Thread(() => RunPlotter(plotter, mapdata, this.OutputDir, cellx, celly));
@@ -227,6 +228,9 @@ private bool parseArgs(string[] args)
 						case "-maxy":
 							this.maxY = Convert.ToInt32(args[id + 1]);
 							break;
+						case "-scale":
+							this.scale = Convert.ToInt32(args[id + 1]);
+							break;
 					}
 				}
 				Console.Clear();

diff --git a/MapMapLib/MMPlotter.cs b/MapMapLib/MMPlotter.cs
@@ -26,8 +26,9 @@ public class MMPlotter
 		private Random rand;
 		private BushInit[] bush;
 		private PlantInit[] plant;
+		private Int32 scale;
 
-		public MMPlotter(int divider, MMTextures textures, bool dolayers, bool bigtree)
+		public MMPlotter(int divider, MMTextures textures, bool dolayers, bool bigtree, Int32 scale)
 		{
 			Dictionary<String, List<String>> collageCategory;
 			List<String> collageSprites;
@@ -353,6 +354,7 @@ public MMPlotter(int divider, MMTextures textures, bool dolayers, bool bigtree)
 
 			this.rand = new Random();
 			this.subDiv = divider;
+			this.scale = scale;
 			this.subWH = (300 / this.subDiv);
 			this.startX = (1280 * 30 / this.subDiv / 2) - 64;
 			this.dolayers = dolayers;
@@ -455,13 +457,19 @@ public void PlotData( MMCellData cellData, string outputDir, int cellx, int cell
 							}
 							if (this.dolayers == true && drawCnt > 0)
 							{
-								this.subCell.Save(outputDir + "cell_" + cellx + "_" + celly + "_subcell_" + subx + "_" + suby + "_layer_" + z + ".png", System.Drawing.Imaging.ImageFormat.Png);
+								Bitmap resized = new Bitmap(this.subCell,new Size(this.subCell.Width/this.scale,this.subCell.Height/this.scale));
+								resized.Save(outputDir + "cell_" + cellx + "_" + celly + "_subcell_" + subx + "_" + suby + "_layer_" + z + ".png", System.Drawing.Imaging.ImageFormat.Png);
+
+								//this.subCell.Save(outputDir + "cell_" + cellx + "_" + celly + "_subcell_" + subx + "_" + suby + "_layer_" + z + ".png", System.Drawing.Imaging.ImageFormat.Png);
 								gfx.Clear(Color.Transparent);
 							}
 						}
 						if (this.dolayers == false)
 						{
-							this.subCell.Save(outputDir + "cell_" + cellx + "_" + celly + "_subcell_" + subx + "_" + suby + "_full.png", System.Drawing.Imaging.ImageFormat.Png);
+							Bitmap resized = new Bitmap(this.subCell,new Size(this.subCell.Width/this.scale,this.subCell.Height/this.scale));
+							resized.Save(outputDir + "cell_" + cellx + "_" + celly + "_subcell_" + subx + "_" + suby + "_full.png", System.Drawing.Imaging.ImageFormat.Png);
+
+							//this.subCell.Save(outputDir + "cell_" + cellx + "_" + celly + "_subcell_" + subx + "_" + suby + "_full.png", System.Drawing.Imaging.ImageFormat.Png);
 							gfx.Clear(Color.Transparent);
 						}
 					}