Merge pull request 'optimization' (#5) from optimization into main
Reviewed-on: #5
This commit is contained in:
commit
ef2e1a1fb7
@ -1,33 +1,33 @@
|
||||
import sys
|
||||
import pygame
|
||||
|
||||
class Colors():
|
||||
|
||||
class Colors:
|
||||
BLACK = 0, 0, 0
|
||||
WHITE = 255, 255, 255
|
||||
RED = 255, 0, 0
|
||||
GREEN = 0, 255, 0
|
||||
|
||||
|
||||
DEFAULT_COLOR = Colors.WHITE
|
||||
|
||||
def default_color(func):
|
||||
|
||||
def default_color(func):
|
||||
def wrap(*args, **kwargs):
|
||||
if 'color' not in kwargs:
|
||||
kwargs['color'] = DEFAULT_COLOR
|
||||
if "color" not in kwargs:
|
||||
kwargs["color"] = DEFAULT_COLOR
|
||||
result = func(*args, **kwargs)
|
||||
return result
|
||||
|
||||
return wrap
|
||||
|
||||
class GridDraw():
|
||||
def __init__(
|
||||
self,
|
||||
width = None,
|
||||
height = None,
|
||||
background = None
|
||||
):
|
||||
|
||||
class GridDraw:
|
||||
def __init__(self, width=None, height=None, background=None):
|
||||
self.width = width if width != None else 100
|
||||
self.height = height if height != None else 100
|
||||
self.background = background if background != None else Colors.BLACK
|
||||
|
||||
|
||||
pygame.init()
|
||||
self.screen = pygame.display.set_mode((self.width, self.height))
|
||||
|
||||
@ -38,11 +38,11 @@ class GridDraw():
|
||||
pygame.display.flip()
|
||||
|
||||
@default_color
|
||||
def line(self, x_1, y_1, x_2, y_2, color = None):
|
||||
def line(self, x_1, y_1, x_2, y_2, color=None):
|
||||
pygame.draw.line(self.screen, color, (x_1, y_1), (x_2, y_2))
|
||||
|
||||
|
||||
@default_color
|
||||
def board(self, tiles_x, tiles_y, color = None):
|
||||
def board(self, tiles_x, tiles_y, color=None):
|
||||
tiles_width = self.width / tiles_x
|
||||
tiles_height = self.height / tiles_y
|
||||
|
||||
@ -53,5 +53,7 @@ class GridDraw():
|
||||
self.line(0, tiles_height * i, self.width, tiles_height * i, color=color)
|
||||
|
||||
@default_color
|
||||
def circle(self, x, y, radius, color = None):
|
||||
pygame.draw.circle(self.screen, color, (x, y), radius)
|
||||
def circle(self, x, y, color=None):
|
||||
pygame.draw.circle(
|
||||
self.screen, color, (x, y), 20
|
||||
) # TODO calculate radius (now 20) in terms of window size.
|
||||
|
@ -1,17 +1,25 @@
|
||||
import pygame
|
||||
import sys
|
||||
|
||||
def moving_cleaner(grid_width, grid_height,tile_width,tile_height, x, y):
|
||||
|
||||
def robot_movement(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):
|
||||
# go left
|
||||
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)):
|
||||
|
||||
# go right
|
||||
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):
|
||||
|
||||
# go up
|
||||
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)):
|
||||
|
||||
# go down
|
||||
if event.key == pygame.K_DOWN and y < (grid_height - (tile_height / 2)):
|
||||
y += tile_height
|
||||
return(x,y)
|
||||
return (x, y)
|
||||
|
@ -1,21 +1,33 @@
|
||||
from Interface.grid_draw import GridDraw, Colors
|
||||
import sys
|
||||
import pygame
|
||||
from Interface.movement import moving_cleaner
|
||||
from Interface.movement import robot_movement
|
||||
|
||||
# dummy function
|
||||
def initial_draw(grid_width, grid_height):
|
||||
|
||||
def initial_draw(grid_dimensions, board_size):
|
||||
# window name
|
||||
pygame.display.set_caption("AI Vacuum Cleaner")
|
||||
|
||||
# define array for grid
|
||||
border_array = [["" for j in range(board_size)] for i in range(board_size)]
|
||||
|
||||
# set window dimension
|
||||
grid_width = grid_dimensions
|
||||
grid_height = grid_dimensions
|
||||
|
||||
# FIXME @countingthedots: please tell me what is going on there and why???
|
||||
grid = GridDraw(grid_width, grid_height)
|
||||
tile_width = grid_width / 10
|
||||
tile_height = grid_height / 10
|
||||
tile_width = grid_width / board_size
|
||||
tile_height = grid_height / board_size
|
||||
x = tile_width / 2
|
||||
y = tile_height / 2
|
||||
radius = 15
|
||||
radius = 20
|
||||
|
||||
# rendering loop
|
||||
while True:
|
||||
grid.start_draw()
|
||||
grid.board(10, 10)
|
||||
(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)
|
||||
|
||||
grid.board(board_size, board_size)
|
||||
(x, y) = robot_movement(grid_width, grid_height, tile_width, tile_height, x, y)
|
||||
grid.circle(x, y, color=Colors.RED)
|
||||
grid.end_draw()
|
||||
pygame.time.delay(10)
|
||||
|
Loading…
Reference in New Issue
Block a user