ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - 532e5f429c0f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Tess Snider (Malkyne) - 6 years ago 2018-04-26 04:48:53
this@malkyne.org

DPL should no longer scan entire screenshot, when the Pigment Lab dialog
has already been found, unless it has been moved.

1 file changed with 35 insertions and 5 deletions:

ReactionRecorder.cs

0 comments (0 inline, 0 general)

ReactionRecorder.cs

➞

Show inline comments

@@ ... / @@ -39,24 +39,28 @@ namespace DesertPaintLab @@
         const int DEFAULT_SWATCH_TEST_WIDTH = 26; // width to test on ends of swatch (10% on either end)
         int swatchHeight = DEFAULT_SWATCH_HEIGHT;
         int swatchWidth = DEFAULT_SWATCH_WIDTH;
         int swatchTestWidth = DEFAULT_SWATCH_TEST_WIDTH;
         int colorBarWidth = DEFAULT_COLOR_BAR_WIDTH;
         int redBarSpacing = DEFAULT_RED_BAR_SPACING;
         int greenBarSpacing = DEFAULT_GREEN_BAR_SPACING;
         int blueBarSpacing = DEFAULT_BLUE_BAR_SPACING;
         int pixelMultiplier = 1;
         bool firstRun = true;
         int lastSwatchX = -1;
         int lastSwatchY = -1;
         private static ReactionRecorder _instance;
         public static ReactionRecorder Instance
+        {
             get {
                 if (_instance == null)
+                {
                     _instance = new ReactionRecorder();
+                }
                 return _instance;
+            }
+        }
@@ ... / @@ -242,33 +246,30 @@ namespace DesertPaintLab @@
             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)
+        unsafe private bool TestPosition(int x, int y, 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)
+                        {
@@ ... / @@ -336,24 +337,53 @@ namespace DesertPaintLab @@
                                 bluePixelCount++;
                                 // pixBytes[bluePixelStart] = 0x00;
                                 // pixBytes[bluePixelStart + 1] = 0xFF;
                                 // pixBytes[bluePixelStart + 2] = 0xFF;
                                 bluePixelStart += 3;
+                            }
                             reactedColor.Blue = (byte)Math.Round((float)bluePixelCount * 255f / (float)colorBarWidth);
                             WriteLog("Found the color swatch at {0}, {1}. Color={2}", x, y, reactedColor);
                             return true;
+                        }
+                    }
             return false;
+        }
         unsafe public bool CaptureReaction(byte* pixBytes, int screenshotWidth, int screenshotHeight, int stride, ref PaintColor reactedColor, ref int redPixelStart)
+        {
             if (!firstRun)
+            {
                 // If this is not the first run, let's check the last location, to see if the UI is still there.
                 if (TestPosition(lastSwatchX, lastSwatchY, pixBytes, screenshotWidth, screenshotHeight, stride, ref reactedColor, ref redPixelStart))
+                {
                     return true;
+                }
                 else
+                {
                     firstRun = true;
+                }
+            }
             for (int x = 0; x < screenshotWidth - colorBarWidth; ++x)
+            {
                 for (int y = 0; y < (screenshotHeight - (blueBarSpacing + 1)  /*53*/); ++y)
+                {
                     if (TestPosition(x, y, pixBytes, screenshotWidth, screenshotHeight, stride, ref reactedColor, ref redPixelStart))
+                    {
                         lastSwatchX = x;
                         lastSwatchY = y;
                         firstRun = false;
                         return true;
+                    }
+                }
+            }
             return false;
+        }
         public bool RecordReaction(PlayerProfile profile, PaintColor expectedColor, PaintColor reactedColor, Reagent[] reagents)
+        {
             bool saved = false;
             int r, g, b;
             if (reagents[2] != null)
+            {
                 // A 3-reagent reaction.

0 comments (0 inline, 0 general)