ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - eee2a6a0c86b

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Jason Maltzen (jmaltzen) - 9 years ago 2016-03-04 06:23:05
jason.maltzen@unsanctioned.net

Loosen checks on testing for papyrus texture some more. Allow for a bit of error there, as long as everything else checks out.

3 files changed with 20 insertions and 17 deletions:

MainWindow.cs

ReactionRecorder.cs

gtk-gui/MainWindow.cs

0 comments (0 inline, 0 general)

MainWindow.cs

➞

Show inline comments

@@ ... / @@ -26,13 +26,13 @@ using System.Collections.Generic; @@
 using System.Text.RegularExpressions;
 using Gtk;
 using DesertPaintLab;
 public partial class MainWindow : Gtk.Window
+{
-    const string APP_VERSION = "1.7.13";
+    const string APP_VERSION = "1.7.14";
 	bool unsavedData = false;
 	bool shouldShutDown = false;
 	List<string> profileList = new List<string>();
 	PlayerProfile profile = null;

ReactionRecorder.cs

➞

Show inline comments

@@ ... / @@ -93,39 +93,40 @@ namespace DesertPaintLab @@
             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;
             //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]));
             //// 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]));
             //// 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 && 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)
+            {
                 otherPixelStart = testPixelStart + (stride * i);
+                int otherPixelStart = testPixelStart + (stride * i);
                 result &= IsColorMatch(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2], r, g, b);
+            }
             return result;
+        }
@@ ... / @@ -138,21 +139,23 @@ namespace DesertPaintLab @@
             for (int i = 0; result && (i < swatchHeight-pixelMultiplier); ++i)
+            {
                 int otherPixelStart = testPixelStart + (stride * i);
                 result &= IsDarkPixel(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
+            }
             // test the dark top border and for papyrus below the swatch
             // test the dark top border and for papyrus above and below the swatch
             int papyErrorCount = 0;
             for (int i = 0; result && (i < swatchWidth); ++i)
+            {
                 int otherPixelStart = testPixelStart + (3 * i);
                 result &= IsDarkPixel(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
                 otherPixelStart = otherPixelStart - stride;
-                result &= IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
+                papyErrorCount += (IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]) ? 1 : 0);
                 otherPixelStart = testPixelStart + (stride * swatchHeight) + (3 * i);
                 result &= IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]);
                 papyErrorCount += (IsPapyTexture(pixBytes[otherPixelStart], pixBytes[otherPixelStart+1], pixBytes[otherPixelStart+2]) ? 1 : 0);
                 result &= (papyErrorCount < (swatchWidth / 20)); // allow up to 5% error rate checking for papy texture, because this seems to be inconsistent
+            }
             return result;
+        }
         unsafe public static bool CaptureReaction(byte* pixBytes, int screenshotWidth, int screenshotHeight, int stride, ref PaintColor reactedColor, ref int redPixelStart)
@@ ... / @@ -184,13 +187,13 @@ namespace DesertPaintLab @@
                     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 = 1; i < swatchHeight - 2; ++i)
+                        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;

gtk-gui/MainWindow.cs

➞

Show inline comments

@@ ... / @@ -89,13 +89,13 @@ public partial class MainWindow @@
 		w1.Add (this.CaptureAction, null);
 		this.SimulatorAction = new global::Gtk.RadioAction ("SimulatorAction", "Simulator", null, null, 0);
 		this.SimulatorAction.Group = this.CaptureAction.Group;
 		this.SimulatorAction.ShortLabel = "Simulator";
 		w1.Add (this.SimulatorAction, null);
 		this.RecipeGeneratorAction = new global::Gtk.RadioAction ("RecipeGeneratorAction", "Recipe Generator", null, null, 0);
-		this.RecipeGeneratorAction.Group = this.SimulatorAction.Group;
+		this.RecipeGeneratorAction.Group = this.CaptureAction.Group;
 		this.RecipeGeneratorAction.ShortLabel = "Recipe Generator";
 		w1.Add (this.RecipeGeneratorAction, null);
 		this.RecipesAction = new global::Gtk.Action ("RecipesAction", "Recipes...", null, null);
 		this.RecipesAction.ShortLabel = "Recipes...";
 		w1.Add (this.RecipesAction, null);
 		this.ExportRecipesAction = new global::Gtk.Action ("ExportRecipesAction", "Export Recipes", null, null);

0 comments (0 inline, 0 general)