From e17c55fbcfdb28525c2848716b142ed688d6c165 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:19:09 +0200 Subject: [PATCH 01/19] Mit Ruff formatiert --- game.py | 93 +++++++++++++-------------------------------------------- 1 file changed, 20 insertions(+), 73 deletions(-) diff --git a/game.py b/game.py index 8d2a69e..284fbb8 100644 --- a/game.py +++ b/game.py @@ -7,24 +7,18 @@ SCREEN_HEIGHT = 720 class Game: def __init__(self): pygame.init() - + pygame.display.set_caption("School Game") self.clock = pygame.Clock() - self.screen: pygame.Surface = pygame.display.set_mode( - (SCREEN_WIDTH, SCREEN_HEIGHT) - ) - - self.display: pygame.Surface = pygame.Surface( - (self.screen.get_width() // 2, self.screen.get_height() // 2) - ) + self.screen: pygame.Surface = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT)) + self.display: pygame.Surface = pygame.Surface((self.screen.get_width() // 2, self.screen.get_height() // 2)) self.running: bool = True self.dt: int = 0 - self.player_pos = pygame.Vector2(self.display.get_width() / 2, self.display.get_height() / 2) self.player_width = 20 self.player_height = 20 @@ -40,11 +34,7 @@ class Game: self.light_points: list[pygame.Vector2] = [] - self.walls = [ - pygame.Rect(100, 100, 20, 50), - pygame.Rect(300, 300, 200, 20), - pygame.Rect(550, 80, 20, 200) - ] + self.walls = [pygame.Rect(100, 100, 20, 50), pygame.Rect(300, 300, 200, 20), pygame.Rect(550, 80, 20, 200)] self.light_radius = 75 # self.circle = pygame.geometry.Circle(self.player_pos[0], self.player_pos[1], 30) @@ -53,21 +43,15 @@ class Game: while self.running: self.dt: float = self.clock.tick(60) / 1000.0 - self.update() self.calculate_collsions() self.render() - - self.screen.blit( - pygame.transform.scale(self.display, self.screen.get_size()) - ) + self.screen.blit(pygame.transform.scale(self.display, self.screen.get_size())) pygame.display.update() - - def update(self) -> None: # Event-Keys for event in pygame.event.get(): @@ -85,19 +69,15 @@ class Game: if event.key == pygame.K_LSHIFT: self.player.speed = 150 - if...: + if ...: ... - self.player.update(walls=self.walls, dt=self.dt) - - def render(self) -> None: self.display.fill((0, 0, 0, 0)) - """RAYCASTING""" ray_end = pygame.Vector2() self.light_points = [] @@ -105,48 +85,33 @@ class Game: # Lichtstrahlen berechnen for i in range(360): - rotated_vector = vector.rotate(i) ray_end = self.player_pos + rotated_vector - - # Überschneidung mit den Wänden prüfen for wall in self.walls: überschneidung = wall.clipline(self.player_pos, ray_end) - if überschneidung: schnittpunkt = pygame.Vector2(überschneidung[0]) ray_end = schnittpunkt - self.light_points.append(ray_end) - - self.flashlight_rect = pygame.draw.polygon( - self.display, - (243, 255, 74), - self.light_points - ) + self.flashlight_rect = pygame.draw.polygon(self.display, (243, 255, 74), self.light_points) pygame.draw.rect(self.display, (255, 0, 0), self.flashlight_rect, 1) self.player.render(surface=self.display) pygame.draw.rect(self.display, self.color_item, self.item_rect) - - - for wall in self.walls: pygame.draw.rect(self.display, "grey", wall) - def calculate_collsions(self) -> None: - - for light_ray in self.light_points: + for light_ray in self.light_points: nearest_x = self.player_pos.x if self.player_pos.x < self.item_rect.left: nearest_x = self.item_rect.left @@ -187,7 +152,6 @@ class Game: return distance_squared < self.radius * self.radius - class Player: def __init__(self, game, pos: pygame.Vector2, width, height): self.game = game @@ -198,40 +162,32 @@ class Player: self.speed = 150 - self.rect = pygame.Rect(self.pos[0]-self.width/2, self.pos[1]-self.height/2, width, height) + self.rect = pygame.Rect(self.pos[0] - self.width / 2, self.pos[1] - self.height / 2, width, height) def update(self, walls, dt): - # Smooth Movement keys = pygame.key.get_pressed() - - direction = pygame.Vector2( - keys[pygame.K_d] - keys[pygame.K_a], - keys[pygame.K_s] - keys[pygame.K_w] - ) + + direction = pygame.Vector2(keys[pygame.K_d] - keys[pygame.K_a], keys[pygame.K_s] - keys[pygame.K_w]) if direction.length_squared() > 0: direction = direction.normalize() movement: pygame.Vector2 = direction * self.speed * dt - - self.pos.x += movement.x - if self.pos.x - self.width/2 < 0: - self.pos.x = self.width/2 + if self.pos.x - self.width / 2 < 0: + self.pos.x = self.width / 2 - - if self.pos.x + self.width/2 > SCREEN_WIDTH/2: - self.pos.x = SCREEN_WIDTH/2 - self.width/2 + if self.pos.x + self.width / 2 > SCREEN_WIDTH / 2: + self.pos.x = SCREEN_WIDTH / 2 - self.width / 2 # self.pos += movement - # player_rect.center = round(player_pos) self.rect.centerx = round(self.pos.x) - + for wall in walls: if self.rect.colliderect(wall): if movement.x > 0: @@ -242,15 +198,13 @@ class Player: self.pos.x = self.rect.centerx - - self.pos.y += movement.y - if self.pos.y - self.height/2 < 0: - self.pos.y = self.height/2 + if self.pos.y - self.height / 2 < 0: + self.pos.y = self.height / 2 - if self.pos.y + self.height/2 > SCREEN_HEIGHT/2: - self.pos.y = SCREEN_HEIGHT/2 - self.height/2 + if self.pos.y + self.height / 2 > SCREEN_HEIGHT / 2: + self.pos.y = SCREEN_HEIGHT / 2 - self.height / 2 self.rect.centery = round(self.pos.y) @@ -264,17 +218,11 @@ class Player: self.pos.y = self.rect.centery - - - - def render(self, surface): pygame.draw.rect(surface, (255, 0, 0), self.rect) - - game = Game() game.run() @@ -294,4 +242,3 @@ game.run() ------------------------------------- GEHST. ------------------------------------- """ - -- 2.45.2 From e3c70182fbda7519cba20ebeacd17f5a3c43a0c4 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:20:38 +0200 Subject: [PATCH 02/19] =?UTF-8?q?Game.=5F=5Finit=5F=5F=20aufger=C3=A4umt?= =?UTF-8?q?=20und=20kommentiert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/game.py b/game.py index 284fbb8..59de898 100644 --- a/game.py +++ b/game.py @@ -6,39 +6,31 @@ SCREEN_HEIGHT = 720 class Game: def __init__(self): + # Pygame setup pygame.init() - pygame.display.set_caption("School Game") - self.clock = pygame.Clock() + # Surfaces self.screen: pygame.Surface = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT)) - self.display: pygame.Surface = pygame.Surface((self.screen.get_width() // 2, self.screen.get_height() // 2)) - + # Pygame-Variablen self.running: bool = True - self.dt: int = 0 - + # Spieler self.player_pos = pygame.Vector2(self.display.get_width() / 2, self.display.get_height() / 2) self.player_width = 20 self.player_height = 20 - self.player = Player(self, self.player_pos, width=self.player_width, height=self.player_height) - + # Items self.item_rect = pygame.Rect(70, 150, 10, 10) - self.flashlight = 0 self.flashlight_rect = pygame.Rect(0, 0, 0, 0) - self.color_item = (0, 0, 0) - self.light_points: list[pygame.Vector2] = [] - + # Level self.walls = [pygame.Rect(100, 100, 20, 50), pygame.Rect(300, 300, 200, 20), pygame.Rect(550, 80, 20, 200)] self.light_radius = 75 - # self.circle = pygame.geometry.Circle(self.player_pos[0], self.player_pos[1], 30) - def run(self) -> None: while self.running: self.dt: float = self.clock.tick(60) / 1000.0 -- 2.45.2 From fd9018d0f1d0e1a68932c9d09f372934f9889d9f Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:22:28 +0200 Subject: [PATCH 03/19] =?UTF-8?q?Unn=C3=B6tige=20Instanzvariablen=20durch?= =?UTF-8?q?=20Konstante=20PLAYER=5FSIZE=20ersetzt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/game.py b/game.py index 59de898..7ac7bec 100644 --- a/game.py +++ b/game.py @@ -2,6 +2,7 @@ import pygame SCREEN_WIDTH = 1280 SCREEN_HEIGHT = 720 +PLAYER_SIZE = 20 class Game: @@ -18,9 +19,7 @@ class Game: self.dt: int = 0 # Spieler self.player_pos = pygame.Vector2(self.display.get_width() / 2, self.display.get_height() / 2) - self.player_width = 20 - self.player_height = 20 - self.player = Player(self, self.player_pos, width=self.player_width, height=self.player_height) + self.player = Player(self, self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE) # Items self.item_rect = pygame.Rect(70, 150, 10, 10) self.flashlight = 0 -- 2.45.2 From 48cda170ddaac16a8c75fd4accda69c8731559f2 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:25:13 +0200 Subject: [PATCH 04/19] Game.light_radius durch Konstante LIGHT_RADIUS ersetzt. --- game.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game.py b/game.py index 7ac7bec..2229515 100644 --- a/game.py +++ b/game.py @@ -3,6 +3,7 @@ import pygame SCREEN_WIDTH = 1280 SCREEN_HEIGHT = 720 PLAYER_SIZE = 20 +LIGHT_RADIUS = 75 class Game: @@ -28,7 +29,6 @@ class Game: self.light_points: list[pygame.Vector2] = [] # Level self.walls = [pygame.Rect(100, 100, 20, 50), pygame.Rect(300, 300, 200, 20), pygame.Rect(550, 80, 20, 200)] - self.light_radius = 75 def run(self) -> None: while self.running: @@ -72,7 +72,7 @@ class Game: """RAYCASTING""" ray_end = pygame.Vector2() self.light_points = [] - vector = pygame.Vector2(self.light_radius, 0) + vector = pygame.Vector2(LIGHT_RADIUS, 0) # Lichtstrahlen berechnen for i in range(360): -- 2.45.2 From 8bc852c29dc7f994d63c6340557e4e805e707130 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:26:15 +0200 Subject: [PATCH 05/19] =?UTF-8?q?Unn=C3=B6tige=20Game.flashlight=20Variabl?= =?UTF-8?q?e=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game.py | 1 - 1 file changed, 1 deletion(-) diff --git a/game.py b/game.py index 2229515..360d072 100644 --- a/game.py +++ b/game.py @@ -23,7 +23,6 @@ class Game: self.player = Player(self, self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE) # Items self.item_rect = pygame.Rect(70, 150, 10, 10) - self.flashlight = 0 self.flashlight_rect = pygame.Rect(0, 0, 0, 0) self.color_item = (0, 0, 0) self.light_points: list[pygame.Vector2] = [] -- 2.45.2 From 10df1d884aa8fdf3716277470e409edfa1b0902a Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:26:39 +0200 Subject: [PATCH 06/19] overlaps_rect-Methode entfernt --- game.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/game.py b/game.py index 360d072..f4b143b 100644 --- a/game.py +++ b/game.py @@ -123,24 +123,6 @@ class Game: else: self.color_item = (0, 0, 0) - def overlaps_rect(self, rect): - nearest_x = self.x - if self.x < rect.left: - nearest_x = rect.left - elif self.x > rect.right: - nearest_x = rect.right - - nearest_y = self.y - if self.y < rect.top: - nearest_y = rect.top - elif self.y > rect.bottom: - nearest_y = rect.bottom - - dx = self.x - nearest_x - dy = self.y - nearest_y - distance_squared = dx * dx + dy * dy - return distance_squared < self.radius * self.radius - class Player: def __init__(self, game, pos: pygame.Vector2, width, height): -- 2.45.2 From 14848609f68aa3f768b72dc774436e869b8858de Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:27:03 +0200 Subject: [PATCH 07/19] =?UTF-8?q?Unn=C3=B6tiger=20if-Block=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/game.py b/game.py index f4b143b..f9e9346 100644 --- a/game.py +++ b/game.py @@ -59,9 +59,6 @@ class Game: if event.key == pygame.K_LSHIFT: self.player.speed = 150 - if ...: - ... - self.player.update(walls=self.walls, dt=self.dt) def render(self) -> None: -- 2.45.2 From 67457a79fbe1b5b70e0bd5798975d8000cebb64d Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:27:37 +0200 Subject: [PATCH 08/19] if-Anweisung mit Ruff optimiert. --- game.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/game.py b/game.py index f9e9346..7ae96a7 100644 --- a/game.py +++ b/game.py @@ -55,9 +55,8 @@ class Game: if event.key == pygame.K_LSHIFT: self.player.speed = 300 - if event.type == pygame.KEYUP: - if event.key == pygame.K_LSHIFT: - self.player.speed = 150 + if event.type == pygame.KEYUP and event.key == pygame.K_LSHIFT: + self.player.speed = 150 self.player.update(walls=self.walls, dt=self.dt) -- 2.45.2 From 3ea58cff3317b2fd2f9174fe5459e67a8476be8e Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:29:00 +0200 Subject: [PATCH 09/19] =?UTF-8?q?Unn=C3=B6tige=20Leerzeilen=20+=20Kommenta?= =?UTF-8?q?re=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game.py | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/game.py b/game.py index 7ae96a7..6361014 100644 --- a/game.py +++ b/game.py @@ -35,26 +35,20 @@ class Game: self.update() self.calculate_collsions() - self.render() self.screen.blit(pygame.transform.scale(self.display, self.screen.get_size())) - pygame.display.update() def update(self) -> None: - # Event-Keys for event in pygame.event.get(): if event.type == pygame.QUIT: self.running = False - if event.type == pygame.KEYDOWN: if event.key == pygame.K_ESCAPE: self.running = False - if event.key == pygame.K_LSHIFT: self.player.speed = 300 - if event.type == pygame.KEYUP and event.key == pygame.K_LSHIFT: self.player.speed = 150 @@ -77,19 +71,14 @@ class Game: # Überschneidung mit den Wänden prüfen for wall in self.walls: überschneidung = wall.clipline(self.player_pos, ray_end) - if überschneidung: schnittpunkt = pygame.Vector2(überschneidung[0]) - ray_end = schnittpunkt - self.light_points.append(ray_end) self.flashlight_rect = pygame.draw.polygon(self.display, (243, 255, 74), self.light_points) pygame.draw.rect(self.display, (255, 0, 0), self.flashlight_rect, 1) - self.player.render(surface=self.display) - pygame.draw.rect(self.display, self.color_item, self.item_rect) for wall in self.walls: @@ -124,19 +113,15 @@ class Player: def __init__(self, game, pos: pygame.Vector2, width, height): self.game = game self.pos = pos - self.width = width self.height = height - self.speed = 150 - self.rect = pygame.Rect(self.pos[0] - self.width / 2, self.pos[1] - self.height / 2, width, height) def update(self, walls, dt): # Smooth Movement keys = pygame.key.get_pressed() - direction = pygame.Vector2(keys[pygame.K_d] - keys[pygame.K_a], keys[pygame.K_s] - keys[pygame.K_w]) if direction.length_squared() > 0: @@ -148,65 +133,37 @@ class Player: if self.pos.x - self.width / 2 < 0: self.pos.x = self.width / 2 - if self.pos.x + self.width / 2 > SCREEN_WIDTH / 2: self.pos.x = SCREEN_WIDTH / 2 - self.width / 2 - # self.pos += movement - - # player_rect.center = round(player_pos) self.rect.centerx = round(self.pos.x) for wall in walls: if self.rect.colliderect(wall): if movement.x > 0: self.rect.right = wall.left - elif movement.x < 0: self.rect.left = wall.right - self.pos.x = self.rect.centerx self.pos.y += movement.y if self.pos.y - self.height / 2 < 0: self.pos.y = self.height / 2 - if self.pos.y + self.height / 2 > SCREEN_HEIGHT / 2: self.pos.y = SCREEN_HEIGHT / 2 - self.height / 2 - self.rect.centery = round(self.pos.y) for wall in walls: if self.rect.colliderect(wall): if movement.y > 0: self.rect.bottom = wall.top - elif movement.y < 0: self.rect.top = wall.bottom - self.pos.y = self.rect.centery def render(self, surface): - pygame.draw.rect(surface, (255, 0, 0), self.rect) game = Game() game.run() - - -""" -------------------------------------- HAUSAUFGABE ------------------------------------- - -------------------------------------- MACHE, DASS ------------------------------------- - -------------------------------------- DU NICHT W- ------------------------------------- - -------------------------------------- EITERLÄUFST ------------------------------------- - -------------------------------------- WENN DU AUS ------------------------------------- - -------------------------------------- DEM SCREEN ------------------------------------- - -------------------------------------- GEHST. ------------------------------------- -""" -- 2.45.2 From 85ec7c61e79e5446da0b3d02d9272cec5ae3d273 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:30:30 +0200 Subject: [PATCH 10/19] Render-Befehle - self.screen.blit() - pygame.display.update() in Game.render() verschoben. --- game.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/game.py b/game.py index 6361014..683775a 100644 --- a/game.py +++ b/game.py @@ -37,9 +37,6 @@ class Game: self.calculate_collsions() self.render() - self.screen.blit(pygame.transform.scale(self.display, self.screen.get_size())) - pygame.display.update() - def update(self) -> None: for event in pygame.event.get(): if event.type == pygame.QUIT: @@ -84,6 +81,9 @@ class Game: for wall in self.walls: pygame.draw.rect(self.display, "grey", wall) + self.screen.blit(pygame.transform.scale(self.display, self.screen.get_size())) + pygame.display.update() + def calculate_collsions(self) -> None: for light_ray in self.light_points: -- 2.45.2 From 2b31c1de546ca609e4bcb49409800f1d8c2594d3 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:35:25 +0200 Subject: [PATCH 11/19] =?UTF-8?q?Logik=20f=C3=BCr=20Erstellung=20der=20Lic?= =?UTF-8?q?htpunkte=20(Raycasting)=20aus=20Game.render=20in=20eigene=20Met?= =?UTF-8?q?hode=20"Game.create=5Flight=5Fpoints()"=20ausgelagert,=20da=20G?= =?UTF-8?q?ame.render=20sich=20nur=20ums=20Zeichnen=20k=C3=BCmmern=20sollt?= =?UTF-8?q?e,=20nicht=20um=20etwas=20zu=20erstellen=20oder=20berechnen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/game.py b/game.py index 683775a..b6aec3b 100644 --- a/game.py +++ b/game.py @@ -50,13 +50,10 @@ class Game: self.player.speed = 150 self.player.update(walls=self.walls, dt=self.dt) + self.create_light_points() - def render(self) -> None: - self.display.fill((0, 0, 0, 0)) - - """RAYCASTING""" - ray_end = pygame.Vector2() + def create_light_points(self): self.light_points = [] vector = pygame.Vector2(LIGHT_RADIUS, 0) @@ -73,6 +70,11 @@ class Game: ray_end = schnittpunkt self.light_points.append(ray_end) + + def render(self) -> None: + + self.display.fill((0, 0, 0, 0)) + self.flashlight_rect = pygame.draw.polygon(self.display, (243, 255, 74), self.light_points) pygame.draw.rect(self.display, (255, 0, 0), self.flashlight_rect, 1) self.player.render(surface=self.display) -- 2.45.2 From 820ba422138725d962b5fa0b980e1584d31d3bf8 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:46:45 +0200 Subject: [PATCH 12/19] Methode calculate_collisions geleert + Lichtpunkte-Erstellung etwas umstrukturiert. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tipp für die Zukunft: Bevor du eine Instanzvariable (wie z. B. self.light_points" erstellst, überlege dir zuerst, ob es sich um Daten handelt, die du an verschiedenen Stellen erreichen musst. Denn nur dafür sollten Instanzvariablen angelegt werden. --- game.py | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/game.py b/game.py index b6aec3b..d1a62ea 100644 --- a/game.py +++ b/game.py @@ -1,4 +1,6 @@ import pygame +from pygame.math import Vector2 +from pygame.rect import Rect SCREEN_WIDTH = 1280 SCREEN_HEIGHT = 720 @@ -25,9 +27,10 @@ class Game: self.item_rect = pygame.Rect(70, 150, 10, 10) self.flashlight_rect = pygame.Rect(0, 0, 0, 0) self.color_item = (0, 0, 0) - self.light_points: list[pygame.Vector2] = [] # Level self.walls = [pygame.Rect(100, 100, 20, 50), pygame.Rect(300, 300, 200, 20), pygame.Rect(550, 80, 20, 200)] + # Licht + self.light_points: list[pygame.Vector2] def run(self) -> None: while self.running: @@ -50,11 +53,11 @@ class Game: self.player.speed = 150 self.player.update(walls=self.walls, dt=self.dt) - self.create_light_points() + self.light_points: list[Vector2] = self.create_light_points() - def create_light_points(self): - self.light_points = [] + def create_light_points(self)-> list[pygame.Vector2]: + light_points: list[pygame.Vector2] = [] vector = pygame.Vector2(LIGHT_RADIUS, 0) # Lichtstrahlen berechnen @@ -68,15 +71,14 @@ class Game: if überschneidung: schnittpunkt = pygame.Vector2(überschneidung[0]) ray_end = schnittpunkt - self.light_points.append(ray_end) - + light_points.append(ray_end) + return light_points def render(self) -> None: self.display.fill((0, 0, 0, 0)) - self.flashlight_rect = pygame.draw.polygon(self.display, (243, 255, 74), self.light_points) - pygame.draw.rect(self.display, (255, 0, 0), self.flashlight_rect, 1) + self.flashlight_rect: Rect = pygame.draw.polygon(self.display, (243, 255, 74), self.light_points) self.player.render(surface=self.display) pygame.draw.rect(self.display, self.color_item, self.item_rect) @@ -87,28 +89,7 @@ class Game: pygame.display.update() def calculate_collsions(self) -> None: - - for light_ray in self.light_points: - nearest_x = self.player_pos.x - if self.player_pos.x < self.item_rect.left: - nearest_x = self.item_rect.left - elif self.player_pos.x > self.item_rect.right: - nearest_x = self.item_rect.right - - nearest_y = self.player_pos.y - if self.player_pos.y < self.item_rect.top: - nearest_y = self.item_rect.top - elif self.player_pos.y > self.item_rect.bottom: - nearest_y = self.item_rect.bottom - - dx = self.player_pos.x - nearest_x - dy = self.player_pos.y - nearest_y - distance_squared = dx * dx + dy * dy - - if distance_squared < light_ray.length_squared(): - self.color_item = (0, 0, 255) - else: - self.color_item = (0, 0, 0) + pass class Player: -- 2.45.2 From 1c457f6c9d1389e5830929664d77a6f67a4f5402 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:47:34 +0200 Subject: [PATCH 13/19] Player.update: Kommentar entfernt --- game.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/game.py b/game.py index d1a62ea..0cb2ca8 100644 --- a/game.py +++ b/game.py @@ -102,8 +102,6 @@ class Player: self.rect = pygame.Rect(self.pos[0] - self.width / 2, self.pos[1] - self.height / 2, width, height) def update(self, walls, dt): - - # Smooth Movement keys = pygame.key.get_pressed() direction = pygame.Vector2(keys[pygame.K_d] - keys[pygame.K_a], keys[pygame.K_s] - keys[pygame.K_w]) -- 2.45.2 From 6e8a94f37ff08f788a718b1395ed2d94bb58508e Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 13:48:52 +0200 Subject: [PATCH 14/19] =?UTF-8?q?Reihenfolge=20der=20Game=20Methoden=20ge?= =?UTF-8?q?=C3=A4ndert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Erst die eigenen Methoden, danach: - update - render - run --- game.py | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/game.py b/game.py index 0cb2ca8..fbd8842 100644 --- a/game.py +++ b/game.py @@ -32,28 +32,9 @@ class Game: # Licht self.light_points: list[pygame.Vector2] - def run(self) -> None: - while self.running: - self.dt: float = self.clock.tick(60) / 1000.0 - self.update() - self.calculate_collsions() - self.render() - - def update(self) -> None: - for event in pygame.event.get(): - if event.type == pygame.QUIT: - self.running = False - if event.type == pygame.KEYDOWN: - if event.key == pygame.K_ESCAPE: - self.running = False - if event.key == pygame.K_LSHIFT: - self.player.speed = 300 - if event.type == pygame.KEYUP and event.key == pygame.K_LSHIFT: - self.player.speed = 150 - - self.player.update(walls=self.walls, dt=self.dt) - self.light_points: list[Vector2] = self.create_light_points() + def calculate_collsions(self) -> None: + pass def create_light_points(self)-> list[pygame.Vector2]: @@ -74,8 +55,24 @@ class Game: light_points.append(ray_end) return light_points - def render(self) -> None: + def update(self) -> None: + for event in pygame.event.get(): + if event.type == pygame.QUIT: + self.running = False + if event.type == pygame.KEYDOWN: + if event.key == pygame.K_ESCAPE: + self.running = False + if event.key == pygame.K_LSHIFT: + self.player.speed = 300 + if event.type == pygame.KEYUP and event.key == pygame.K_LSHIFT: + self.player.speed = 150 + + self.player.update(walls=self.walls, dt=self.dt) + self.light_points: list[Vector2] = self.create_light_points() + + + def render(self) -> None: self.display.fill((0, 0, 0, 0)) self.flashlight_rect: Rect = pygame.draw.polygon(self.display, (243, 255, 74), self.light_points) @@ -88,8 +85,13 @@ class Game: self.screen.blit(pygame.transform.scale(self.display, self.screen.get_size())) pygame.display.update() - def calculate_collsions(self) -> None: - pass + + def run(self) -> None: + while self.running: + self.dt: float = self.clock.tick(60) / 1000.0 + self.update() + self.calculate_collsions() + self.render() class Player: -- 2.45.2 From 2be51cb32e376a3de371ef7024899569e8194d44 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 14:02:33 +0200 Subject: [PATCH 15/19] Item Klasse erstellt und getestet --- game.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/game.py b/game.py index fbd8842..55fb6f7 100644 --- a/game.py +++ b/game.py @@ -8,6 +8,22 @@ PLAYER_SIZE = 20 LIGHT_RADIUS = 75 +class Item: + def __init__(self, x: float, y: float, width: float, height: float, color): + self.x: float = x + self.y: float = y + self.vector = pygame.Vector2(self.x, self.y) + self.width: float = width + self.height: float = height + self.color = color + + @property + def rect(self)-> pygame.Rect: + return pygame.Rect(self.x, self.y, self.width, self.height) + + def render(self, surface) : + pygame.draw.rect(surface, self.color, self.rect) + class Game: def __init__(self): # Pygame setup @@ -27,6 +43,7 @@ class Game: self.item_rect = pygame.Rect(70, 150, 10, 10) self.flashlight_rect = pygame.Rect(0, 0, 0, 0) self.color_item = (0, 0, 0) + self.test_item = Item(0 ,0, 100, 100, "green") # Level self.walls = [pygame.Rect(100, 100, 20, 50), pygame.Rect(300, 300, 200, 20), pygame.Rect(550, 80, 20, 200)] # Licht @@ -81,6 +98,8 @@ class Game: for wall in self.walls: pygame.draw.rect(self.display, "grey", wall) + + self.test_item.render(self.display) self.screen.blit(pygame.transform.scale(self.display, self.screen.get_size())) pygame.display.update() -- 2.45.2 From bfe84273928d9c1763dfa23062a4c03365f84f40 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 14:10:29 +0200 Subject: [PATCH 16/19] self.display entfernt --- game.py | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/game.py b/game.py index 55fb6f7..9b0aaff 100644 --- a/game.py +++ b/game.py @@ -1,11 +1,10 @@ import pygame from pygame.math import Vector2 -from pygame.rect import Rect SCREEN_WIDTH = 1280 SCREEN_HEIGHT = 720 -PLAYER_SIZE = 20 -LIGHT_RADIUS = 75 +PLAYER_SIZE = 40 +LIGHT_RADIUS = 150 class Item: @@ -32,20 +31,17 @@ class Game: self.clock = pygame.Clock() # Surfaces self.screen: pygame.Surface = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT)) - self.display: pygame.Surface = pygame.Surface((self.screen.get_width() // 2, self.screen.get_height() // 2)) # Pygame-Variablen self.running: bool = True self.dt: int = 0 # Spieler - self.player_pos = pygame.Vector2(self.display.get_width() / 2, self.display.get_height() / 2) + self.player_pos = pygame.Vector2(self.screen.get_width() / 2, self.screen.get_height() / 2) self.player = Player(self, self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE) # Items - self.item_rect = pygame.Rect(70, 150, 10, 10) - self.flashlight_rect = pygame.Rect(0, 0, 0, 0) - self.color_item = (0, 0, 0) + self.item_rect = pygame.Rect(70*2, 150*2, 20, 20) self.test_item = Item(0 ,0, 100, 100, "green") # Level - self.walls = [pygame.Rect(100, 100, 20, 50), pygame.Rect(300, 300, 200, 20), pygame.Rect(550, 80, 20, 200)] + self.walls = [pygame.Rect(100*2, 100*2, 20*2, 50*2), pygame.Rect(300*2, 300*2, 200*2, 20*2), pygame.Rect(550*2, 80*2, 20*2, 200*2)] # Licht self.light_points: list[pygame.Vector2] @@ -90,18 +86,20 @@ class Game: def render(self) -> None: - self.display.fill((0, 0, 0, 0)) + self.screen.fill((0, 0, 0, 0)) - self.flashlight_rect: Rect = pygame.draw.polygon(self.display, (243, 255, 74), self.light_points) - self.player.render(surface=self.display) - pygame.draw.rect(self.display, self.color_item, self.item_rect) + # Licht + pygame.draw.polygon(self.screen, (243, 255, 74), self.light_points) + # Item + pygame.draw.rect(self.screen, "blue", self.item_rect) + # Player + self.player.render(surface=self.screen) for wall in self.walls: - pygame.draw.rect(self.display, "grey", wall) + pygame.draw.rect(self.screen, "grey", wall) - self.test_item.render(self.display) + self.test_item.render(self.screen) - self.screen.blit(pygame.transform.scale(self.display, self.screen.get_size())) pygame.display.update() @@ -135,8 +133,8 @@ class Player: if self.pos.x - self.width / 2 < 0: self.pos.x = self.width / 2 - if self.pos.x + self.width / 2 > SCREEN_WIDTH / 2: - self.pos.x = SCREEN_WIDTH / 2 - self.width / 2 + if self.pos.x + self.width / 2 > SCREEN_WIDTH: + self.pos.x = SCREEN_WIDTH - self.width / 2 self.rect.centerx = round(self.pos.x) for wall in walls: @@ -151,8 +149,8 @@ class Player: if self.pos.y - self.height / 2 < 0: self.pos.y = self.height / 2 - if self.pos.y + self.height / 2 > SCREEN_HEIGHT / 2: - self.pos.y = SCREEN_HEIGHT / 2 - self.height / 2 + if self.pos.y + self.height / 2 > SCREEN_HEIGHT: + self.pos.y = SCREEN_HEIGHT - self.height / 2 self.rect.centery = round(self.pos.y) for wall in walls: -- 2.45.2 From bb1a796c1c2e59ee0f552e765c9b39eaa94160e3 Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 14:12:25 +0200 Subject: [PATCH 17/19] item rect durch Objekt ersetzt --- game.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/game.py b/game.py index 9b0aaff..7728546 100644 --- a/game.py +++ b/game.py @@ -38,8 +38,7 @@ class Game: self.player_pos = pygame.Vector2(self.screen.get_width() / 2, self.screen.get_height() / 2) self.player = Player(self, self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE) # Items - self.item_rect = pygame.Rect(70*2, 150*2, 20, 20) - self.test_item = Item(0 ,0, 100, 100, "green") + self.test_item = Item(140 ,300, 20, 20, "blue") # Level self.walls = [pygame.Rect(100*2, 100*2, 20*2, 50*2), pygame.Rect(300*2, 300*2, 200*2, 20*2), pygame.Rect(550*2, 80*2, 20*2, 200*2)] # Licht @@ -91,7 +90,7 @@ class Game: # Licht pygame.draw.polygon(self.screen, (243, 255, 74), self.light_points) # Item - pygame.draw.rect(self.screen, "blue", self.item_rect) + pygame.draw.rect(self.screen, "blue", self.test_item) # Player self.player.render(surface=self.screen) -- 2.45.2 From 926092fe119486f6110faf4610afd4103e5f7bbc Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 14:54:41 +0200 Subject: [PATCH 18/19] =?UTF-8?q?Kollisionslogik=20angepasst:=20-=20F?= =?UTF-8?q?=C3=BCr=20Item=20und=20Lichtkegel=20wird=20jeweils=20eine=20Mas?= =?UTF-8?q?ke=20erstellt.=20-=20Bei=20=C3=9Cberschneidung=20der=20Masken?= =?UTF-8?q?=20findet=20die=20Kollision=20statt.=20-=20Urspr=C3=BCngliche?= =?UTF-8?q?=20Kollisionsmethode=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game.py | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/game.py b/game.py index 7728546..137b2c1 100644 --- a/game.py +++ b/game.py @@ -39,32 +39,31 @@ class Game: self.player = Player(self, self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE) # Items self.test_item = Item(140 ,300, 20, 20, "blue") + self.test_item_mask = pygame.mask.Mask(self.test_item.rect.size, fill=True) # Level self.walls = [pygame.Rect(100*2, 100*2, 20*2, 50*2), pygame.Rect(300*2, 300*2, 200*2, 20*2), pygame.Rect(550*2, 80*2, 20*2, 200*2)] # Licht self.light_points: list[pygame.Vector2] - - - def calculate_collsions(self) -> None: - pass + self.light_surface: pygame.Surface = pygame.Surface((SCREEN_WIDTH,SCREEN_HEIGHT), pygame.SRCALPHA) def create_light_points(self)-> list[pygame.Vector2]: light_points: list[pygame.Vector2] = [] - vector = pygame.Vector2(LIGHT_RADIUS, 0) + origin = self.player.pos + base_ray = pygame.Vector2(LIGHT_RADIUS, 0) # Lichtstrahlen berechnen - for i in range(360): - rotated_vector = vector.rotate(i) - ray_end = self.player_pos + rotated_vector + for angle in range(360): + ray_end = origin + base_ray.rotate(angle) # Überschneidung mit den Wänden prüfen for wall in self.walls: - überschneidung = wall.clipline(self.player_pos, ray_end) - if überschneidung: - schnittpunkt = pygame.Vector2(überschneidung[0]) - ray_end = schnittpunkt + # Überschneidung + intersection = wall.clipline(origin, ray_end) + if intersection: + ray_end = pygame.Vector2(intersection[0]) light_points.append(ray_end) + return light_points @@ -86,18 +85,22 @@ class Game: def render(self) -> None: self.screen.fill((0, 0, 0, 0)) - # Licht - pygame.draw.polygon(self.screen, (243, 255, 74), self.light_points) - # Item - pygame.draw.rect(self.screen, "blue", self.test_item) - # Player - self.player.render(surface=self.screen) + self.light_surface.fill((0, 0, 0, 0)) + pygame.draw.polygon(self.light_surface, (243, 255, 74, 255), self.create_light_points()) + + self.screen.blit(self.light_surface, (0, 0)) + + light_mask = pygame.mask.from_surface(self.light_surface) + if light_mask.overlap(self.test_item_mask, self.test_item.rect.topleft) is not None: + # Item + self.test_item.render(self.screen) for wall in self.walls: pygame.draw.rect(self.screen, "grey", wall) - - self.test_item.render(self.screen) + + # Player + self.player.render(self.screen) pygame.display.update() @@ -106,7 +109,6 @@ class Game: while self.running: self.dt: float = self.clock.tick(60) / 1000.0 self.update() - self.calculate_collsions() self.render() -- 2.45.2 From dbe1ca4a2d84a67299a6e3f8cba0a56dd0c9abda Mon Sep 17 00:00:00 2001 From: binaerverkehr <65082683+binaerverkehr@users.noreply.github.com> Date: Sat, 26 Sep 2026 15:00:21 +0200 Subject: [PATCH 19/19] Clean up --- game.py | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/game.py b/game.py index 137b2c1..1846389 100644 --- a/game.py +++ b/game.py @@ -1,8 +1,11 @@ import pygame from pygame.math import Vector2 +from pygame.rect import Rect +from pygame.typing import SequenceLike SCREEN_WIDTH = 1280 SCREEN_HEIGHT = 720 +SCREEN_CENTER = (SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2) PLAYER_SIZE = 40 LIGHT_RADIUS = 150 @@ -14,7 +17,7 @@ class Item: self.vector = pygame.Vector2(self.x, self.y) self.width: float = width self.height: float = height - self.color = color + self.color: SequenceLike[int] | str | int = color @property def rect(self)-> pygame.Rect: @@ -36,20 +39,20 @@ class Game: self.dt: int = 0 # Spieler self.player_pos = pygame.Vector2(self.screen.get_width() / 2, self.screen.get_height() / 2) - self.player = Player(self, self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE) + self.player = Player(self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE) # Items self.test_item = Item(140 ,300, 20, 20, "blue") self.test_item_mask = pygame.mask.Mask(self.test_item.rect.size, fill=True) # Level - self.walls = [pygame.Rect(100*2, 100*2, 20*2, 50*2), pygame.Rect(300*2, 300*2, 200*2, 20*2), pygame.Rect(550*2, 80*2, 20*2, 200*2)] + self.walls: list[Rect] = [pygame.Rect(100*2, 100*2, 20*2, 50*2), pygame.Rect(300*2, 300*2, 200*2, 20*2), pygame.Rect(550*2, 80*2, 20*2, 200*2)] # Licht self.light_points: list[pygame.Vector2] self.light_surface: pygame.Surface = pygame.Surface((SCREEN_WIDTH,SCREEN_HEIGHT), pygame.SRCALPHA) def create_light_points(self)-> list[pygame.Vector2]: - light_points: list[pygame.Vector2] = [] - origin = self.player.pos + points: list[pygame.Vector2] = [] + origin: Vector2 = self.player.pos base_ray = pygame.Vector2(LIGHT_RADIUS, 0) # Lichtstrahlen berechnen @@ -62,12 +65,13 @@ class Game: intersection = wall.clipline(origin, ray_end) if intersection: ray_end = pygame.Vector2(intersection[0]) - light_points.append(ray_end) + points.append(ray_end) - return light_points + return points def update(self) -> None: + # Ereignisse for event in pygame.event.get(): if event.type == pygame.QUIT: self.running = False @@ -78,30 +82,32 @@ class Game: self.player.speed = 300 if event.type == pygame.KEYUP and event.key == pygame.K_LSHIFT: self.player.speed = 150 - + # Spielzustände aktualisieren self.player.update(walls=self.walls, dt=self.dt) self.light_points: list[Vector2] = self.create_light_points() def render(self) -> None: + # Hintergrund self.screen.fill((0, 0, 0, 0)) + # Licht self.light_surface.fill((0, 0, 0, 0)) pygame.draw.polygon(self.light_surface, (243, 255, 74, 255), self.create_light_points()) - self.screen.blit(self.light_surface, (0, 0)) - light_mask = pygame.mask.from_surface(self.light_surface) if light_mask.overlap(self.test_item_mask, self.test_item.rect.topleft) is not None: - # Item + # Item zeichnen, wenn Masken sich überlappen self.test_item.render(self.screen) + # Wände for wall in self.walls: pygame.draw.rect(self.screen, "grey", wall) - # Player + # Spieler self.player.render(self.screen) + # Surfaces aktualisieren pygame.display.update() @@ -113,11 +119,10 @@ class Game: class Player: - def __init__(self, game, pos: pygame.Vector2, width, height): - self.game = game - self.pos = pos - self.width = width - self.height = height + def __init__(self, pos: pygame.Vector2, width, height): + self.pos: Vector2 = pos + self.width: float = width + self.height: float = height self.speed = 150 self.rect = pygame.Rect(self.pos[0] - self.width / 2, self.pos[1] - self.height / 2, width, height) -- 2.45.2