Remove dummy parameter. Change TeraSilhouetteReader to use brightness filter.

Mysticial · Mysticial · commit 75d2b022d2e7 · 2025-05-06T01:38:27.000-07:00
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp b/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp
@@ -111,7 +111,7 @@ ImageRGB32 filter_rgb32_euclidean(
 ImageRGB32 to_blackwhite_rgb32_range(
     const ImageViewRGB32& image,
     bool in_range_black,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 ){
     ImageRGB32 ret(image.width(), image.height());
     Kernels::to_blackwhite_rgb32_range(
@@ -126,7 +126,7 @@ ImageRGB32 to_blackwhite_rgb32_range(
     size_t& pixels_in_range,
     const ImageViewRGB32& image,
     bool in_range_black,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 ){
     ImageRGB32 ret(image.width(), image.height());
     pixels_in_range = Kernels::to_blackwhite_rgb32_range(
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageFilter.h b/SerialPrograms/Source/CommonTools/Images/ImageFilter.h
@@ -87,7 +87,7 @@ ImageRGB32 filter_rgb32_euclidean(
 ImageRGB32 to_blackwhite_rgb32_range(
     const ImageViewRGB32& image,
     bool in_range_black,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 );
 //  Convert the image to black and white.
 //  Inside [mins, maxs] is white, otherwise it's black.
@@ -98,7 +98,7 @@ ImageRGB32 to_blackwhite_rgb32_range(
     size_t& pixels_in_range,
     const ImageViewRGB32& image,
     bool in_range_black,
-    uint32_t mins, uint32_t maxs, void*
+    uint32_t mins, uint32_t maxs
 );
 
 
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp
@@ -135,7 +135,7 @@ std::string  read_number_waterfill_no_normalization(
     ImageRGB32 filtered = to_blackwhite_rgb32_range(
         image,
         text_inside_range,
-        rgb32_min, rgb32_max, nullptr
+        rgb32_min, rgb32_max
     );
 
 //    static int c = 0;
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp
@@ -326,14 +326,12 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
         ImageMatch::ImageMatchResult results = reader.read(image);
         results.log(logger, 120);
     }
-#if 0
     {
         TeraSilhouetteReader reader;
         ImageMatch::ImageMatchResult results = reader.read(image);
         results.log(logger, 120);
     }
 #endif
-#endif
 
 #if 0
     Milliseconds unit = 24ms;
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp
@@ -252,7 +252,7 @@ ImageRGB32 DateReader::filter_image(const ImageViewRGB32& image, bool white_them
     ImageRGB32 filtered = to_blackwhite_rgb32_range(
         image,
         white_theme,
-        0xff000000, white_theme ? 0xffff7fff : 0xff7f7f7f, nullptr
+        0xff000000, white_theme ? 0xffff7fff : 0xff7f7f7f
     );
     return filtered;
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp
@@ -108,7 +108,7 @@ uint16_t BattleBallReader::read_quantity(const ImageViewRGB32& screen) const{
     ImageRGB32 image = to_blackwhite_rgb32_range(
         extract_box_reference(screen, m_box_quantity),
         true,
-        0xff808080, 0xffffffff, nullptr
+        0xff808080, 0xffffffff
     );
     int qty = OCR::read_number(m_stream.logger(), image);
     return (uint16_t)std::max(qty, 0);
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp
@@ -48,7 +48,7 @@ class PokemonTasksReader{
             ImageRGB32 image = to_blackwhite_rgb32_range(
                 extract_box_reference(screen, m_tasks_box[i]),
                 false,
-                0xff808080, 0xffffffff, nullptr
+                0xff808080, 0xffffffff
             );
             tasks[i] = OCR::read_number(m_stream.logger(), image);
         }
diff --git a/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp
@@ -92,7 +92,7 @@ int16_t ItemPrinterMaterialDetector::read_number(
     ImageRGB32 filtered = to_blackwhite_rgb32_range(
         cropped,
         true,
-        0xff000000, 0xff808080, nullptr
+        0xff000000, 0xff808080
     );
     // filtered.save("DebugDumps/test-one-filter-1.png");
     bool is_dark_text_light_background = image_stats(filtered).average.sum() > 400;
diff --git a/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp
@@ -186,7 +186,7 @@ double ItemPrinterPrizeReader::average_sum_filtered(const ImageViewRGB32& screen
     ImageRGB32 filtered = to_blackwhite_rgb32_range(
         cropped,
         false,
-        0xff808000, 0xffffffff, nullptr
+        0xff808000, 0xffffffff
     );    
 
     return image_stats(filtered).average.sum();
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.cpp
@@ -59,7 +59,7 @@ std::string SandwichPlateDetector::detect_filling_name(const ImageViewRGB32& scr
         ImageRGB32 plate_label = to_blackwhite_rgb32_range(
             extract_box_reference(screen, m_box),
             true,
-            image_filter_low_bound, image_filter_high_bound, nullptr
+            image_filter_low_bound, image_filter_high_bound
         );
 
         // dump_debug_image(m_logger, "PokemonSV/SandwichPlateDetector", "blackwhite_input", plate_label);
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp
@@ -49,7 +49,7 @@ void SandwichRecipeNumberDetector::detect_recipes(const ImageViewRGB32& screen,
         ImageRGB32 filterd_image = to_blackwhite_rgb32_range(
             cropped_image,
             invert_blackwhite,
-            combine_rgb(180, 180, 180), combine_rgb(255, 255, 255), nullptr
+            combine_rgb(180, 180, 180), combine_rgb(255, 255, 255)
         );
         
         // filterd_image.save("./tmp_fil_" + std::to_string(i) + ".png");
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp
@@ -52,7 +52,7 @@ std::string BlueberryQuestDetector::detect_quest(const ImageViewRGB32& screen) c
     ImageRGB32 quest_label = to_blackwhite_rgb32_range(
         extract_box_reference(screen, m_box),
         true,
-        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255), nullptr
+        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255)
     );
 
     //quest_label.save("quest_label.png");
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp
@@ -155,7 +155,7 @@ std::vector<WaterfillOCRResult> waterfill_OCR(
     //  Direct OCR is unreliable. Instead, we will waterfill each character
     //  to isolate them, then OCR them individually.
 
-    ImageRGB32 filtered = to_blackwhite_rgb32_range(image, true, 0xff000000, threshold, nullptr);
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(image, true, 0xff000000, threshold);
     PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(image, 0xff000000, threshold);
 
     std::map<size_t, WaterfillObject> map;
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp
@@ -31,7 +31,7 @@ ImageMatch::SilhouetteDictionaryMatcher make_TERA_RAID_SILHOUETTE_MATCHER(){
         ImageRGB32 filtered_image = to_blackwhite_rgb32_range(
             item.second.icon,
             true,
-            0xff000000, 0xff5f5f5f, nullptr
+            0xff000000, 0xff5f5f5f
         );
         matcher.add(item.first, filtered_image);
     }
@@ -84,7 +84,7 @@ ImageMatch::ImageMatchResult TeraSilhouetteReader::read(const ImageViewRGB32& sc
             preprocessed_image,
             // The filter is a lambda function that returns true on black silhouette pixels.
             [=](Color pixel){
-                return (uint32_t)pixel.red() + pixel.green() + pixel.blue() < threshold;
+                return (uint32_t)pixel.red() + pixel.green() + pixel.blue() <= threshold;
             }
         );
 
@@ -98,7 +98,8 @@ ImageMatch::ImageMatchResult TeraSilhouetteReader::read(const ImageViewRGB32& sc
 //        processed_image.save("tera_processed_image-" + std::to_string(c++) + ".png");
 
 //        cout << "check4" << endl;
-        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, true, 0xff000000, 0xff5f5f5f, nullptr);
+//        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, true, 0xff000000, 0xff5f5f5f);
+        ImageRGB32 filtered_image = to_blackwhite_rgb32_brightness(processed_image, true, 0, threshold);
 //        filtered_image.save("tera_filtered_image-" + std::to_string(c++) + ".png");
 
 //        cout << "check5" << endl;
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp
@@ -161,7 +161,7 @@ int read_BP(const ProgramInfo& info, VideoStream& stream, ProControllerContext&
     ImageRGB32 BP_value = to_blackwhite_rgb32_range(
         extract_box_reference(screen, ImageFloatBox(0.866, 0.019, 0.091, 0.041)),
         true,
-        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255), nullptr
+        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255)
     );
 
     //Close panel
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp
@@ -176,15 +176,15 @@ void TournamentFarmer::check_money(SingleSwitchProgramEnvironment& env, ProContr
         ImageRGB32 image_top = to_blackwhite_rgb32_range(
             extract_box_reference(screen, top_notif),
             true,
-            combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), nullptr
+            combine_rgb(215, 215, 215), combine_rgb(255, 255, 255)
         );
         //image_top.save("./image_top.png");
 
         //Different color range on the bottom notif ~B0B5B8
         ImageRGB32 image_bottom = to_blackwhite_rgb32_range(
             extract_box_reference(screen, bottom_notif),
             true,
-            combine_rgb(130, 130, 130), combine_rgb(240, 240, 240), nullptr
+            combine_rgb(130, 130, 130), combine_rgb(240, 240, 240)
         );
         //image_bottom.save("./image_bottom.png");
         
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp
@@ -91,13 +91,13 @@ void wait_for_video_code_and_join(
             env.log("OCR: " + code);
             break;
         case VideoFceOcrMethod::BLACK_TEXT:{
-            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, true, 0xff000000, 0xff7f7f7f, nullptr);
+            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, true, 0xff000000, 0xff7f7f7f);
             code = OCR::ocr_read(Language::English, filtered);
             env.log("OCR: " + code);
             break;
         }
         case VideoFceOcrMethod::WHITE_TEXT:{
-            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, true, 0xffc0c0c0, 0xffffffff, nullptr);
+            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, true, 0xffc0c0c0, 0xffffffff);
             code = OCR::ocr_read(Language::English, filtered);
             env.log("OCR: " + code);
             break;
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp
@@ -114,7 +114,7 @@ uint16_t BattleBallReader::read_quantity(const ImageViewRGB32& screen) const{
     ImageRGB32 image = to_blackwhite_rgb32_range(
         extract_box_reference(screen, m_box_quantity),
         true,
-        0xff808080, 0xffffffff, nullptr
+        0xff808080, 0xffffffff
     );
     int qty = OCR::read_number(m_stream.logger(), image);
     return (uint16_t)std::max(qty, 0);
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp
@@ -144,7 +144,7 @@ int8_t read_pp_text(Logger& logger, const ImageViewRGB32& image){
         processed = to_blackwhite_rgb32_range(
             text_pixels, image,
             false,
-            item.first, item.second, nullptr
+            item.first, item.second
         );
         double text_ratio = 1.0 - (double)text_pixels / (image.width() * image.height());
 //        cout << "text_ratio = " << text_ratio << endl;
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp
@@ -110,7 +110,7 @@ std::shared_ptr<const ImageRGB32> enter_lobby(
             ImageRGB32 image = to_blackwhite_rgb32_range(
                 extract_box_reference(screen, ore_quantity),
                 true,
-                0xff808080, 0xffffffff, nullptr
+                0xff808080, 0xffffffff
             );
             ImageRGB32 filtered = pad_image(image, 10, 0xffffffff);
             ore.update_with_ocr(stream.logger(), filtered);

Original file line number	Diff line number	Diff line change
`@@ -326,14 +326,12 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&`
`326`	`326`	`ImageMatch::ImageMatchResult results = reader.read(image);`
`327`	`327`	`results.log(logger, 120);`
`328`	`328`	`}`
`329`		`-#if 0`
`330`	`329`	`{`
`331`	`330`	`TeraSilhouetteReader reader;`
`332`	`331`	`ImageMatch::ImageMatchResult results = reader.read(image);`
`333`	`332`	`results.log(logger, 120);`
`334`	`333`	`}`
`335`	`334`	`#endif`
`336`		`-#endif`
`337`	`335`
`338`	`336`	`#if 0`
`339`	`337`	`Milliseconds unit = 24ms;`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ ImageRGB32 DateReader::filter_image(const ImageViewRGB32& image, bool white_them`
`252`	`252`	`ImageRGB32 filtered = to_blackwhite_rgb32_range(`
`253`	`253`	`image,`
`254`	`254`	`white_theme,`
`255`		`- 0xff000000, white_theme ? 0xffff7fff : 0xff7f7f7f, nullptr`
	`255`	`+ 0xff000000, white_theme ? 0xffff7fff : 0xff7f7f7f`
`256`	`256`	`);`
`257`	`257`	`return filtered;`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class PokemonTasksReader{`
`48`	`48`	`ImageRGB32 image = to_blackwhite_rgb32_range(`
`49`	`49`	`extract_box_reference(screen, m_tasks_box[i]),`
`50`	`50`	`false,`
`51`		`- 0xff808080, 0xffffffff, nullptr`
	`51`	`+ 0xff808080, 0xffffffff`
`52`	`52`	`);`
`53`	`53`	`tasks[i] = OCR::read_number(m_stream.logger(), image);`
`54`	`54`	`}`