Add PLZA button detectors. Refactor waterfill routine to take input resolution for size normalization. Add bench reset routine.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -25,8 +25,8 @@ namespace PokemonAutomation{
 
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
-const int PROGRAM_VERSION_MINOR = 58;
-const int PROGRAM_VERSION_PATCH = 3;
+const int PROGRAM_VERSION_MINOR = 59;
+const int PROGRAM_VERSION_PATCH = 1;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.h

@@ -9,6 +9,7 @@
 
 #include <stdint.h>
 #include "Common/Compiler.h"
+#include "Common/Cpp/ImageResolution.h"
 
 namespace PokemonAutomation{
 
@@ -35,6 +36,7 @@ class ImageViewPlanar32{
     PA_FORCE_INLINE size_t          bytes_per_row   () const{ return m_bytes_per_row; }
     PA_FORCE_INLINE size_t          width           () const{ return m_width; }
     PA_FORCE_INLINE size_t          height          () const{ return m_height; }
+    PA_FORCE_INLINE Resolution      size            () const{ return Resolution(m_width, m_height); }
     PA_FORCE_INLINE size_t          total_pixels    () const{ return m_width * m_height; }
 
     //  Direct Pixel Access

SerialPrograms/Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp

@@ -77,8 +77,8 @@ WaterfillTemplateMatcher::WaterfillTemplateMatcher(
     }
 }
 
-double WaterfillTemplateMatcher::rmsd(const ImageViewRGB32& image) const{
-    if (!image || !check_image(image)){
+double WaterfillTemplateMatcher::rmsd(Resolution input_resolution, const ImageViewRGB32& image) const{
+    if (!image || !check_image(input_resolution, image)){
         return 99999.;
     }
     return m_matcher->rmsd(image);
@@ -125,7 +125,11 @@ bool WaterfillTemplateMatcher::check_area_ratio(double candidate_area_ratio) con
 
     return pass;
 }
-double WaterfillTemplateMatcher::rmsd_precropped(const ImageViewRGB32& cropped_image, const WaterfillObject& object) const{
+double WaterfillTemplateMatcher::rmsd_precropped(
+    Resolution input_resolution,
+    const ImageViewRGB32& cropped_image,
+    const WaterfillObject& object
+) const{
 
     // XXX
     // dump_debug_image(global_logger_command_line(), "CommonFramework/WaterfillTemplateMatcher", "rmsd_precropped_input", cropped_image);
@@ -142,7 +146,7 @@ double WaterfillTemplateMatcher::rmsd_precropped(const ImageViewRGB32& cropped_i
 //    static int c = 0;
 //    cout << c << endl;
 
-    double rmsd = this->rmsd(cropped_image);
+    double rmsd = this->rmsd(input_resolution, cropped_image);
 
 //    cout << "rmsd  = " << rmsd << endl;
 
@@ -153,7 +157,11 @@ double WaterfillTemplateMatcher::rmsd_precropped(const ImageViewRGB32& cropped_i
 
     return rmsd;
 }
-double WaterfillTemplateMatcher::rmsd_original(const ImageViewRGB32& original_image, const WaterfillObject& object) const{
+double WaterfillTemplateMatcher::rmsd_original(
+    Resolution input_resolution,
+    const ImageViewRGB32& original_image,
+    const WaterfillObject& object
+) const{
 
     if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
         cout << "rmsd_original()" << endl;
@@ -172,7 +180,10 @@ double WaterfillTemplateMatcher::rmsd_original(const ImageViewRGB32& original_im
         return 99999.;
     }
 
-    double rmsd = this->rmsd(extract_box_reference(original_image, object));
+    double rmsd = this->rmsd(
+        input_resolution,
+        extract_box_reference(original_image, object)
+    );
     if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
         cout << "Passed aspect and area ratio check, rmsd = " << rmsd << endl;
     }

SerialPrograms/Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.h

@@ -9,6 +9,7 @@
 
 #include <memory>
 #include "Common/Cpp/Color.h"
+#include "Common/Cpp/ImageResolution.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonTools/ImageMatch/ExactImageMatcher.h"
 
@@ -51,29 +52,37 @@ class WaterfillTemplateMatcher{
     //  In case the image is invalid, return a large value.
     //  It also calls the virtual function `check_image()` on the image.
     //  If the function returns false, then return a large value. 
-    double rmsd(const ImageViewRGB32& image) const;
+    double rmsd(Resolution input_resolution, const ImageViewRGB32& image) const;
 
     //  Compute RMSD of the object on the image against the template.
     //  The input `cropped_image` is already cropped from a full image using the bounding box of the input waterfill `object`.
     //  This cropped image is compared against the template as-is.
     //  The waterfill object's aspect ratio and area ratio are checked against template's. Return a large value 
     //  if the check fails.
     //  See `double rmsd(const ImageViewRGB32& image) const` on the details of comparing the image against the template.
-    virtual double rmsd_precropped(const ImageViewRGB32& cropped_image, const WaterfillObject& object) const;
+    virtual double rmsd_precropped(
+        Resolution input_resolution,
+        const ImageViewRGB32& cropped_image,
+        const WaterfillObject& object
+    ) const;
 
     //  Compute RMSD of the object on the image against the template.
     //  It will crop the original image using the bounding box of the waterfill object, then compare the cropped
     //  image against the template as-is.
     //  The waterfill object's aspect ratio and area ratio are checked against template's. Return a large value 
     //  if the check fails.
     //  See `double rmsd(const ImageViewRGB32& image) const` on the details of comparing the image against the template.
-    virtual double rmsd_original(const ImageViewRGB32& original_image, const WaterfillObject& object) const;
+    virtual double rmsd_original(
+        Resolution input_resolution,
+        const ImageViewRGB32& original_image,
+        const WaterfillObject& object
+    ) const;
 
     //  Return the image template mesh
     const ImageRGB32& image_template() const { return m_matcher->image_template(); }
 
 protected:
-    virtual bool check_image(const ImageViewRGB32& image) const{ return true; };
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const{ return true; };
     bool check_aspect_ratio(size_t candidate_width, size_t candidate_height) const;
     bool check_area_ratio(double candidate_area_ratio) const;
 

SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp

@@ -74,10 +74,11 @@ std::pair<PackedBinaryMatrix, size_t> remove_center_pixels(
 }
 
 bool match_template_by_waterfill(
-    const ImageViewRGB32 &image,
-    const ImageMatch::WaterfillTemplateMatcher &matcher,
-    const std::vector<std::pair<uint32_t, uint32_t>> &filters,
-    const std::pair<size_t, size_t> &area_thresholds,
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const ImageMatch::WaterfillTemplateMatcher& matcher,
+    const std::vector<std::pair<uint32_t, uint32_t>>& filters,
+    const std::pair<size_t, size_t>& area_thresholds,
     double rmsd_threshold,
     std::function<bool(Kernels::Waterfill::WaterfillObject& object)> check_matched_object)
 {
@@ -133,12 +134,13 @@ bool match_template_by_waterfill(
             if (object.area > area_thresholds.second){
                 continue;
             }
-            double rmsd = matcher.rmsd_original(image, object);
+            double rmsd = matcher.rmsd_original(input_resolution, image, object);
             if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
                 std::cout << "Object rmsd: " << rmsd << std::endl;
             }
 
             if (rmsd < rmsd_threshold){
+//                std::cout << "Object rmsd: " << rmsd << std::endl;
                 detected = true;
 
                 if (check_matched_object(object)){

SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.h

@@ -10,6 +10,7 @@
 
 #include <functional>
 #include <utility>
+#include "Common/Cpp/ImageResolution.h"
 #include "CommonFramework/ImageTypes/BinaryImage.h"
 
 namespace PokemonAutomation{
@@ -54,10 +55,11 @@ std::pair<PackedBinaryMatrix, size_t> remove_center_pixels(
 // check_matched_object: if a matcher is found, pass the matched object to this function. If the function returns true, stop the
 //   entire template matching operation.
 bool match_template_by_waterfill(
-    const ImageViewRGB32 &image,
-    const ImageMatch::WaterfillTemplateMatcher &matcher,
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const ImageMatch::WaterfillTemplateMatcher& matcher,
     const std::vector<std::pair<uint32_t, uint32_t>> &filters,
-    const std::pair<size_t, size_t> &area_thresholds,
+    const std::pair<size_t, size_t>& area_thresholds,
     double rmsd_threshold,
     std::function<bool(Kernels::Waterfill::WaterfillObject& object)> check_matched_object);
 

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -146,6 +146,7 @@
 #include "PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h"
 #include "PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
 #include "PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
 
 
 
@@ -274,6 +275,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 //    using namespace PokemonBDSP;
 //    using namespace PokemonLA;
 //    using namespace PokemonSV;
+    using namespace PokemonLZA;
 
     [[maybe_unused]] Logger& logger = env.logger();
     [[maybe_unused]] ConsoleHandle& console = env.consoles[0];
@@ -284,7 +286,13 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     VideoOverlaySet overlays(overlay);
 
 
+    while (true){
+        sit_on_bench(console, context);
+    }
+
+
 
+#if 0
     while (true){
         ssf_press_button(context, BUTTON_ZL, 160ms, 800ms, 200ms);
         ssf_press_button(context, BUTTON_PLUS, 320ms, 840ms);
@@ -293,7 +301,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
         pbf_press_button(context, BUTTON_X, 80ms, 24ms);
         pbf_press_button(context, BUTTON_B, 80ms, 24ms);
     }
-
+#endif
 
 
 #if 0

SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp

@@ -69,7 +69,11 @@ ArcDetector::ArcDetector()
         }
     )
 {}
-void ArcDetector::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
+void ArcDetector::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
     ImagePixelBox object_box;
     if (ArcMatcher::left().matches(object_box, image, object)){
         m_left.emplace_back(object_box);

SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h

@@ -18,7 +18,11 @@ namespace PokemonLA{
 class ArcDetector : public WhiteObjectDetector{
 public:
     ArcDetector();
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) override;
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) override;
     virtual void finish(const ImageViewRGB32& image) override;
 
 private:

SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp

@@ -45,7 +45,11 @@ ArcPhoneTracker::ArcPhoneTracker()
     )
 {}
 
-void ArcPhoneTracker::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
+void ArcPhoneTracker::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
 //    cout << "asdf" << endl;
 //    static int c = 0;
 //    cout << "c = " << c << endl;
@@ -60,7 +64,7 @@ void ArcPhoneTracker::process_object(const ImageViewRGB32& image, const Waterfil
 
 //    cout << (double)object.width() / image.width() << endl;
 
-    double rmsd = ArcPhoneMatcher::instance().rmsd_original(image, object);
+    double rmsd = ArcPhoneMatcher::instance().rmsd_original(input_resolution, image, object);
 //    cout << "rmsd = " << rmsd << endl;
     if (rmsd < 80){
 //        cout << "rmsd = " << rmsd << endl;