Optimised the conversion with a palette

Zarbuz · May 12, 2020 · f26926a · f26926a
1 parent 86c1247
commit f26926a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 6 deletions.
diff --git a/SchematicToVoxCore/Schematics/PaletteSchematicConverter.cs b/SchematicToVoxCore/Schematics/PaletteSchematicConverter.cs
@@ -35,12 +35,24 @@ public Schematic ConvertSchematic(Schematic schematic)
 		{
 			Console.WriteLine("[LOG] Started to convert all colors of blocks to match the palette");
 			Schematic newSchematic = new Schematic(schematic.Width, schematic.Height, schematic.Length, new HashSet<Block>());
-			foreach (Block block in schematic.Blocks)
+			List<uint> colors = schematic.Colors;
+			Dictionary<uint, int> paletteDictionary = new Dictionary<uint, int>();
+			foreach (uint color in colors)
 			{
-				Color color = block.Color.UIntToColor();
-				int index = ColorComparison.CompareColorAll(_colors, color);
-				newSchematic.Blocks.Add(new Block(block.X, block.Y, block.Z, _colors[index].ColorToUInt(), index));
+				int index = ColorComparison.CompareColorAll(_colors, color.UIntToColor());
+				paletteDictionary[color] = index;
 			}
+
+			using (ProgressBar progressbar = new ProgressBar())
+			{
+				int i = 0;
+				foreach (Block block in schematic.Blocks)
+				{
+					newSchematic.Blocks.Add(new Block(block.X, block.Y, block.Z, _colors[paletteDictionary[block.Color]].ColorToUInt(), paletteDictionary[block.Color]));
+					progressbar.Report(i++ / (float)schematic.Blocks.Count);
+				}
+			}
+
 			Console.WriteLine("[LOG] Done.");
 			return newSchematic;
 		}

diff --git a/SchematicToVoxCore/Schematics/Schematic.cs b/SchematicToVoxCore/Schematics/Schematic.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
 
 namespace FileToVox.Schematics
 {
@@ -26,7 +28,19 @@ public Schematic(ushort width, ushort height, ushort length, HashSet<Block> bloc
         {
             Blocks = blocks;
         }
-
-
+
+        public List<uint> Colors
+        {
+	        get
+	        {
+                List<uint> colors = new List<uint>();
+                foreach (Block block in Blocks.Where(block => !colors.Contains(block.Color)))
+                {
+	                colors.Add(block.Color);
+                }
+
+                return colors;
+	        }
+        }
     }
 }