Thaloria/Litcraft_Python_B
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added async stone detection thread

Browse Source
This commit is contained in:
Thaloria
2023-07-25 09:59:20 +02:00
parent b570813c5a
commit e7932f5762
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
litris.py
View File

@@ -1,24 +1,18 @@
import cv2 as cv import cv2 as cv
import numpy as np import numpy as np
from time import time
from game_base_class import GameBase from game_base_class import GameBase
from pynput.keyboard import Key, Controller from pynput.keyboard import Key, Controller
from field import Field from field import Field
from tetromino import Tetromino from tetromino import Tetromino
from optimizer import Optimizer from optimizer import Optimizer
from litris_stone_id_thread import NewStoneID from litris_stone_id_thread import NewStoneID
from window_capture import WindowCapture
from vision import Vision
from config_file import UserConfigs
class Litris(GameBase): class Litris(GameBase):
def __init__(self, overlay): def __init__(self, overlay):
super().__init__(overlay) super().__init__(overlay)
self.config = UserConfigs()
self.capture_window = WindowCapture(None, None, self.config)
self.vision_stun = Vision()
self.keyboard = Controller() self.keyboard = Controller()
self.data_coordinates = np.zeros((20, 20), dtype=object) self.data_coordinates = np.zeros((20, 20), dtype=object)
@@ -36,7 +30,7 @@ class Litris(GameBase):
self.litris_reset_board = cv.imread("control_elements/sodoku_reset_button.jpg", cv.IMREAD_COLOR) self.litris_reset_board = cv.imread("control_elements/sodoku_reset_button.jpg", cv.IMREAD_COLOR)
self.stone_id_thread = NewStoneID(self.capture_window) self.stone_id_thread = NewStoneID()
self.move_mode = 1 self.move_mode = 1
@@ -52,27 +46,24 @@ class Litris(GameBase):
self.data_coordinates[e][i] = [(i * dim) + (i * i_spacing), (e * dim) + (e * e_spacing), dim, dim] self.data_coordinates[e][i] = [(i * dim) + (i * i_spacing), (e * dim) + (e * e_spacing), dim, dim]
def assess_playfield_and_make_move(self): def assess_playfield_and_make_move(self):
last_letter_received = time()
while True: while True:
if self.stone_id_thread.get_pick_up_status() == False: if self.stone_id_thread.get_pick_up_status() == False:
screenshot = self.capture_window.get_screenshot() if (time() - last_letter_received) >= 5:
screenshot = screenshot[880:1060, 1400:1600] cv.waitKey(500)
if self.check_for_button_and_execute(screenshot, self.litris_reset_board, 1400, 880): self.dig_point(1500, 980, 100)
self.field.reset_field() self.field.reset_field()
last_letter_received = time()
if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused': if self.overlay.run_mode == 'stopped' or self.overlay.run_mode == 'paused':
return return
cv.waitKey(50) cv.waitKey(50)
continue continue
#current_letter = self.new_stone_detection_and_identification()
#current_letter = self.stone_id()
#current_letter = 'D'
current_letter = self.stone_id_thread.get_actual_letter() current_letter = self.stone_id_thread.get_actual_letter()
#self.stone_id_thread.set_pick_up_status(False)
print("current_letter: ", current_letter) print("current_letter: ", current_letter)
#if current_letter is None: last_letter_received = time()
# cv.waitKey(50)
# return
current_tetromino = Tetromino.create(current_letter) current_tetromino = Tetromino.create(current_letter)
if self.move_mode == 2: if self.move_mode == 2:

6
litris_stone_id_thread.py
View File

@@ -18,11 +18,11 @@ Z_FULL = [[0, 0, 0, 0], [0, 1, 1, 0], [0, 0, 1, 1], [0, 0, 0, 0]]
T_FULL = [[0, 0, 0, 0], [0, 1, 1, 1], [0, 0, 1, 0], [0, 0, 0, 0]] T_FULL = [[0, 0, 0, 0], [0, 1, 1, 1], [0, 0, 1, 0], [0, 0, 0, 0]]
class NewStoneID(threading.Thread): class NewStoneID(threading.Thread):
def __init__(self, cap_win): def __init__(self):
threading.Thread.__init__(self) threading.Thread.__init__(self)
#self.config = UserConfigs() self.config = UserConfigs()
self.capture_window = cap_win self.capture_window = WindowCapture(None, None, self.config)
self.vision_stun = Vision() self.vision_stun = Vision()
self.stone_coordinates = np.zeros((4, 4), dtype=object) self.stone_coordinates = np.zeros((4, 4), dtype=object)