From 349e58ce41c998f8a1a240ff695c478692f4e891 Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Fri, 27 Mar 2026 18:29:09 +0100 Subject: [PATCH 1/4] ifpjefp --- a_maze_ing.py | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-- config.txt | 12 +++++----- test.txt | 34 ++++++++++------------------ 3 files changed, 77 insertions(+), 30 deletions(-) diff --git a/a_maze_ing.py b/a_maze_ing.py index b451b16..9c8dfc2 100644 --- a/a_maze_ing.py +++ b/a_maze_ing.py @@ -76,7 +76,64 @@ class MazeMLX: 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.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0 + ) + + def put_block(self, ul: tuple[int, int], dr: tuple[int, int]) -> None: + for y in range(ul[1], dr[1]): + self.put_line((min(ul[0], dr[0]), y), (max(ul[0], dr[0]), y)) + + def put_path(self, amazing: AMazeIng) -> None: + path = amazing.solve_path() + print(path) + actual = amazing.entry + 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]) + ) + ) + + for i in range(len(path)): + ul = ( + (actual[0]) * cell_size + margin + 6, + (actual[1]) * cell_size + 6 + margin, + ) + dr = ( + (actual[0]) * cell_size + cell_size + margin - 12, + (actual[1]) * cell_size + cell_size - 12 + margin, + ) + self.put_block(ul, dr) + x0 = actual[0] * cell_size + margin + 3 + y0 = actual[1] * cell_size + margin + 3 + x1 = actual[0] * cell_size + cell_size + margin - 6 + y1 = actual[1] * cell_size + cell_size + margin - 6 + if i == len(path) - 1: + continue + match path[i]: + case "N": + self.put_line((x0, y0), (x1, y0)) + actual = (actual[0], actual[1] - 1) + case "E": + self.put_line((x1, y0), (x1, y1)) + actual = (actual[0] + 1, actual[1]) + case "S": + self.put_line((x0, y1), (x1, y1)) + actual = (actual[0], actual[1] + 1) + case "W": + self.put_line((x0, y0), (x0, y1)) + actual = (actual[0] - 1, actual[1]) + self.mlx.mlx_put_image_to_window( + self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0 + ) def close_loop(self, _: Any): self.mlx.mlx_loop_exit(self.mlx_ptr) @@ -96,7 +153,7 @@ class MazeMLX: self.update_maze(amazing.maze.get_maze()) # time.sleep(0.01) except StopIteration: - pass + self.put_path(amazing) def main() -> None: diff --git a/config.txt b/config.txt index 5d7e0a5..15b356e 100644 --- a/config.txt +++ b/config.txt @@ -1,8 +1,8 @@ -WIDTH=20 -HEIGHT=20 +WIDTH=10 +HEIGHT=10 ENTRY=1,1 -EXIT=2,2 +EXIT=9,9 OUTPUT_FILE=maze.txt -PERFECT=False -GENERATOR=DFS -SOLVER=AStar +PERFECT=True +GENERATOR=Kruskal +SOLVER=DFS diff --git a/test.txt b/test.txt index e42df81..baac4be 100644 --- a/test.txt +++ b/test.txt @@ -1,24 +1,14 @@ -B9153957955513953953 -AEA96A9569792C6BAAD6 -C5443AA9169281102C53 -95556A82816C2AC2A952 -A93916A86A956C3A86D6 -AEC6C542944513806953 -C395553AC393C2AC787A -BC69512C7AAC56855692 -A952BAAF96AFFFAD53AE -A810686FC5057FC516C3 -AAC4543FFFAFFFB96952 -AC5553817FAFD52ABC3A -815552843FEFFF80296A -AC553A85413D55406C12 -C53BAAC392C3953C13AA -9386AC386A9683C56AAA -846903AE96C568517C2A -AD3A82C385397C3C5546 -C12AA87AA94293AD5513 -D46C6C5446D46C45556E +B953BD3917 +C478416EC3 +957ABEBD3A +817AC16D42 +E87C107BD2 +B8552A9456 +82BBAEC157 +EEAA855417 +B96C2D3903 +C45547C6EE 1,1 -2,2 -SSEEENENWWWS +9,9 +SENEESSSSESSSEEEES From cb19cf14136af093286e60d5003fa85c275e87f3 Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Fri, 27 Mar 2026 19:47:21 +0100 Subject: [PATCH 2/4] ADD(mlx path animation) --- a_maze_ing.py | 60 +++++++++++++++++++++++++++++++------------------ config.txt | 10 ++++----- src/AMazeIng.py | 4 ++-- 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/a_maze_ing.py b/a_maze_ing.py index 9c8dfc2..a6c7ffa 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 import numpy as np import math +import time class MazeMLX: @@ -12,7 +13,6 @@ 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" ) @@ -80,13 +80,14 @@ class MazeMLX: ) def put_block(self, ul: tuple[int, int], dr: tuple[int, int]) -> None: - for y in range(ul[1], dr[1]): + 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) -> None: + 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 @@ -101,48 +102,59 @@ class MazeMLX: else (self.width - margin) // len(maze[0]) ) ) - + self.update_maze(maze) for i in range(len(path)): + self.mlx.mlx_clear_window(self.mlx_ptr, self.win_ptr) ul = ( - (actual[0]) * cell_size + margin + 6, - (actual[1]) * cell_size + 6 + margin, + (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) - x0 = actual[0] * cell_size + margin + 3 - y0 = actual[1] * cell_size + margin + 3 - x1 = actual[0] * cell_size + cell_size + margin - 6 - y1 = actual[1] * cell_size + cell_size + margin - 6 - if i == len(path) - 1: - continue + self.mlx.mlx_put_image_to_window( + self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0 + ) + 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_line((x0, y0), (x1, y0)) + self.put_block((x0, y0), (x1, y0 - 24)) actual = (actual[0], actual[1] - 1) case "E": - self.put_line((x1, y0), (x1, y1)) + self.put_block((x1, y0), (x1 + 24, y1)) actual = (actual[0] + 1, actual[1]) case "S": - self.put_line((x0, y1), (x1, y1)) + self.put_block((x0, y1), (x1, y1 + 24)) actual = (actual[0], actual[1] + 1) case "W": - self.put_line((x0, y0), (x0, y1)) + 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.mlx.mlx_put_image_to_window( self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0 ) + 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 start(self, amazing: AMazeIng) -> None: - self.gen_maze(amazing) + self.path_printer = self.put_path(amazing) + self.generator = amazing.generate() self.mlx.mlx_loop_hook(self.mlx_ptr, self.render, amazing) self.mlx.mlx_hook(self.win_ptr, 33, 0, self.close_loop, None) self.mlx.mlx_loop(self.mlx_ptr) @@ -153,7 +165,11 @@ class MazeMLX: self.update_maze(amazing.maze.get_maze()) # time.sleep(0.01) except StopIteration: - self.put_path(amazing) + try: + next(self.path_printer) + time.sleep(0.03) + except StopIteration: + pass def main() -> None: diff --git a/config.txt b/config.txt index 15b356e..56e8731 100644 --- a/config.txt +++ b/config.txt @@ -1,8 +1,8 @@ -WIDTH=10 -HEIGHT=10 +WIDTH=20 +HEIGHT=20 ENTRY=1,1 -EXIT=9,9 +EXIT=20,20 OUTPUT_FILE=maze.txt -PERFECT=True -GENERATOR=Kruskal +PERFECT=False +GENERATOR=DFS SOLVER=DFS 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 From 2fc67683d8708c3577a726cc241c241f3e8baed0 Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Fri, 27 Mar 2026 20:58:28 +0100 Subject: [PATCH 3/4] add key handling without color management (not implemented) --- a_maze_ing.py | 78 ++++++++++++++++++++++++++++++++++++--------------- config.txt | 12 ++++---- 2 files changed, 62 insertions(+), 28 deletions(-) diff --git a/a_maze_ing.py b/a_maze_ing.py index a6c7ffa..9e0ba0d 100644 --- a/a_maze_ing.py +++ b/a_maze_ing.py @@ -1,7 +1,7 @@ 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 @@ -14,16 +14,32 @@ class MazeMLX: self.width = width self.mlx_ptr = self.mlx.mlx_init() 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,9 +90,7 @@ 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])): @@ -104,7 +117,6 @@ class MazeMLX: ) self.update_maze(maze) for i in range(len(path)): - self.mlx.mlx_clear_window(self.mlx_ptr, self.win_ptr) ul = ( (actual[0]) * cell_size + margin + 12, (actual[1]) * cell_size + 12 + margin, @@ -114,9 +126,7 @@ class MazeMLX: (actual[1]) * cell_size + cell_size - 12 + margin, ) self.put_block(ul, dr) - self.mlx.mlx_put_image_to_window( - self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0 - ) + 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 @@ -144,32 +154,56 @@ class MazeMLX: (actual[1]) * cell_size + cell_size - 12 + margin, ) self.put_block(ul, dr) - self.mlx.mlx_put_image_to_window( - self.mlx_ptr, self.win_ptr, self.img_ptr, 0, 0 - ) + self.redraw_image() return def close_loop(self, _: Any): self.mlx.mlx_loop_exit(self.mlx_ptr) + 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.path_printer = self.put_path(amazing) - self.generator = amazing.generate() - 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: - try: - next(self.path_printer) - time.sleep(0.03) - except StopIteration: - pass + if self.path_printer is not None: + try: + next(self.path_printer) + time.sleep(0.03) + except StopIteration: + pass def main() -> None: diff --git a/config.txt b/config.txt index 56e8731..f441fba 100644 --- a/config.txt +++ b/config.txt @@ -1,8 +1,8 @@ -WIDTH=20 -HEIGHT=20 +WIDTH=11 +HEIGHT=11 ENTRY=1,1 -EXIT=20,20 +EXIT=11,11 OUTPUT_FILE=maze.txt -PERFECT=False -GENERATOR=DFS -SOLVER=DFS +PERFECT=True +GENERATOR=Kruskal +SOLVER=AStar From b317f7a3a017c42112fd04213464ac549fa18f4d Mon Sep 17 00:00:00 2001 From: David GAILLETON Date: Fri, 27 Mar 2026 21:42:14 +0100 Subject: [PATCH 4/4] FIX(path render): path render was called twice --- a_maze_ing.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/a_maze_ing.py b/a_maze_ing.py index 9e0ba0d..8175b2e 100644 --- a/a_maze_ing.py +++ b/a_maze_ing.py @@ -199,11 +199,7 @@ class MazeMLX: # time.sleep(0.01) except StopIteration: if self.path_printer is not None: - try: - next(self.path_printer) - time.sleep(0.03) - except StopIteration: - pass + self.render_path() def main() -> None: