1
0
Fork 0
This commit is contained in:
verde4321 2022-03-20 13:22:19 +01:00
parent d5d4d47772
commit 877b0ff9a6
4 changed files with 96 additions and 41 deletions

View file

@ -7,18 +7,21 @@ from Code.UI.Square import Square
class Field:
def __init__(self):
self.width = math.trunc(GeneralConfig.width / SquareConfig.width)
self.height = math.trunc(GeneralConfig.height / SquareConfig.height)
self.width = math.trunc(GeneralConfig.width / SquareConfig.width) + 2
self.height = math.trunc(GeneralConfig.height / SquareConfig.height) + 2
self.field_shift = -10
self.squares = self._creat_squares()
def _creat_squares(self):
squares = [[Square(x_pos=j * SquareConfig.width, y_pos=i * SquareConfig.height) for i in range(self.height)] for
j in range(self.width)]
print(squares)
squares = [
[Square(x_pos=j * SquareConfig.width + self.field_shift, y_pos=i * SquareConfig.height + self.field_shift)
for i in range(self.height)] for
j in range(self.width)]
return squares
def update_squares(self):
pass
def update_squares(self,squares):
self.squares=squares
def draw_squares(self, window):
for x in self.squares:

View file

@ -1,3 +1,5 @@
from datetime import time
import time as ti
import pygame as pygame
from Code import Config
from Code.Config import GeneralConfig, Colors
@ -9,30 +11,31 @@ from Code.UI.Field import Field
class GameState:
def __init__(self):
self.run = True
self.pause_for_inpuit=False
self.pause_for_input = False
self.field = Field()
self.update_field_events= []
def event_handler(self):
for event in pygame.event.get():
if event.type == pygame.QUIT:
self.run = False
if event.type == pygame.MOUSEBUTTONDOWN:
self._update_field(event)
if event.type == pygame.MOUSEBUTTONUP:
self.update_field_events.append(event)
if event.type == pygame.KEYDOWN:
if event.key == pygame.K_SPACE:
self.pause_for_inpuit=not self.pause_for_inpuit
def _update_field(self, event):
rule = Rules()
self.update_field_events.append(event)
self.pause_for_input = not self.pause_for_input
def update_field_with_input(self, event):
for line in self.field.squares:
for square in line:
if square.rect.collidepoint(event.pos):
rule.get_neighborhood(square, field_of_squares=self.field.squares)
square.update(not square.active)
def update(self):
pass
def evolve(self):
rules = Rules()
self.field.update_squares(rules.evolve_field(self.field))
def redraw_field(self, window):
window.fill(Colors.BLACK)
@ -45,13 +48,31 @@ def run_game():
window = pygame.display.set_mode((GeneralConfig.width, GeneralConfig.height))
clock = pygame.time.Clock()
game_state = GameState()
time_elapsed_since_last_action = 0
while game_state.run:
clock.tick(GeneralConfig.fps)
game_state.event_handler()
if game_state.pause_for_inpuit:
game_state.update()
print(len(game_state.update_field_events))
for event in game_state.update_field_events:
game_state.update_field_with_input(event)
game_state.update_field_events.remove(event)
print("running")
clock.tick(GeneralConfig.fps)
time_elapsed_since_last_action += clock.tick()
if game_state.pause_for_input:
if time_elapsed_since_last_action > 1:
start = ti.time()
game_state.evolve()
end = ti.time()
print(end - start)
time_elapsed_since_last_action = 0 # reset it to 0 so you can count again
game_state.redraw_field(window)
pygame.display.update()
if __name__ == "__main__":
run_game()

View file

@ -3,8 +3,8 @@ from Code.Config import Colors, SquareConfig
class Square:
def __init__(self, x_pos=0, y_pos=0):
self.rect = pygame.Rect(x_pos, y_pos, SquareConfig.width,SquareConfig.height)
def __init__(self, x_pos, y_pos):
self.rect = pygame.Rect(x_pos, y_pos, SquareConfig.width, SquareConfig.height)
self.color = SquareConfig.unclicked_color
self.active = False