From 6f31a587b93b9375664591e7f1cf0d4b67207456 Mon Sep 17 00:00:00 2001 From: countingthedots Date: Sun, 12 Mar 2023 18:11:31 +0100 Subject: [PATCH 1/3] Moving circle added --- Interface/grid_draw.py | 2 -- Interface/interface.py | 40 -------------------------------------- Interface/vacuum_render.py | 29 +++++++++++++++++++++------ main.py | 2 +- 4 files changed, 24 insertions(+), 49 deletions(-) delete mode 100644 Interface/interface.py diff --git a/Interface/grid_draw.py b/Interface/grid_draw.py index 92471f9..0f74e86 100644 --- a/Interface/grid_draw.py +++ b/Interface/grid_draw.py @@ -32,8 +32,6 @@ class GridDraw(): self.screen = pygame.display.set_mode((self.width, self.height)) def start_draw(self): - for event in pygame.event.get(): - if event.type == pygame.QUIT: sys.exit() self.screen.fill(Colors.BLACK) def end_draw(self): diff --git a/Interface/interface.py b/Interface/interface.py deleted file mode 100644 index 8fc8971..0000000 --- a/Interface/interface.py +++ /dev/null @@ -1,40 +0,0 @@ -import sys -import pygame -from .helpers import * - - -def initialize_interface(tiles_x, tiles_y): - - size = width, height = 600, 600 - screen = create_screen(size) - pygame.display.set_caption('Epic AI Vacuum Cleaner') - tile_width = width / tiles_x - tile_height = height / tiles_y - x = tile_width / 2 - y = tile_height / 2 - radius = 15 - - while True: - for event in pygame.event.get(): - if event.type == pygame.QUIT: - sys.exit() - userInput = pygame.key.get_pressed() - if event.type == pygame.KEYDOWN: - if event.key == pygame.K_LEFT: - x -= tile_width - if event.key == pygame.K_RIGHT: - x += tile_width - if event.key == pygame.K_UP: - y -= tile_height - if event.key == pygame.K_DOWN: - y += tile_height - - pygame.time.delay(10) - pygame.display.update() - screen.fill(BLACK) - # rect(screen, WHITE, 50,50,90,90) - - draw_board(screen, WHITE, width, height, tiles_x, tiles_y) - pygame.draw.circle(screen, (178, 172, 136), (int(x), int(y)), radius) - - pygame.display.flip() diff --git a/Interface/vacuum_render.py b/Interface/vacuum_render.py index 29f1b52..3732c3e 100644 --- a/Interface/vacuum_render.py +++ b/Interface/vacuum_render.py @@ -1,14 +1,31 @@ from Interface.grid_draw import GridDraw, Colors +import sys +import pygame # dummy function def initial_draw(): grid = GridDraw(500, 500) - + tile_width = 500 / 10 + tile_height = 500 / 10 + x = tile_width / 2 + y = tile_height / 2 + radius = 15 while True: grid.start_draw() - grid.board(10, 10) - grid.circle(75, 75, 20, color=Colors.RED) - grid.circle(225, 175, 20, color=Colors.GREEN) - - grid.end_draw() + for event in pygame.event.get(): + if event.type == pygame.QUIT: + sys.exit() + if event.type == pygame.KEYDOWN: + if event.key == pygame.K_LEFT: + x -= tile_width + if event.key == pygame.K_RIGHT: + x += tile_width + if event.key == pygame.K_UP: + y -= tile_height + if event.key == pygame.K_DOWN: + y += tile_height + grid.circle(x, y, 20, color=Colors.RED) + grid.end_draw() + pygame.time.delay(10) + diff --git a/main.py b/main.py index 45c51de..a857b41 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,3 @@ from Interface.vacuum_render import initial_draw -initial_draw() \ No newline at end of file +initial_draw() From 63912b9b246712ee0c14b110044d2d523652b1e8 Mon Sep 17 00:00:00 2001 From: countingthedots Date: Sun, 12 Mar 2023 20:10:18 +0100 Subject: [PATCH 2/3] movement as a seperate function --- Interface/vacuum_render.py | 22 ++++++---------------- main.py | 2 +- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Interface/vacuum_render.py b/Interface/vacuum_render.py index 3732c3e..e19baac 100644 --- a/Interface/vacuum_render.py +++ b/Interface/vacuum_render.py @@ -1,30 +1,20 @@ from Interface.grid_draw import GridDraw, Colors import sys import pygame +from Interface.movement import moving_cleaner # dummy function -def initial_draw(): - grid = GridDraw(500, 500) - tile_width = 500 / 10 - tile_height = 500 / 10 +def initial_draw(grid_width, grid_height): + grid = GridDraw(grid_width, grid_height) + tile_width = grid_width / 10 + tile_height = grid_height / 10 x = tile_width / 2 y = tile_height / 2 radius = 15 while True: grid.start_draw() grid.board(10, 10) - for event in pygame.event.get(): - if event.type == pygame.QUIT: - sys.exit() - if event.type == pygame.KEYDOWN: - if event.key == pygame.K_LEFT: - x -= tile_width - if event.key == pygame.K_RIGHT: - x += tile_width - if event.key == pygame.K_UP: - y -= tile_height - if event.key == pygame.K_DOWN: - y += tile_height + (x,y) = moving_cleaner(grid_width,grid_height,tile_width,tile_height, x, y) grid.circle(x, y, 20, color=Colors.RED) grid.end_draw() pygame.time.delay(10) diff --git a/main.py b/main.py index a857b41..2b8ee4a 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,3 @@ from Interface.vacuum_render import initial_draw -initial_draw() +initial_draw(500, 500) From 9db0cc3cfdb3b584c4f2b0ff9d7dd682dc8fad44 Mon Sep 17 00:00:00 2001 From: countingthedots Date: Sun, 12 Mar 2023 20:13:00 +0100 Subject: [PATCH 3/3] movement as a seperate function --- Interface/movement.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Interface/movement.py diff --git a/Interface/movement.py b/Interface/movement.py new file mode 100644 index 0000000..cbcd2c0 --- /dev/null +++ b/Interface/movement.py @@ -0,0 +1,17 @@ +import pygame +import sys + +def moving_cleaner(grid_width, grid_height,tile_width,tile_height, x, y): + for event in pygame.event.get(): + if event.type == pygame.QUIT: + sys.exit() + if event.type == pygame.KEYDOWN: + if event.key == pygame.K_LEFT and x>(tile_width / 2): + x -= tile_width + if event.key == pygame.K_RIGHT and x<(grid_width-(tile_width / 2)): + x += tile_width + if event.key == pygame.K_UP and y>(tile_height / 2): + y -= tile_height + if event.key == pygame.K_DOWN and y<(grid_height-(tile_height / 2)): + y += tile_height + return(x,y)