Improve the type detector for 6-star Tera Cards.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -270,10 +270,13 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 
     ImageRGB32 image("20250125-232444699636.png");
 
-    TeraSilhouetteReader reader;
-    ImageMatch::ImageMatchResult results = reader.read(image);
-    results.log(logger, 110);
+//    TeraSilhouetteReader reader;
+//    ImageMatch::ImageMatchResult results = reader.read(image);
+//    results.log(logger, 110);
 
+    TeraTypeReader reader;
+    ImageMatch::ImageMatchResult results = reader.read(image);
+    results.log(logger, 100);
 
 
 #if 0

SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp

@@ -77,7 +77,6 @@ ImageMatch::ImageMatchResult TeraSilhouetteReader::read(const ImageViewRGB32& sc
             preprocessed_image,
             // The filter is a lambda function that returns true on black silhouette pixels.
             [=](Color pixel){
-//                return (uint32_t)pixel.red() + pixel.green() + pixel.blue() < 200;
                 return (uint32_t)pixel.red() + pixel.green() + pixel.blue() < threshold;
             }
         );

SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp

@@ -41,28 +41,44 @@ ImageMatch::ImageMatchResult TeraTypeReader::read(const ImageViewRGB32& screen)
     static constexpr double MAX_ALPHA = 100;
     static constexpr double ALPHA_SPREAD = 20;
 
-    // Get a loose crop of the tera type icon
-    ImageViewRGB32 cropped_image = extract_box_reference(screen, m_box);
-    //cropped_image.save("cropped_image.png");
-
-    // Get a tight crop
-    const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
-        cropped_image,
-        // The filter is a lambda function that returns true on black tera type pixels.
-        [](Color pixel){
-            return (uint32_t)pixel.red() + pixel.green() + pixel.blue() < 200;
+    const std::vector<uint32_t> BRIGHTNESS_THRESHOLDS{
+        200,
+        150,
+        100,
+        125,
+        175,
+        225,
+    };
+
+    for (uint32_t threshold : BRIGHTNESS_THRESHOLDS){
+
+        // Get a loose crop of the tera type icon
+        ImageViewRGB32 cropped_image = extract_box_reference(screen, m_box);
+        //cropped_image.save("cropped_image.png");
+
+        // Get a tight crop
+        const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+            cropped_image,
+            // The filter is a lambda function that returns true on black tera type pixels.
+            [=](Color pixel){
+                return (uint32_t)pixel.red() + pixel.green() + pixel.blue() < threshold;
+            }
+        );
+        ImageRGB32 processed_image = extract_box_reference(cropped_image, tight_box).copy();
+        //processed_image.save("processed_image.png");
+
+        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, 0xff000000, 0xff5f5f5f, true);
+        //filtered_image.save("filtered_image.png");
+
+        ImageMatch::ImageMatchResult types = m_matcher.match(filtered_image, ALPHA_SPREAD);
+        types.clear_beyond_alpha(MAX_ALPHA);
+
+        if (types.results.size() == 1){
+            return types;
         }
-    );
-    ImageRGB32 processed_image = extract_box_reference(cropped_image, tight_box).copy();
-    //processed_image.save("processed_image.png");
-
-    ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, 0xff000000, 0xff5f5f5f, true);
-    //filtered_image.save("filtered_image.png");
-
-    ImageMatch::ImageMatchResult types = m_matcher.match(filtered_image, ALPHA_SPREAD);
-    types.clear_beyond_alpha(MAX_ALPHA);
+    }
 
-    return types;
+    return ImageMatch::ImageMatchResult();
 }