Skip to content

Commit

Permalink
Reformat window.py
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rayman
Rayman committed Nov 8, 2023
1 parent b8516b6 commit e687cc5
Showing 1 changed file with 35 additions and 31 deletions.
66 changes: 35 additions & 31 deletions snakes/window.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class GameState(Enum):
IDLE = auto()
STEP = auto()


class GameSpeed(Enum):
SLOWER = auto()
FASTER = auto()
Expand Down Expand Up @@ -81,12 +82,12 @@ def __init__(self, window, width, height, snake1=None, snake2=None):
agents[0] = self.all_bots[np.argmax(name_matches)]
else:
agents[0] = choice(self.all_bots)
if snake2:
if snake2:
name_matches = [levenshtein_ratio(name, snake2) for name in names]
agents[1] = self.all_bots[np.argmax(name_matches)]
else:
agents[1] = choice(self.all_bots)

# Create the first game with the first two bots
# The ID's will always represent the player number
self.game = Game(agents=agents)
Expand Down Expand Up @@ -160,16 +161,16 @@ def draw_concrete(self):
button_height = 30
for bot_id, bot in self.root.all_bots.items():
self.root.button(
text=bot(0,(1,1)).name, # Need an object to get the name
text=bot(0, (1, 1)).name, # Need an object to get the name
position=[button_left, button_top],
width=button_width,
height=button_height,
align="left",
parent=self,
window=self.parent.window,

# Need to capture the value explicitly
callback=lambda bot_id=bot_id : self.on_exit(bot_id),
callback=lambda bot_id=bot_id: self.on_exit(bot_id),
)

button_top += button_height + border
Expand Down Expand Up @@ -223,7 +224,7 @@ def is_at_position(self, position):

def set_state(self, state):
self.game_state = state

def set_speed(self, speed=None):
if speed is not None:
self.speed = speed
Expand All @@ -237,7 +238,7 @@ def set_multiplayer(self, multiplayer=None):
self.restart_game()
if self.multiplayer:
self.set_speed(GameSpeed.FASTER)

def set_presenting(self, should_present=None):
if should_present is None:
should_present = not self.presenting
Expand All @@ -249,7 +250,7 @@ def restart_game(self, new_agents=[]):

# extract types from agent objects
agents = {id: type(agent) for i, (id, agent) in enumerate(self.game.agents.items()) if i < 2}

for new_agent in new_agents:
# Replace one of the snakes
agent_id = new_agent['agent_id']
Expand All @@ -272,7 +273,7 @@ def handle_click(self, position):
for button in self.popup.buttons if self.popup else self.buttons:
if button.is_at_position(position):
button.callback()
return # Only handle one button at a time
return # Only handle one button at a time

def handle_mouse_hovers(self, buttons):
mouse = pygame.mouse.get_pos()
Expand Down Expand Up @@ -303,8 +304,7 @@ def update(self):
if self.presenting and time.time() - self.waiting_from > 3:
# Done waiting, gonna start the next round
self.waiting_from = None
self.restart_game([{'agent_id':0}, {'agent_id':1}])

self.restart_game([{'agent_id': 0}, {'agent_id': 1}])

self.window.fill(BLACK)
self.buttons = [] # This is so inefficient.
Expand All @@ -318,7 +318,7 @@ def update(self):
self.handle_mouse_hovers(self.popup.buttons)
else:
self.handle_mouse_hovers(self.buttons)

def sleep(self):
if self.speed == GameSpeed.SLOWER:
time.sleep(0.1)
Expand All @@ -340,11 +340,13 @@ def draw_snake(snake):
if index == 0:
# Neck drawn first so head goes on top, as it should
pygame.draw.line(self.window, body_colour,
(int((position[0] + 0.5) * tile_size), self.height - (int((position[1] + 0.5) * tile_size))),
(int((previous_pos[0] + 0.5) * tile_size), self.height - (int((previous_pos[1] + 0.5) * tile_size))),
body_size
)

(int((position[0] + 0.5) * tile_size),
self.height - (int((position[1] + 0.5) * tile_size))),
(int((previous_pos[0] + 0.5) * tile_size),
self.height - (int((previous_pos[1] + 0.5) * tile_size))),
body_size
)

# Is head
pygame.draw.circle(self.window, COLOURS[snake.id], (
int((position[0] + 0.5) * tile_size),
Expand All @@ -355,7 +357,7 @@ def draw_snake(snake):
eye_offsets = [
np.array([int(0.3 * tile_size), (int(-0.25 * tile_size))]),
np.array([int(0.3 * tile_size), (int(0.25 * tile_size))])
] # Assuming going right
] # Assuming going right
last_move_direction = position - snake[1]
last_move_angle = math.atan2(last_move_direction[1], last_move_direction[0])
for eye_offset in eye_offsets:
Expand All @@ -369,21 +371,23 @@ def draw_snake(snake):
int((position[0] + 0.5) * tile_size + corrected_eye_offset[0]),
int(self.height - (int((position[1] + 0.5) * tile_size)) - corrected_eye_offset[1]),
), eye_radius // 2)

previous_pos = position

else:
# Is body
if previous_pos is not None:
pygame.draw.line(self.window, body_colour,
(int((position[0] + 0.5) * tile_size), self.height - (int((position[1] + 0.5) * tile_size))),
(int((previous_pos[0] + 0.5) * tile_size), self.height - (int((previous_pos[1] + 0.5) * tile_size))),
body_size
)
(int((position[0] + 0.5) * tile_size),
self.height - (int((position[1] + 0.5) * tile_size))),
(int((previous_pos[0] + 0.5) * tile_size),
self.height - (int((previous_pos[1] + 0.5) * tile_size))),
body_size
)
pygame.draw.circle(self.window, body_colour, (
int((position[0] + 0.5) * tile_size),
self.height - (int((position[1] + 0.5) * tile_size)),
), (body_size // 2) - 1) # Don't ask me why -1
), (body_size // 2) - 1) # Don't ask me why -1
previous_pos = position

# Draw snake
Expand Down Expand Up @@ -437,10 +441,10 @@ def update_information(self):
text_size = font.size(text_to_render)
text_object = font.render(text_to_render, True, WHITE)
self.window.blit(text_object, (left + self.border, top + self.border))

if not self.multiplayer:
# Draw contributor
cpu_time = round(self.game.cpu[index] / self.game.turns * 1e6,2) if self.game.turns > 0 else 0
cpu_time = round(self.game.cpu[index] / self.game.turns * 1e6, 2) if self.game.turns > 0 else 0
text_to_render = f"{self.game.agents[index].contributor} | CPU: {cpu_time} us"
font = pygame.font.SysFont(None, 26)
text_object = font.render(text_to_render, True, WHITE)
Expand Down Expand Up @@ -504,8 +508,8 @@ def update_information(self):
position=[button_left, button_top],
width=button_width,
height=button_height,
background_colour = COLOURS[0],
callback=lambda: self.restart_game([{'agent_id':0}])
background_colour=COLOURS[0],
callback=lambda: self.restart_game([{'agent_id': 0}])
)

button_left += button_width + self.border
Expand All @@ -514,8 +518,8 @@ def update_information(self):
position=[button_left, button_top],
width=button_width,
height=button_height,
background_colour = COLOURS[1],
callback=lambda: self.restart_game([{'agent_id':1}])
background_colour=COLOURS[1],
callback=lambda: self.restart_game([{'agent_id': 1}])
)

button_left += button_width + self.border
Expand Down Expand Up @@ -549,4 +553,4 @@ def update_information(self):
def rotate_vector(self, vector, angle):
x = vector[0] * math.cos(angle) - vector[1] * math.sin(angle)
y = vector[0] * math.sin(angle) + vector[1] * math.cos(angle)
return np.array([x, y])
return np.array([x, y])

0 comments on commit e687cc5

Please sign in to comment.