Shiny detection should not be sensitive to resolution.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -26,7 +26,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 54;
-const int PROGRAM_VERSION_PATCH = 7;
+const int PROGRAM_VERSION_PATCH = 8;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.h

@@ -35,6 +35,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 size_t          total_pixels    () const{ return m_width * m_height; }
 
     //  Direct Pixel Access
     PA_FORCE_INLINE uint32_t pixel(size_t x, size_t y) const{

SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.h

@@ -33,6 +33,7 @@ class ImageViewRGB32 : public ImageViewPlanar32{
     using ImageViewPlanar32::bytes_per_row;
     using ImageViewPlanar32::width;
     using ImageViewPlanar32::height;
+    using ImageViewPlanar32::total_pixels;
 
     //  Direct Pixel Access
     PA_FORCE_INLINE uint32_t pixel(size_t x, size_t y) const{

SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp

@@ -31,7 +31,7 @@ void ShinySparkleTracker::make_overlays(VideoOverlaySet& items) const{
 }
 bool ShinySparkleTracker::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
     ImageViewRGB32 image = extract_box_reference(frame, m_box);
-    m_current_sparkles.read_from_image(image);
+    m_current_sparkles.read_from_image(frame.total_pixels(), image);
     m_overlays.clear();
     m_current_sparkles.draw_boxes(m_overlays, frame, m_box);
     std::string log_str = m_current_sparkles.to_str();

SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.h

@@ -23,7 +23,7 @@ class ShinySparkleSet{
 
     virtual std::string to_str() const = 0;
 
-    virtual void read_from_image(const ImageViewRGB32& image) = 0;
+    virtual void read_from_image(size_t screen_area, const ImageViewRGB32& image) = 0;
     virtual void draw_boxes(
         VideoOverlaySet& overlays,
         const ImageViewRGB32& frame,

SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.cpp

@@ -84,12 +84,12 @@ void ShinySparkleSetBDSP::update_alphas(){
 
 
 
-ShinySparkleSetBDSP find_sparkles(WaterfillSession& session){
+ShinySparkleSetBDSP find_sparkles(size_t screen_area, WaterfillSession& session){
     ShinySparkleSetBDSP sparkles;
     auto finder = session.make_iterator(20);
     WaterfillObject object;
     while (finder->find_next(object, true)){
-        PokemonSwSh::RadialSparkleDetector radial_sparkle(object);
+        PokemonSwSh::RadialSparkleDetector radial_sparkle(screen_area, object);
         if (radial_sparkle.is_ball()){
             sparkles.balls.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
             continue;
@@ -101,7 +101,7 @@ ShinySparkleSetBDSP find_sparkles(WaterfillSession& session){
     }
     return sparkles;
 }
-void ShinySparkleSetBDSP::read_from_image(const ImageViewRGB32& image){
+void ShinySparkleSetBDSP::read_from_image(size_t screen_area, const ImageViewRGB32& image){
     clear();
     if (!image){
         return;
@@ -121,7 +121,7 @@ void ShinySparkleSetBDSP::read_from_image(const ImageViewRGB32& image){
     double best_alpha = 0;
     for (PackedBinaryMatrix& matrix : matrices){
         session->set_source(matrix);
-        ShinySparkleSetBDSP sparkles = find_sparkles(*session);
+        ShinySparkleSetBDSP sparkles = find_sparkles(screen_area, *session);
         sparkles.update_alphas();
         double alpha = sparkles.alpha_overall();
         if (best_alpha < alpha){

SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h

@@ -29,7 +29,7 @@ class ShinySparkleSetBDSP : public Pokemon::ShinySparkleSet{
     ShinySparkleSetBDSP extract_subbox(const ImagePixelBox& subbox) const;
 
     virtual std::string to_str() const override;
-    virtual void read_from_image(const ImageViewRGB32& image) override;
+    virtual void read_from_image(size_t screen_area, const ImageViewRGB32& image) override;
 
     virtual void draw_boxes(
         VideoOverlaySet& overlays,

SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp

@@ -84,12 +84,12 @@ void ShinySparkleSetSwSh::update_alphas(){
 
 
 
-ShinySparkleSetSwSh find_sparkles(WaterfillSession& session){
+ShinySparkleSetSwSh find_sparkles(size_t screen_area, WaterfillSession& session){
     ShinySparkleSetSwSh sparkles;
     auto finder = session.make_iterator(20);
     WaterfillObject object;
     while (finder->find_next(object, true)){
-        RadialSparkleDetector radial_sparkle(object);
+        RadialSparkleDetector radial_sparkle(screen_area, object);
         if (radial_sparkle.is_ball()){
             sparkles.balls.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
             continue;
@@ -109,7 +109,7 @@ ShinySparkleSetSwSh find_sparkles(WaterfillSession& session){
     }
     return sparkles;
 }
-void ShinySparkleSetSwSh::read_from_image(const ImageViewRGB32& image){
+void ShinySparkleSetSwSh::read_from_image(size_t screen_area, const ImageViewRGB32& image){
     clear();
     if (!image){
         return;
@@ -129,7 +129,7 @@ void ShinySparkleSetSwSh::read_from_image(const ImageViewRGB32& image){
     double best_alpha = 0;
     for (PackedBinaryMatrix& matrix : matrices){
         session->set_source(matrix);
-        ShinySparkleSetSwSh sparkles = find_sparkles(*session);
+        ShinySparkleSetSwSh sparkles = find_sparkles(screen_area, *session);
         sparkles.update_alphas();
         double alpha = sparkles.alpha_overall();
         if (best_alpha < alpha){

SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h

@@ -31,7 +31,7 @@ class ShinySparkleSetSwSh : public Pokemon::ShinySparkleSet{
     double alpha_square() const{ return m_alpha_square; }
 
     virtual std::string to_str() const override;
-    virtual void read_from_image(const ImageViewRGB32& image) override;
+    virtual void read_from_image(size_t screen_area, const ImageViewRGB32& image) override;
 
     virtual void draw_boxes(
         VideoOverlaySet& overlays,

SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp

@@ -26,13 +26,16 @@ const double STAR_SPARKLE_ANGLE_TOLERANCE_DEGREES = 10.;
 
 
 RadialSparkleDetector::~RadialSparkleDetector(){}
-RadialSparkleDetector::RadialSparkleDetector(const WaterfillObject& object)
+RadialSparkleDetector::RadialSparkleDetector(size_t screen_area, const WaterfillObject& object)
     : m_object(object)
 {
     if (object.area < 20){
         return;
     }
-    if (object.area > 10000){
+
+    double area_1080p = 1920 * 1080;
+    double area_current = (double)screen_area;
+    if (object.area * area_1080p > 10000 * area_current){
         return;
     }