Improve star detection for SV tera cards.

Author: Mysticial

SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Types.h

@@ -11,6 +11,7 @@
 #include <stdint.h>
 //#include <map>
 //#include <iostream>
+#include "Common/Cpp/Rectangle.h"
 #include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h"
 
 namespace PokemonAutomation{
@@ -56,6 +57,10 @@ class WaterfillObject{
     double aspect_ratio() const{ return (double)width() / height(); }
     double area_ratio() const{ return (double)area / (width() * height()); }
 
+    Rectangle<size_t> rectangle() const{
+        return Rectangle<size_t>(min_x, min_y, max_x, max_y);
+    }
+
     // Note: `object` must be constructed before calling this function.
     std::unique_ptr<PackedBinaryMatrix_IB> packed_matrix() const{
         return object->submatrix(min_x, min_y, max_x - min_x, max_y - min_y);

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -269,8 +269,8 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     using namespace Pokemon;
 //    using namespace PokemonSwSh;
 //    using namespace PokemonBDSP;
-    using namespace PokemonLA;
-//    using namespace PokemonSV;
+//    using namespace PokemonLA;
+    using namespace PokemonSV;
 
     [[maybe_unused]] Logger& logger = env.logger();
     [[maybe_unused]] ConsoleHandle& console = env.consoles[0];
@@ -281,14 +281,24 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+//    ImageRGB32 image("screenshot-20250113-214042699528.png");
+    ImageRGB32 image("raidecho1.jpg");
+//    auto image = feed.snapshot();
+
+    TeraCardReader reader;
+    cout << (int)reader.stars(logger, env.program_info(), image) << endl;
+
+
+
+#if 0
     ImageRGB32 image("20250112-194339635973.png");
 
     PokemonBDSP::SelectionArrowFinder detector0(console, {0.50, 0.58, 0.40, 0.10}, COLOR_RED);
     PokemonBDSP::SelectionArrowFinder detector1(console, {0.50, 0.52, 0.40, 0.10}, COLOR_RED);
 
     cout << detector0.detect(image) << endl;
     cout << detector1.detect(image) << endl;
-
+#endif
 
 
 

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

@@ -6,6 +6,7 @@
 
 #include <cmath>
 #include <array>
+#include <list>
 #include <map>
 #include "Common/Cpp/PrettyPrint.h"
 //#include "Kernels/Waterfill/Kernels_Waterfill.h"
@@ -127,25 +128,80 @@ uint8_t TeraCardReader::stars(
 
     ImageViewRGB32 cropped = extract_box_reference(screen, m_stars);
 
-    {
-        ImageStats background = image_stats(extract_box_reference(screen, ImageFloatBox{0.55, 0.62, 0.20, 0.03}));
-        Color background_average = background.average.round();
+    ImageViewRGB32 background = extract_box_reference(screen, ImageFloatBox{0.55, 0.62, 0.20, 0.03});
+//        background.save("background.png");
+    ImageStats background_stats = image_stats(background);
+    Color background_average = background_stats.average.round();
+
+    //  Iterate through several difference distance filters and find how many
+    //  possible stars are in each one. Then do a majority vote.
+    const std::vector<double> DISTANCES{70, 80, 90, 100, 110, 120, 130};
+
+    std::map<size_t, size_t> count_map;
 
-        PackedBinaryMatrix matrix = compress_rgb32_to_binary_euclidean(cropped, (uint32_t)background_average, 100);
+    for (double distance : DISTANCES){
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_euclidean(cropped, (uint32_t)background_average, distance);
 
         matrix.invert();
 //        cout << matrix.dump() << endl;
         std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
         auto iter = session->make_iterator(100);
         WaterfillObject object;
-        size_t count = 0;
+
+        std::list<ImagePixelBox> objects;
         while (iter->find_next(object, false)){
-//            extract_box_reference(cropped, object).save("test-" + std::to_string(count) + ".png");
-            count++;
+            //  Attempt to merge with existing objects.
+            ImagePixelBox current(object);
+            bool changed;
+            do{
+                changed = false;
+                for (auto iter1 = objects.begin(); iter1 != objects.end();){
+                    if (current.overlaps_with(*iter1)){
+                        changed = true;
+                        current.merge_with(*iter1);
+                        objects.erase(iter1);
+                        break;
+                    }else{
+                        ++iter1;
+                    }
+                }
+            }while (changed);
+            objects.emplace_back(std::move(current));
         }
-        if (1 <= count && count <= 7){
-            return (uint8_t)count;
+
+#if 0
+        static size_t count = 0;
+        for (const ImagePixelBox& obj : objects){
+            extract_box_reference(cropped, obj).save("test-" + std::to_string(count++) + ".png");
         }
+        cout << "objects.size() = " << objects.size() << endl;
+#endif
+
+
+        count_map[objects.size()]++;
+    }
+
+    count_map.erase(0);
+
+    if (count_map.empty()){
+        dump_image(logger, info, "ReadStarsFailed", screen);
+        return 0;
+    }
+
+    auto best = count_map.begin();
+    for (auto iter = count_map.begin(); iter != count_map.end(); ++iter){
+        if (iter->first == 0){
+            continue;
+        }
+        if (iter->second > best->second){
+            best = iter;
+        }
+    }
+
+    size_t stars = best->first;
+
+    if (1 <= stars && stars <= 7){
+        return (uint8_t)stars;
     }
 
     dump_image(logger, info, "ReadStarsFailed", screen);