Adding Dispose to parsers.

PixelVision8 · Feb 5, 2020 · 3cdcb4c · 3cdcb4c
1 parent c060f36
commit 3cdcb4c
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 2 deletions.
diff --git a/Runners/PixelVision8/Runner/Exporters/ColorPaletteExporter.cs b/Runners/PixelVision8/Runner/Exporters/ColorPaletteExporter.cs
@@ -78,6 +78,18 @@ public void NextStep()
             exporter.NextStep();
         }
 
+        public void StepCompleted()
+        {
+            exporter.StepCompleted();
+        }
+
+        public void Dispose()
+        {
+            exporter.Dispose();
+            colorChip = null;
+            exporter = null;
+        }
+
         public byte[] bytes => exporter.bytes;
 
         public string fileName => exporter.fileName;

diff --git a/Runners/PixelVision8/Runner/Exporters/SpriteExporter.cs b/Runners/PixelVision8/Runner/Exporters/SpriteExporter.cs
@@ -65,6 +65,20 @@ public void NextStep()
             exporter.NextStep();
         }
 
+        public void StepCompleted()
+        {
+            exporter.StepCompleted();
+        }
+
+        public void Dispose()
+        {
+            exporter.Dispose();
+            engine = null;
+            spriteChip = null;
+            imageExporter = null;
+            exporter = null;
+        }
+
         public byte[] bytes => exporter.bytes;
 
         public string fileName => exporter.fileName;

diff --git a/SDK/Runner/Parsers/AbstractParser.cs b/SDK/Runner/Parsers/AbstractParser.cs
@@ -70,5 +70,12 @@ public virtual void StepCompleted()
         {
             currentStep++;
         }
+
+        public virtual void Dispose()
+        {
+            bytes = null;
+            FileLoadHelper = null;
+            steps.Clear();
+        }
     }
 }
diff --git a/SDK/Runner/Parsers/IAbstractParser.cs b/SDK/Runner/Parsers/IAbstractParser.cs
@@ -26,5 +26,8 @@ public interface IAbstractParser
         bool completed { get; }
         void CalculateSteps();
         void NextStep();
+        void StepCompleted();
+        void Dispose();
+
     }
 }
diff --git a/SDK/Runner/Parsers/IImageParser.cs b/SDK/Runner/Parsers/IImageParser.cs
@@ -33,5 +33,6 @@ public interface IImageParser
         void ReadHeader();
         void ReadStream();
         void ReadBytes(byte[] bytes);
+        void Dispose();
     }
 }
diff --git a/SDK/Runner/Parsers/ImageParser.cs b/SDK/Runner/Parsers/ImageParser.cs
@@ -48,5 +48,11 @@ public void ParseImageData()
 
             currentStep++;
         }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+            imageParser = null;
+        }
     }
 }
diff --git a/SDK/Runner/Parsers/PNGReader.cs b/SDK/Runner/Parsers/PNGReader.cs
@@ -358,5 +358,17 @@ private int CalculateBytesPerPixel()
                     throw new Exception("Unknown color type.");
             }
         }
+
+        public void Dispose()
+        {
+            _colorPalette.Clear();
+            _colors = null;
+            bytes = null;
+            chunks.Clear();
+            dataChunks.Clear();
+            memoryStream.Dispose();
+            palette = null;
+            pixels = null;
+        }
     }
 }
diff --git a/SDK/Runner/Parsers/SpriteParser.cs b/SDK/Runner/Parsers/SpriteParser.cs
@@ -277,5 +277,12 @@ public virtual void ConvertColorsToIndexes(int totalColors)
                 spriteData[i] = tmpRefID;
             }
         }
+
+        public override void Dispose()
+        {
+            base.Dispose();
+            chips = null;
+            spriteChip = null;
+        }
     }
 }
diff --git a/SDK/Runner/Services/LoadService.cs b/SDK/Runner/Services/LoadService.cs
@@ -189,19 +189,29 @@ public void AddParser(IAbstractParser parser)
         public void LoadAll()
         {
             while (Completed == false) NextParser();
+
+            parsers.Clear();
         }
 
         public void NextParser()
         {
-            if (Completed) return;
+            if (Completed)
+            {
+                parsers.Clear(); 
+                return;
+            }
 
             var parser = parsers[currentParserID];
 
             parser.NextStep();
 
             currentStep++;
 
-            if (parser.completed) currentParserID++;
+            if (parser.completed)
+            {
+                parser.Dispose();
+                currentParserID++;
+            }
         }
 
         public void StartLoading()