Skip to content

Commit 9517287

Browse files
committed
Don't try to process image if it's cropped to nothing.
1 parent 4382bb7 commit 9517287

File tree

2 files changed

+25
-10
lines changed

2 files changed

+25
-10
lines changed

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,13 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
289289
// ssf_press_button(context, BUTTON_A | BUTTON_L, 3);
290290
// ssf_press_button(context, BUTTON_L, 0);
291291

292+
#if 0
292293
numberpad_enter_code(
293294
logger, context,
294295
"708538991006",
295296
false
296297
);
297-
298+
#endif
298299

299300
#if 0
300301
codeboard_enter_digits(
@@ -355,19 +356,25 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
355356
#endif
356357

357358

359+
ImageRGB32 image("screenshot-20250224-203247822474.png");
358360

359361
#if 0
360-
ImageRGB32 image("20250125-232444699636.png");
361-
362-
// TeraSilhouetteReader reader;
363-
// ImageMatch::ImageMatchResult results = reader.read(image);
364-
// results.log(logger, 110);
362+
{
363+
TeraSilhouetteReader reader;
364+
ImageMatch::ImageMatchResult results = reader.read(image);
365+
results.log(logger, 110);
366+
}
367+
#endif
365368

366-
TeraTypeReader reader;
367-
ImageMatch::ImageMatchResult results = reader.read(image);
368-
results.log(logger, 100);
369+
#if 1
370+
{
371+
TeraTypeReader reader;
372+
ImageMatch::ImageMatchResult results = reader.read(image);
373+
results.log(logger, 100);
374+
}
369375
#endif
370376

377+
371378
#if 0
372379
ImageRGB32 image("20250125-224044294692.png");
373380
MaxLairInternal::BattleMenuReader reader(overlay, Language::English);

SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
#include "CommonTools/Images/ImageFilter.h"
88
#include "CommonTools/ImageMatch/ImageCropper.h"
99
#include "PokemonSV/Resources/PokemonSV_PokemonSprites.h"
10-
1110
#include "PokemonSV_TeraTypeReader.h"
1211

12+
//#include <iostream>
13+
//using std::cout;
14+
//using std::endl;
15+
1316
namespace PokemonAutomation{
1417
namespace NintendoSwitch{
1518
namespace PokemonSV{
@@ -64,6 +67,11 @@ ImageMatch::ImageMatchResult TeraTypeReader::read(const ImageViewRGB32& screen)
6467
return (uint32_t)pixel.red() + pixel.green() + pixel.blue() < threshold;
6568
}
6669
);
70+
71+
if (tight_box.area() == 0){
72+
continue;
73+
}
74+
6775
ImageRGB32 processed_image = extract_box_reference(cropped_image, tight_box).copy();
6876
//processed_image.save("processed_image.png");
6977

0 commit comments

Comments
 (0)