ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - e940c165aae5

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen - 6 years ago 2018-05-03 04:11:51
jason@hiddenachievement.com

Fix bar widths on reaction recorder

1 file changed with 6 insertions and 3 deletions:

ReactionRecorder.cs

0 comments (0 inline, 0 general)

ReactionRecorder.cs

➞

Show inline comments

@@ ... / @@ -26,18 +26,18 @@ using System.IO; @@
 namespace DesertPaintLab
+{
     // ReactionRecorder - business logic for recording paint reactions
     public class ReactionRecorder
+    {
         const int COLOR_TOLERANCE = 3;
         const int DEFAULT_SWATCH_HEIGHT = 24; // including top and bottom borders
         const int DEFAULT_SWATCH_WIDTH = 260;
         const int DEFAULT_COLOR_BAR_WIDTH = 306;
         const int DEFAULT_SWATCH_WIDTH = 274;
         const int DEFAULT_COLOR_BAR_WIDTH = 320;
         const int DEFAULT_RED_BAR_SPACING = 32;
         const int DEFAULT_GREEN_BAR_SPACING = 42;
         const int DEFAULT_BLUE_BAR_SPACING = 52;
         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;
@@ ... / @@ -305,49 +305,52 @@ namespace DesertPaintLab @@
                            (pixBytes[redPixelStart + 2] < 0x62))
+                    {
                         redPixelCount++;
                         // pixBytes[redPixelStart] = 0x00;
                         // pixBytes[redPixelStart + 1] = 0xFF;
                         // pixBytes[redPixelStart + 2] = 0xFF;
                         redPixelStart += 3;
+                    }
                     WriteLog("Color {0}, {1}, {2} is no longer red at {3},{4}", pixBytes[redPixelStart], pixBytes[redPixelStart + 1], pixBytes[redPixelStart + 2], (redPixelStart % stride)/3, redPixelStart / stride);
                     reactedColor.Red = (byte)Math.Round((float)redPixelCount * 255f / (float)colorBarWidth);
                     int greenPixelStart = pixelStart + (greenBarSpacing * stride);
                     int greenPixelCount = 0;
                     while ((pixBytes[greenPixelStart] < 0x62) &&
                            (pixBytes[greenPixelStart + 1] > 0x9F) &&
                            (pixBytes[greenPixelStart + 2] < 0x62))
+                    {
                         greenPixelCount++;
                         // pixBytes[greenPixelStart] = 0x00;
                         // pixBytes[greenPixelStart + 1] = 0xFF;
                         // pixBytes[greenPixelStart + 2] = 0xFF;
                         greenPixelStart += 3;
+                    }
                     WriteLog("Color {0}, {1}, {2} is no longer green at pixel offset {3},{4}", pixBytes[greenPixelStart], pixBytes[greenPixelStart + 1], pixBytes[greenPixelStart + 2], (greenPixelStart % stride)/3, redPixelStart / stride);
                     reactedColor.Green = (byte)Math.Round((float)greenPixelCount * 255f / (float)colorBarWidth);
                     int bluePixelStart = pixelStart + (blueBarSpacing * stride);
                     int bluePixelCount = 0;
                     while ((pixBytes[bluePixelStart] < 0x62) &&
                         (pixBytes[bluePixelStart + 1] < 0x62) &&
                         (pixBytes[bluePixelStart + 2] > 0x9F))
+                    {
                         bluePixelCount++;
                         // pixBytes[bluePixelStart] = 0x00;
                         // pixBytes[bluePixelStart + 1] = 0xFF;
                         // pixBytes[bluePixelStart + 2] = 0xFF;
                         bluePixelStart += 3;
+                    }
                     WriteLog("Color {0}, {1}, {2} is no longer blue at pixel offset {3},{4}", pixBytes[bluePixelStart], pixBytes[bluePixelStart + 1], pixBytes[bluePixelStart + 2], (bluePixelStart % stride)/3, bluePixelStart / stride);
                     reactedColor.Blue = (byte)Math.Round((float)bluePixelCount * 255f / (float)colorBarWidth);
-                    WriteLog("Found the color swatch at {0}, {1}. Color={2}", x, y, reactedColor);
+                    WriteLog("Found the color swatch at {0}, {1}. Color={2} Red={3}px Green={4}px Blue={5}px", x, y, reactedColor, redPixelCount, greenPixelCount, bluePixelCount);
                     return true;
+                }
+            }
             return false;
+        }
         unsafe public bool CaptureReaction(byte* pixBytes, int screenshotWidth, int screenshotHeight, int stride, ref PaintColor reactedColor, ref int redPixelStart)
+        {

0 comments (0 inline, 0 general)