diff --git a/Interface/grid_draw.py b/Interface/grid_draw.py index 5f5b4e7..ca0b7fd 100644 --- a/Interface/grid_draw.py +++ b/Interface/grid_draw.py @@ -38,8 +38,10 @@ class GridDraw(): self.background = background if background != None else Colors.BLACK self.sprites = { - 'VACUUM': pygame.transform.scale(pygame.image.load('media/sprites/robot_vacuum.png'), (self.tile_width, self.tile_height)), + 'VACUUM': pygame.transform.scale(pygame.image.load('media/sprites/vacuum.png'), (self.tile_width, self.tile_height)), 'WALL': pygame.transform.scale(pygame.image.load('media/sprites/wall.png'), (self.tile_width, self.tile_height)), + 'TILE': pygame.transform.scale(pygame.image.load('media/sprites/tile.jpeg'), (self.tile_width, self.tile_height)), + 'PEEL': pygame.transform.scale(pygame.image.load('media/sprites/peel.webp'), (self.tile_width, self.tile_height)), } pygame.init() @@ -75,14 +77,14 @@ class GridDraw(): def circle(self, x, y, radius, color = None): pygame.draw.circle(self.screen, color, (x, y), radius) - def draw_vacuum(self, tile_x, tile_y): + def draw_sprite(self, tile_x, tile_y, sprite): self.screen.blit( - self.sprites['VACUUM'], + self.sprites[sprite], (tile_x * self.tile_width, tile_y * self.tile_height) ) - def draw_wall(self, tile_x, tile_y): - self.screen.blit( - self.sprites['WALL'], - (tile_x * self.tile_width, tile_y * self.tile_height) - ) \ No newline at end of file + def fill_grid_with_sprite(self, sprite): + for tile_x in range(self.tiles_x): + for tile_y in range(self.tiles_y): + self.draw_sprite(tile_x, tile_y, sprite) + diff --git a/Interface/vacuum_render.py b/Interface/vacuum_render.py index 575d600..c64e984 100644 --- a/Interface/vacuum_render.py +++ b/Interface/vacuum_render.py @@ -1,23 +1,35 @@ from Interface.grid_draw import GridDraw, Colors import sys import pygame +from random import randint GRID_SIZE_X = 10 GRID_SIZE_Y = 10 # dummy function def initial_draw(): - grid = GridDraw(500, 500, GRID_SIZE_X, GRID_SIZE_Y) + grid = GridDraw(800, 800, GRID_SIZE_X, GRID_SIZE_Y) x = 2 y = 2 + peels = [] + for _ in range(10): + temp_x = randint(0, GRID_SIZE_X) + temp_y = randint(0, GRID_SIZE_Y) + peels.append((temp_x, temp_y)) + + while True: grid.start_draw() + # grid.draw_vacuum(x, y) + grid.fill_grid_with_sprite('TILE') grid.board() - grid.draw_wall(0, 0) - grid.draw_vacuum(x, y) + for peel in peels: + grid.draw_sprite(peel[0], peel[1], "PEEL") + + grid.draw_sprite(x, y, "VACUUM") for event in pygame.event.get(): if event.type == pygame.QUIT: diff --git a/media/sprites/peel.webp b/media/sprites/peel.webp new file mode 100644 index 0000000..b654972 Binary files /dev/null and b/media/sprites/peel.webp differ diff --git a/media/sprites/robot_vacuum.png b/media/sprites/robot_vacuum.png deleted file mode 100644 index ca16fb7..0000000 Binary files a/media/sprites/robot_vacuum.png and /dev/null differ diff --git a/media/sprites/tile.jpeg b/media/sprites/tile.jpeg new file mode 100644 index 0000000..b3243aa Binary files /dev/null and b/media/sprites/tile.jpeg differ diff --git a/media/sprites/vacuum.png b/media/sprites/vacuum.png new file mode 100644 index 0000000..977e72c Binary files /dev/null and b/media/sprites/vacuum.png differ