ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - be9989c2c66e

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Jason Maltzen - 6 years ago 2018-04-22 09:30:28
jason@hiddenachievement.com

Reduce the amount of debug output. Fix a crash when a potential window candidate is detected on the top row of the screen (which isn't possible). Break out of screen region tests early when the frame isn't detected to reduce how long a scan takes.

2 files changed with 37 insertions and 4 deletions:

MainWindow.cs

ReactionRecorder.cs

0 comments (0 inline, 0 general)

MainWindow.cs

➞

Show inline comments

@@ ... / @@ -45,145 +45,149 @@ public partial class MainWindow : Gtk.Wi @@
     CaptureView captureView;
 	public bool ShouldShutDown
+	{
 		get
+		{
 			return shouldShutDown;
+		}
+	}
 	public MainWindow () : base(Gtk.WindowType.Toplevel)
+	{
         string appDataPath = FileUtils.AppDataPath;
 		if (!System.IO.Directory.Exists(appDataPath))
+		{
 			System.IO.Directory.CreateDirectory(appDataPath);
+		}
 		DirectoryInfo di = new DirectoryInfo(appDataPath);
 		DirectoryInfo[] dirs = di.GetDirectories();
 		foreach (DirectoryInfo dir in dirs)
+		{
 			if (dir.Name != "template")
+			{
 				profileList.Add(dir.Name);
+			}
+		}
         string colorsPath = FileUtils.FindApplicationResourceFile("colors.txt");
         if (colorsPath == null)
+        {
             // failed to find colors.txt file
             MessageDialog md = new MessageDialog(this,
                 DialogFlags.DestroyWithParent,
                 MessageType.Error, ButtonsType.Close,
                 "Failed to find colors.txt file. Please check your installation.");
             md.Run();
             md.Destroy();
             Application.Quit();
+        }
 		Palette.Load(colorsPath);
         string ingredientsPath = FileUtils.FindApplicationResourceFile("ingredients.txt");
         if (ingredientsPath == null)
+        {
             // failed to find ingredients.txt file
             MessageDialog md = new MessageDialog(this,
                 DialogFlags.DestroyWithParent,
                 MessageType.Error, ButtonsType.Close,
                 "Failed to find ingredients.txt file. Please check your installation.");
             md.Run();
             md.Destroy();
             Application.Quit();
+        }
         ReagentManager.Load(ingredientsPath);
 		Build();
 		// get the root window
 		rootWindow = Gdk.Global.DefaultRootWindow;
 		// get its width and height
         int screenWidth;
         int screenHeight;
 		rootWindow.GetSize(out screenWidth, out screenHeight);
         int detectedScreenWidth;
         int detectedScreenHeight;
 		rootWindow.GetSize(out detectedScreenWidth, out detectedScreenHeight);
         int screenWidth = detectedScreenWidth;
         int screenHeight = detectedScreenHeight;
         int pixelMultiplier = 1;
         if ( DesertPaintLab.AppSettings.Load() == true )
+        {
             DesertPaintLab.AppSettings.Get("ScreenWidth", out screenWidth);
             DesertPaintLab.AppSettings.Get("ScreenHeight", out screenHeight);
             DesertPaintLab.AppSettings.Get("PixelMultiplier", out pixelMultiplier);
+        }
         bool enableDebugMenu;
         DesertPaintLab.AppSettings.Get("EnableDebugMenu", out enableDebugMenu);
         this.DebugAction.Visible = enableDebugMenu;
 		ScreenCheckDialog screenCheckDialog = new ScreenCheckDialog();
         // TODO: screenCheckDialog.DetectedWidth = detectedScreenWidth;
         // TODO: screenCheckDialog.DetectedHeight = detectedScreenHeight;
 		screenCheckDialog.ScreenWidth = screenWidth;
 		screenCheckDialog.ScreenHeight = screenHeight;
         screenCheckDialog.GamePixelWidth = pixelMultiplier;
 		ResponseType resp = (ResponseType)screenCheckDialog.Run();
         screenWidth = screenCheckDialog.ScreenWidth;
         screenHeight = screenCheckDialog.ScreenHeight;
         pixelMultiplier = screenCheckDialog.GamePixelWidth;
 		screenCheckDialog.Destroy();
         DesertPaintLab.AppSettings.Set("ScreenWidth", screenWidth);
         DesertPaintLab.AppSettings.Set("ScreenHeight", screenHeight);
         DesertPaintLab.AppSettings.Set("PixelMultiplier", pixelMultiplier);
         DesertPaintLab.AppSettings.Save();
 		screenBuffer = new Gdk.Pixbuf(Gdk.Colorspace.Rgb, false, 8, screenWidth, screenHeight);
         ReactionRecorder.Instance.SetPixelMultiplier(pixelMultiplier);
 		if (!OpenProfile())
+		{
 			shouldShutDown = true;
+		}
         captureView = new CaptureView(profile, screenBuffer);
         generatorView = new RecipeGeneratorView(profile);
         generatorView.SetStatus += OnStatusUpdate;
         generatorView.Started += OnGeneratorRunning;
         generatorView.Stopped += OnGeneratorStopped;
         simulatorView = new SimulatorView(profile);
         contentContainer.Add(captureView);
         captureView.Show();
+	}
 	bool ConfirmedExit()
+	{
 		if (unsavedData)
+		{
 			MessageDialog md = new MessageDialog(this,
 	            DialogFlags.DestroyWithParent,
 	            MessageType.Warning, ButtonsType.OkCancel,
 	            "Your last reaction was unsaved." +
 	            "Are you sure you want to quit?");
 			ResponseType resp = (ResponseType)md.Run();
 			md.Destroy();
 			return (resp == ResponseType.Ok);
+		}
 		return true;
+	}
     protected void OnStatusUpdate(object sender, EventArgs args)
+    {
         StatusUpdateEventArgs statusArgs = (StatusUpdateEventArgs)args;
         statusBar.Push(0, statusArgs.Status);
+    }
     protected void OnGeneratorRunning(object sender, EventArgs args)
+    {
         NewProfileAction.Sensitive = false;
         OpenProfileAction.Sensitive = false;
         ImportProfileAction.Sensitive = false;
         if (captureView != null)
+        {

ReactionRecorder.cs

➞

Show inline comments

@@ ... / @@ -131,154 +131,183 @@ namespace DesertPaintLab @@
         private bool IsDarkPixel(int r, int g, int b)
+        {
             return ((r < 0x46) && (g < 0x46) && (b < 0x47));
+        }
         private bool IsColorMatch(byte test_r, byte test_g, byte test_b, byte target_r, byte target_g, byte target_b)
+        {
             return ((Math.Abs(test_r - target_r) <= COLOR_TOLERANCE) &&
                 (Math.Abs(test_g - target_g) <= COLOR_TOLERANCE) &&
                 (Math.Abs(test_b - target_b) <= COLOR_TOLERANCE));
+        }
         unsafe private bool IsPossibleSwatchSlice(byte* pixBytes, int x, int y, int stride)
+        {
             int testPixelStart = (y * stride) + (x * 3);
             byte r = pixBytes[testPixelStart];
             byte g = pixBytes[testPixelStart+1];
             byte b = pixBytes[testPixelStart+2];
             bool isDarkPixel = false;
             //bool isPapyAbove = false;
             //bool isPapyBelow = false;
             // 1.) Check if the top pixel is a dark pixel.
             isDarkPixel = IsDarkPixel(r, g, b); // ((r < 0x46) && (g < 0x46) && (b < 0x46));
             //// 2.) Check the pixel above it to see if it's from the papy texture.
             //int otherPixelStart = testPixelStart - stride;
             //isPapyAbove = ((otherPixelStart >= 0) &&
             //    IsPapyTexture(pixBytes[otherPixelStart++], pixBytes[otherPixelStart++], pixBytes[otherPixelStart]));
             //// 3.) Check the pixel below where the swatch should be to see if it's also from the papy texture.
             //otherPixelStart = testPixelStart + (stride * swatchHeight);
             //isPapyBelow = (IsPapyTexture(pixBytes[otherPixelStart++], pixBytes[otherPixelStart++], pixBytes[otherPixelStart]));
             //bool result = isDarkPixel && isPapyAbove && isPapyBelow;
             bool result = isDarkPixel;
             // grab the swatch color
             int swatchColorStart = testPixelStart + (2 * pixelMultiplier * stride); // 2 rows below the test pixel, skipping the faded color
             r = pixBytes[swatchColorStart];
             g = pixBytes[swatchColorStart+1];
             b = pixBytes[swatchColorStart+2];
             // scan the column from 2 below the top to 2 above the bottom to ensure the color matches
             for (int i = (2*pixelMultiplier); result && (i < swatchHeight-(2*pixelMultiplier)); ++i)
+            {
                 int otherPixelStart = testPixelStart + (stride * i);
                 result &= IsColorMatch(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2], r, g, b);
+            }
             if (!result)
+            {
                 WriteLog("Swatch slice at {0}, {1} failed to match", x, y);
+            }
             return result;
+        }
         unsafe private bool IsPossibleSwatchUpperLeft(byte* pixBytes, int x, int y, int stride)
+        {
             int testPixelStart = (y * stride) + (x * 3);
             if (testPixelStart < stride)
+            {
                 return false;
+            }
             bool result = true;
             // test the left edge for dark pixels
             int i = 0;
             for (i = 0; result && (i < swatchHeight-pixelMultiplier); ++i)
+            {
                 int otherPixelStart = testPixelStart + (stride * i);
                 result &= IsDarkPixel(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
+            }
             if (!result)
+            {
                 // No dark border on the left side
                 // WriteLog("Failed to find left border for swatch at {0}, {1}", x, y);
                 return false;
+            }
             // test the dark top border and for papyrus above and below the swatch
             bool borderError = false;
             int papyErrorCount = 0;
             for (i = 0; result && (i < swatchWidth); ++i)
+            {
                 int otherPixelStart = testPixelStart + (3 * i);
                 result &= IsDarkPixel(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
                 bool isBorder = IsDarkPixel(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
                 result &= isBorder;
                 if (!isBorder)
+                {
                     borderError = true;
+                }
                 if (otherPixelStart >= stride)
+                {
                 otherPixelStart = otherPixelStart - stride;
                 papyErrorCount += (IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]) ? 0 : 1);
+                }
                 else
+                {
                     papyErrorCount++;
+                }
                 // Checking along the bottom of the swatch -
                 otherPixelStart = testPixelStart + (stride * swatchHeight) + (3 * i);
                 papyErrorCount += (IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]) ? 0 : 1);
+            }
             result &= (papyErrorCount < (swatchWidth / 20)); // allow up to 5% error rate checking for papy texture, because this seems to be inconsistent
             if (!result && ((i > (swatchWidth*0.8)) || (papyErrorCount >= (swatchWidth/20))))
+            {
                 if (!borderError && (papyErrorCount < swatchWidth))
+                {
                 WriteLog("Found a potential swatch candidate of width {0} at {1},{2} that had {3} failures matching papyrus texture", i, x, y, papyErrorCount);
+            }
+            }
             return result;
+        }
         unsafe public bool CaptureReaction(byte* pixBytes, int screenshotWidth, int screenshotHeight, int stride, ref PaintColor reactedColor, ref int redPixelStart)
+        {
             byte pixel_r, pixel_g, pixel_b;
             int pixelStart, otherPixelStart;
             bool colorMatch = true;
             for (int x = 0; x < screenshotWidth - colorBarWidth; ++x)
+            {
                 for (int y = 0; y < (screenshotHeight - (blueBarSpacing + 1)  /*53*/); ++y)
+                {
                     // Look for the color swatch.
                     pixelStart = (y * stride) + (x * 3);
                     pixel_r = pixBytes[pixelStart];
                     pixel_g = pixBytes[pixelStart + 1];
                     pixel_b = pixBytes[pixelStart + 2];
                     bool foundSwatch = IsPossibleSwatchUpperLeft(pixBytes, x, y, stride); // ((pixel_r < 0x46) && (pixel_g < 0x46) && (pixel_b < 0x46));
                     if (foundSwatch)
+                    {
                         int borderXOffset = 0;
                         for (borderXOffset = (2 * pixelMultiplier); foundSwatch && (borderXOffset < swatchTestWidth); ++borderXOffset)
+                        {
                             foundSwatch &= IsPossibleSwatchSlice(pixBytes, x + borderXOffset, y, stride);
                             foundSwatch &= IsPossibleSwatchSlice(pixBytes, x + swatchWidth - borderXOffset, y, stride);
+                        }
+                    }
                     if (foundSwatch)
+                    {
                         // found a swatch with an appropriate dark top border with papyrus texture above it and papyrus a jump below it
                         // 4.) Scan the left border of the potential swatch
                         // location.
                         colorMatch = true;
                         for (int i = 2; i < swatchHeight - (2 * pixelMultiplier); ++i)
+                        {
                             otherPixelStart = pixelStart + (stride * i);
                             if (!IsColorMatch(pixel_r, pixel_g, pixel_b, pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]))
+                            {
                                 colorMatch = false;
                                 break;
+                            }
+                        }
                         if (colorMatch)
+                        {
                             // WE FOUND THE SWATCH!
                             // Now we know where the color bars are.
                             redPixelStart = pixelStart + (redBarSpacing * stride);
                             int redPixelCount = 0;
                             while ((pixBytes[redPixelStart] > 0x9F) &&
                                    (pixBytes[redPixelStart + 1] < 0x62) &&
                                    (pixBytes[redPixelStart + 2]  < 0x62))
+                            {
                                 redPixelCount++;
                                 // pixBytes[redPixelStart] = 0x00;
                                 // pixBytes[redPixelStart + 1] = 0xFF;
                                 // pixBytes[redPixelStart + 2] = 0xFF;
                                 redPixelStart += 3;
+                            }
                             reactedColor.Red = (byte)Math.Round((float)redPixelCount * 255f / (float)colorBarWidth);

0 comments (0 inline, 0 general)