Add proper white dialog detector.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -316,12 +316,12 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     using namespace OCR;
     using namespace NintendoSwitch;
     using namespace Pokemon;
-//    using namespace PokemonSwSh;
+    using namespace PokemonSwSh;
 //    using namespace PokemonBDSP;
 //    using namespace PokemonLA;
 //    using namespace PokemonSV;
 //    using namespace PokemonLZA;
-    using namespace PokemonFRLG;
+//    using namespace PokemonFRLG;
 
     [[maybe_unused]] Logger& logger = env.logger();
     [[maybe_unused]] ConsoleHandle& console = env.consoles[0];
@@ -333,6 +333,14 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+    auto snapshot = feed.snapshot();
+
+    WhiteDialogBoxDetector detector;
+    detector.make_overlays(overlays);
+    cout << detector.detect(snapshot) << endl;
+
+
+#if 0
     RumbleWatcher<ProController> rumble(context, 200);
     int ret = wait_until(
         console, context,
@@ -344,6 +352,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     }else{
         cout << "Did not detect anything." << endl;
     }
+#endif
 
 
 #if 0

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp

@@ -65,6 +65,33 @@ bool BlackDialogBoxDetector::process_frame(const ImageViewRGB32& frame, WallCloc
 
 
 
+WhiteDialogBoxDetector::WhiteDialogBoxDetector(Color color)
+    : m_color(color)
+    , m_right(0.782, 0.850, 0.030, 0.050)
+    , m_triangle(color)
+{}
+
+void WhiteDialogBoxDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_right);
+    m_triangle.make_overlays(items);
+}
+bool WhiteDialogBoxDetector::detect(const ImageViewRGB32& screen){
+    ImageStats right = image_stats(extract_box_reference(screen, m_right));
+    if (!is_grey(right, 400, 1000)){
+        return false;
+    }
+
+    if (!m_triangle.detect(screen)){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+
 
 }
 }

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h

@@ -8,7 +8,11 @@
 #define PokemonAutomation_PokemonSwSh_DialogBoxDetector_H
 
 #include <atomic>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
 #include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "PokemonSwSh_DialogTriangleDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -25,7 +29,6 @@ class BlackDialogBoxDetector : public VisualInferenceCallback{
     }
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-
     virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
 
 private:
@@ -35,6 +38,26 @@ class BlackDialogBoxDetector : public VisualInferenceCallback{
 };
 
 
+class WhiteDialogBoxDetector : public StaticScreenDetector{
+public:
+    WhiteDialogBoxDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_right;
+    DialogTriangleDetector m_triangle;
+};
+class WhiteDialogBoxWatcher : public DetectorToFinder<WhiteDialogBoxDetector>{
+public:
+    WhiteDialogBoxWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("WhiteDialogBoxWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
 
 
 

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp

@@ -22,10 +22,7 @@ namespace NintendoSwitch{
 namespace PokemonSwSh{
 
 
-namespace{
-    // This box covers all possible locations of the black triangle arrow
-    ImageFloatBox BLACK_TRIANGLE_BOX{0.771, 0.901, 0.031, 0.069};
-}
+
 
 class DialogTriangleMatcher : public ImageMatch::WaterfillTemplateMatcher{
 public:
@@ -53,20 +50,58 @@ const DialogTriangleMatcher& DialogTriangleMatcher::instance(){
 
 
 
+
 DialogTriangleDetector::DialogTriangleDetector(
+    Color color,
+    ImageFloatBox box
+)
+    : m_color(color)
+    , m_box(box)
+{}
+
+void DialogTriangleDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool DialogTriangleDetector::detect(const ImageViewRGB32& screen){
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(0, 0, 0), combine_rgb(50, 50, 50)}
+    };
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 500.0);
+
+    return match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        DialogTriangleMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        80,
+        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
+    );
+}
+
+
+
+
+
+#if 0
+
+
+DialogTriangleWatcher::DialogTriangleWatcher(
     Logger& logger, VideoOverlay& overlay,
     bool stop_on_detected
 )
-    : VisualInferenceCallback("DialogTriangleDetector")
+    : VisualInferenceCallback("DialogTriangleWatcher")
     , m_logger(logger)
     , m_stop_on_detected(stop_on_detected)
 {}
 
 
-void DialogTriangleDetector::make_overlays(VideoOverlaySet& items) const{
+void DialogTriangleWatcher::make_overlays(VideoOverlaySet& items) const{
     items.add(COLOR_RED, BLACK_TRIANGLE_BOX);
 }
-bool DialogTriangleDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+bool DialogTriangleWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
     const std::vector<std::pair<uint32_t, uint32_t>> filters = {
         {combine_rgb(0, 0, 0), combine_rgb(50, 50, 50)}
     };
@@ -100,7 +135,7 @@ bool DialogTriangleDetector::process_frame(const ImageViewRGB32& frame, WallCloc
     return detected && m_stop_on_detected;
 }
 
-
+#endif
 
 
 

SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h

@@ -7,9 +7,9 @@
 #ifndef PokemonAutomation_PokemonSwSh_DialogTriangleDetector_H
 #define PokemonAutomation_PokemonSwSh_DialogTriangleDetector_H
 
-#include <atomic>
-#include "Common/Cpp/Logging/AbstractLogger.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
 #include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
@@ -19,28 +19,26 @@ namespace PokemonSwSh{
 
 // Detect the black triangle arrow in the lower right portion of the white dialog box.
 // The dialog box shows up when talking to npcs.
-class DialogTriangleDetector : public VisualInferenceCallback{
+class DialogTriangleDetector : public StaticScreenDetector{
 public:
     DialogTriangleDetector(
-        Logger& logger, VideoOverlay& overlay,
-        bool stop_on_detected
+        Color color,
+        ImageFloatBox box = {0.771, 0.901, 0.031, 0.069}
     );
 
-    bool detected() const{
-        return m_detected.load(std::memory_order_acquire);
-    }
-
     virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
-    Logger& m_logger;
-    bool m_stop_on_detected;
-
-    std::atomic<bool> m_detected;
+    Color m_color;
+    ImageFloatBox m_box;
+};
+class DialogTriangleWatcher : public DetectorToFinder<DialogTriangleDetector>{
+public:
+    DialogTriangleWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("DialogTriangleWatcher", std::chrono::milliseconds(250), color)
+    {}
 };
-
 
 
 

SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp

@@ -50,8 +50,8 @@ StateMachineAction mash_A_to_entrance(
 
         EntranceDetector entrance_detector(entrance);
         SelectionArrowFinder prompt(stream.overlay(), {0.362689, 0.282828, 0.625000, 0.580808});
-        DialogTriangleDetector triangle(stream.logger(), stream.overlay(), true);
-        BlackDialogBoxDetector dialog(true);
+        WhiteDialogBoxWatcher white_dialog;
+        BlackDialogBoxDetector black_dialog(true);
         ReceivePokemonWatcher receive(COLOR_RED);
 
         context.wait_for_all_requests();
@@ -61,8 +61,8 @@ StateMachineAction mash_A_to_entrance(
             {
                 entrance_detector,
                 prompt,
-                triangle,
-                dialog,
+                white_dialog,
+                black_dialog,
                 receive,
             },
             INFERENCE_RATE

SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.cpp

@@ -103,7 +103,7 @@ void WattTraderFarmer::buy_one(SingleSwitchProgramEnvironment& env, ProControlle
 
     bool purchased = false;
     while (true){
-        DialogTriangleDetector dialog(env.logger(), env.console, true);
+        DialogTriangleWatcher dialog;
         BuyCursorDetector item_select(env.console);
         BuyQuantityDetector quantity;
         context.wait_for_all_requests();

SerialPrograms/Source/Tests/PokemonSwSh_Tests.cpp

@@ -55,12 +55,7 @@ int test_pokemonSwSh_MaxLair_BattleMenuDetector(const ImageViewRGB32& image, boo
 }
 
 int test_pokemonSwSh_DialogTriangleDetector(const ImageViewRGB32& image, bool target){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-    const bool stop_on_detected = true;
-
-    DialogTriangleDetector detector(logger, overlay, stop_on_detected);
-
+    DialogTriangleWatcher detector;
     bool result = detector.process_frame(image, current_time());
     TEST_RESULT_EQUAL(result, target);
     return 0;