diff --git a/a_maze_ing.py b/a_maze_ing.py index b451b16..8175b2e 100644 --- a/a_maze_ing.py +++ b/a_maze_ing.py @@ -1,9 +1,10 @@ -from typing import Any +from typing import Any, Generator from src.AMazeIng import AMazeIng from src.parsing import Parsing -from mlx.mlx import Mlx +from mlx import Mlx import numpy as np import math +import time class MazeMLX: @@ -12,18 +13,33 @@ class MazeMLX: self.height = height self.width = width self.mlx_ptr = self.mlx.mlx_init() - self.generator = None self.win_ptr = self.mlx.mlx_new_window( - self.mlx_ptr, width, height, "amazing" + self.mlx_ptr, width, height + 200, "A-Maze-Ing" ) self.img_ptr = self.mlx.mlx_new_image(self.mlx_ptr, width, height) self.buf, self.bpp, self.size_line, self.format = ( self.mlx.mlx_get_data_addr(self.img_ptr) ) + self.path_printer = None + self.generator = None def close(self) -> None: self.mlx.mlx_destroy_image(self.mlx_ptr, self.img_ptr) + def redraw_image(self) -> None: + self.mlx.mlx_clear_window(self.mlx_ptr, self.win_ptr) + self.mlx.mlx_put_image_to_window( + self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0 + ) + self.mlx.mlx_string_put( + self.mlx_ptr, + self.win_ptr, + self.width // 3, + self.height + 100, + 0xFFFFFF, + "1: regen; 2: path; 3: color; 4: quit;", + ) + def put_pixel(self, x, y) -> None: offset = y * self.size_line + x * (self.bpp // 8) @@ -35,7 +51,6 @@ class MazeMLX: def clear_image(self) -> None: self.buf[:] = b"\x00" * len(self.buf) - self.mlx.mlx_clear_window(self.mlx_ptr, self.win_ptr) def put_line(self, start: tuple[int, int], end: tuple[int, int]) -> None: sx, sy = start @@ -75,28 +90,116 @@ class MazeMLX: self.put_line((x0, y1), (x1, y1)) if maze[y][x].get_west(): self.put_line((x0, y0), (x0, y1)) - self.mlx.mlx_put_image_to_window( - self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0) + self.redraw_image() + + def put_block(self, ul: tuple[int, int], dr: tuple[int, int]) -> None: + for y in range(min(ul[1], dr[1]), max(dr[1], ul[1])): + self.put_line((min(ul[0], dr[0]), y), (max(ul[0], dr[0]), y)) + + def put_path(self, amazing: AMazeIng): + path = amazing.solve_path() + print(path) + actual = amazing.entry + actual = (actual[0] - 1, actual[1] - 1) + maze = amazing.maze.get_maze() + if maze is None: + return + margin = math.trunc( + math.sqrt(self.width if self.width > self.height else self.height) + // 2 + ) + cell_size = math.trunc( + ( + (self.height - margin) // len(maze) + if self.height > self.width + else (self.width - margin) // len(maze[0]) + ) + ) + self.update_maze(maze) + for i in range(len(path)): + ul = ( + (actual[0]) * cell_size + margin + 12, + (actual[1]) * cell_size + 12 + margin, + ) + dr = ( + (actual[0]) * cell_size + cell_size + margin - 12, + (actual[1]) * cell_size + cell_size - 12 + margin, + ) + self.put_block(ul, dr) + self.redraw_image() + x0 = actual[0] * cell_size + margin + 12 + y0 = actual[1] * cell_size + margin + 12 + x1 = actual[0] * cell_size + cell_size + margin - 12 + y1 = actual[1] * cell_size + cell_size + margin - 12 + yield + match path[i]: + case "N": + self.put_block((x0, y0), (x1, y0 - 24)) + actual = (actual[0], actual[1] - 1) + case "E": + self.put_block((x1, y0), (x1 + 24, y1)) + actual = (actual[0] + 1, actual[1]) + case "S": + self.put_block((x0, y1), (x1, y1 + 24)) + actual = (actual[0], actual[1] + 1) + case "W": + self.put_block((x0, y0), (x0 - 24, y1)) + actual = (actual[0] - 1, actual[1]) + ul = ( + (actual[0]) * cell_size + margin + 12, + (actual[1]) * cell_size + 12 + margin, + ) + dr = ( + (actual[0]) * cell_size + cell_size + margin - 12, + (actual[1]) * cell_size + cell_size - 12 + margin, + ) + self.put_block(ul, dr) + self.redraw_image() + return def close_loop(self, _: Any): self.mlx.mlx_loop_exit(self.mlx_ptr) - def gen_maze(self, amazing: AMazeIng) -> None: - self.generator = amazing.generate() + def handle_key_press(self, keycode: int, amazing: AMazeIng) -> None: + if keycode == 49: + self.restart_maze(amazing) + if keycode == 50: + self.restart_path(amazing) + if keycode == 51: + pass + if keycode == 52: + self.close_loop(None) def start(self, amazing: AMazeIng) -> None: - self.gen_maze(amazing) - self.mlx.mlx_loop_hook(self.mlx_ptr, self.render, amazing) + self.restart_maze(amazing) + self.mlx.mlx_loop_hook(self.mlx_ptr, self.render_maze, amazing) self.mlx.mlx_hook(self.win_ptr, 33, 0, self.close_loop, None) + self.mlx.mlx_hook( + self.win_ptr, 2, 1 << 0, self.handle_key_press, amazing + ) self.mlx.mlx_loop(self.mlx_ptr) - def render(self, amazing: AMazeIng): + def restart_maze(self, amazing: AMazeIng) -> None: + self.generator = amazing.generate() + + def restart_path(self, amazing: AMazeIng) -> None: + self.path_printer = self.put_path(amazing) + + def render_path(self): + try: + next(self.path_printer) + time.sleep(0.03) + except StopIteration: + pass + + def render_maze(self, amazing: AMazeIng): try: next(self.generator) self.update_maze(amazing.maze.get_maze()) # time.sleep(0.01) except StopIteration: - pass + if self.path_printer is not None: + self.render_path() def main() -> None: diff --git a/config.txt b/config.txt index 3d8291a..f441fba 100644 --- a/config.txt +++ b/config.txt @@ -1,8 +1,8 @@ -WIDTH=15 -HEIGHT=15 +WIDTH=11 +HEIGHT=11 ENTRY=1,1 -EXIT=2,2 +EXIT=11,11 OUTPUT_FILE=maze.txt -PERFECT=False -GENERATOR=DFS +PERFECT=True +GENERATOR=Kruskal SOLVER=AStar diff --git a/src/AMazeIng.py b/src/AMazeIng.py index b0414fa..68eecc9 100644 --- a/src/AMazeIng.py +++ b/src/AMazeIng.py @@ -20,9 +20,9 @@ class AMazeIng(BaseModel): @model_validator(mode="after") def check_entry_exit(self) -> Self: - if self.entry[0] >= self.width or self.entry[1] >= self.height: + if self.entry[0] > self.width or self.entry[1] > self.height: raise ValueError("Entry coordinates exceed the maze size") - if self.exit[0] >= self.width or self.exit[1] >= self.height: + if self.exit[0] > self.width or self.exit[1] > self.height: raise ValueError("Exit coordinates exceed the maze size") return self diff --git a/test.txt b/test.txt deleted file mode 100644 index b969fc7..0000000 --- a/test.txt +++ /dev/null @@ -1,19 +0,0 @@ -D53939553D13B93 -93AAC697A92C6AA -AC6A95056AE956A -A916856D1454152 -A843C5394555696 -A87AF96AFFFB96B -AE96FC5457F8412 -C52BFFFBFFFC102 -B94453FAFD516EA -86953AFAFFFA956 -81692C54153A853 -AC3A83950546C3A -ABA86C2D69517C2 -C2AC55293ABC53A -D6C55546C4457C6 - -1,1 -2,2 -EESSWN