PLA pokeballs sprites for Pokemon Home.

Author: Mysticial

SerialPrograms/Source/Pokemon/Resources/Pokemon_PokeballNames.cpp

@@ -42,11 +42,17 @@ PokeballNameDatabase::PokeballNameDatabase(){
         std::string& slug = item.to_string_throw(path_slugs);
         ordered_list.emplace_back(slug);
 
-        JsonObject& languages = item_disp.get_object_throw(slug, path_disp);
-        std::string& display_name = languages.get_string_throw("eng", path_disp);
-
-        database[slug].m_display_name = display_name;
-        reverse_lookup[std::move(display_name)] = std::move(slug);
+        JsonObject* languages = item_disp.get_object(slug);
+        std::string* display_name;
+        if (languages != nullptr){
+            //  TODO: REMOVE: Display names for PLA balls.
+            display_name = &languages->get_string_throw("eng", path_disp);
+        }else{
+            display_name = &slug;
+        }
+
+        database[slug].m_display_name = *display_name;
+        reverse_lookup[*display_name] = slug;
     }
 }
 

SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp

@@ -22,8 +22,6 @@ PokeballSpriteMatcher::PokeballSpriteMatcher(double min_euclidean_distance)
         add(item.first, item.second.sprite);
     }
 }
-
-
 auto PokeballSpriteMatcher::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
     ImageStats border = image_border_stats(image);
     ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(

SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BallReader.cpp

@@ -4,24 +4,86 @@
  *
  */
 
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h"
-#include "PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "PokemonHome/Resources/PokemonHome_PokeballSprites.h"
+//#include "PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h"
+//#include "PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h"
 #include "PokemonHome_BallReader.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonHome{
 
 
+
+
+PokeballSpriteMatcher::PokeballSpriteMatcher(double min_euclidean_distance)
+    : CroppedImageDictionaryMatcher({1, 128})
+    , m_min_euclidean_distance_squared(min_euclidean_distance * min_euclidean_distance)
+{
+    for (const auto& item : PokemonHome::ALL_POKEBALL_SPRITES()){
+        add(item.first, remove_white_border(item.second.sprite));
+    }
+}
+ImageRGB32 PokeballSpriteMatcher::remove_white_border(const ImageViewRGB32& image){
+    using namespace Kernels::Waterfill;
+
+    ImageRGB32 ret = image.copy();
+    {
+        auto matrix = compress_rgb32_to_binary_range(ret, 0x00000000, 0x7f000000);
+        auto session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(200);
+        WaterfillObject object;
+        if (!iter->find_next(object, true)){
+            return ret;
+        }
+        filter_by_mask(object.packed_matrix(), ret, Color(0xffffffff), false);
+    }
+    {
+        auto matrix = compress_rgb32_to_binary_range(ret, 0x00808080, 0xffffffff);
+        auto session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(200);
+        WaterfillObject object;
+        if (!iter->find_next(object, true)){
+            return ret;
+        }
+        filter_by_mask(object.packed_matrix(), ret, Color(0x00000000), false);
+    }
+    return ret;
+}
+auto PokeballSpriteMatcher::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
+    ImageStats border = image_border_stats(image);
+    ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+        image,
+        [&](Color pixel){
+            double r = (double)pixel.red() - border.average.r;
+            double g = (double)pixel.green() - border.average.g;
+            double b = (double)pixel.blue() - border.average.b;
+            bool stop = r*r + g*g + b*b >= m_min_euclidean_distance_squared;
+            return stop;
+        }
+    );
+    std::vector<ImageViewRGB32> ret;
+    ret.emplace_back(extract_box_reference(image, box));
+    return ret;
+}
+
+
+
+
+
+
 const double BallReader::MAX_ALPHA = 0.40;
 const double BallReader::ALPHA_SPREAD = 0.02;
 
 
-const PokemonBDSP::PokeballSpriteMatcher& BALL_SPRITE_MATCHER(){
-    static PokemonBDSP::PokeballSpriteMatcher matcher;
+const PokeballSpriteMatcher& BALL_SPRITE_MATCHER(){
+    static PokeballSpriteMatcher matcher;
     return matcher;
 }
 

SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BallReader.h

@@ -8,6 +8,7 @@
 #define PokemonAutomation_PokemonHome_BallReader_H
 
 #include <string>
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "CommonFramework/Tools/VideoStream.h"
 #include "CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h"
@@ -17,6 +18,22 @@ namespace NintendoSwitch{
 namespace PokemonHome{
 
 
+
+class PokeballSpriteMatcher : public ImageMatch::CroppedImageDictionaryMatcher{
+public:
+    PokeballSpriteMatcher(double min_euclidean_distance = 100);
+
+private:
+    static ImageRGB32 remove_white_border(const ImageViewRGB32& image);
+    virtual std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const override;
+
+private:
+    double m_min_euclidean_distance_squared;
+};
+
+
+
+
 class BallReader{
     static const double MAX_ALPHA;
     static const double ALPHA_SPREAD;

SerialPrograms/Source/PokemonHome/Resources/PokemonHome_PokeballSprites.cpp

@@ -0,0 +1,23 @@
+/*  Pokemon Home Pokeball Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonHome_PokeballSprites.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+const SpriteDatabase& ALL_POKEBALL_SPRITES(){
+    static const SpriteDatabase database("PokemonHome/PokeballSprites.png", "PokemonHome/PokeballSprites.json");
+    return database;
+}
+
+
+
+}
+}
+}

SerialPrograms/Source/PokemonHome/Resources/PokemonHome_PokeballSprites.h

@@ -0,0 +1,24 @@
+/*  Pokemon s Pokeball Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_PokeballSprites_H
+#define PokemonAutomation_PokemonHome_PokeballSprites_H
+
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+const SpriteDatabase& ALL_POKEBALL_SPRITES();
+
+
+
+}
+}
+}
+#endif

SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp

@@ -26,11 +26,11 @@ StringSelectDatabase make_all_balls_database(){
 //        cout << "slug = " << slug << endl;
         const PokeballNames& data = get_pokeball_name(slug);
         const SpriteDatabase::Sprite* sprite = ALL_POKEBALL_SPRITES().get_nothrow(slug);
-        if (sprite == nullptr){
-            ret.add_entry(StringSelectEntry(slug, data.display_name()));
-            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
-        }else{
+        if (sprite != nullptr){
             ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
+        }else{
+//            ret.add_entry(StringSelectEntry(slug, data.display_name()));
+//            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
         }
     }
     return ret;