From 5e25b8303fc07b121bcd417cbd27d67127cf0747 Mon Sep 17 00:00:00 2001 From: Thaloria Date: Mon, 13 Jun 2022 16:42:41 +0200 Subject: [PATCH] minor fixes --- combine_main.py | 4 ++-- magic/spawn_0.jpg | Bin 3525 -> 2769 bytes magic/spawn_1.jpg | Bin 3266 -> 3158 bytes readme.txt | 4 ++++ vision.py | 7 ++++--- 5 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 readme.txt diff --git a/combine_main.py b/combine_main.py index 2289294..0ed859a 100644 --- a/combine_main.py +++ b/combine_main.py @@ -83,7 +83,7 @@ def run(): #cv.waitKey(150) #continue - spawn_1 = vision_stun.find(screenshot, cv.imread("magic/spawn_1.jpg", cv.IMREAD_UNCHANGED), 0.5, 1) + spawn_1 = vision_stun.find(screenshot, cv.imread("magic/spawn_1.jpg", cv.IMREAD_UNCHANGED), 0.5, 1, True, cv.imread("magic/spawn_1-mask.png", cv.IMREAD_UNCHANGED)) if len(spawn_1) == 1: spawn_button_active = True points = vision_stun.get_click_points(spawn_1) @@ -121,7 +121,7 @@ def run(): cv.imshow("output_needle", processed_needle) cv.waitKey(150) - rectangles = vision_stun.find(processed_screenshot, processed_needle, 0.70, 2) + rectangles = vision_stun.find(processed_screenshot, processed_needle, 0.90, 2, True, None) # draw the detection results onto the original image #output_image = vision_stun.draw_rectangles(screenshot, rectangles) #cv.imshow("output_image", output_image) diff --git a/magic/spawn_0.jpg b/magic/spawn_0.jpg index 31fc3ae1d8b2591cabc935f51615cb778fd9370d..eaed723e38e8cd98f169e9b99e3c6e06fd4c2084 100644 GIT binary patch delta 2141 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 B6bk?V diff --git a/magic/spawn_1.jpg b/magic/spawn_1.jpg index dd7bdc21459fbedbc2e40e4ad1072c5a5b80389e..f046bdfdafef41d822fc54f2fa374daed86cff72 100644 GIT binary patch delta 2568 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 delta 2677 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 threshold) locations = list(zip(*locations[::-1]))