Compare commits
No commits in common. "08004b8d3b431ca27cd03f354ca6f8feeac9c19f" and "8a5f4391b122f54d55a0eb043568c12a775ccb07" have entirely different histories.
08004b8d3b
...
8a5f4391b1
1
.gitignore
vendored
|
|
@ -221,3 +221,4 @@ __marimo__/
|
|||
|
||||
|
||||
rechner.py
|
||||
data/
|
||||
BIN
ZIPTE.png
|
Before Width: | Height: | Size: 398 KiB |
|
Before Width: | Height: | Size: 68 KiB |
|
Before Width: | Height: | Size: 64 KiB |
|
Before Width: | Height: | Size: 143 KiB |
|
Before Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 97 KiB |
|
Before Width: | Height: | Size: 824 B |
|
Before Width: | Height: | Size: 2.3 KiB |
73
game.py
|
|
@ -52,7 +52,7 @@ class Game:
|
|||
self.player = Player(self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE)
|
||||
|
||||
# Flashlight
|
||||
self.flashlight_player = Flashlight(self, self.player)
|
||||
self.flashlight = Taschenlampe(self)
|
||||
|
||||
# Items
|
||||
self.test_item = Item(140, 300, 20, 20, "blue")
|
||||
|
|
@ -78,16 +78,16 @@ class Game:
|
|||
if event.key == pygame.K_LSHIFT:
|
||||
self.player.speed = 300
|
||||
if event.key == pygame.K_q:
|
||||
self.flashlight_player.light_state = not self.flashlight_player.light_state
|
||||
if self.flashlight_player.render_item:
|
||||
self.flashlight_player.render_item = False
|
||||
self.flashlight.light_state = not self.flashlight.light_state
|
||||
if self.flashlight.render_item:
|
||||
self.flashlight.render_item = False
|
||||
|
||||
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.flashlight_player.update()
|
||||
self.flashlight.update()
|
||||
|
||||
def render(self) -> None:
|
||||
# Hintergrund
|
||||
|
|
@ -110,8 +110,8 @@ class Game:
|
|||
# -> [][][][][][]
|
||||
|
||||
# Licht
|
||||
self.flashlight_player.render(self.screen)
|
||||
if self.flashlight_player.render_item:
|
||||
self.flashlight.render(self.screen)
|
||||
if self.flashlight.render_item:
|
||||
self.test_item.render(self.screen)
|
||||
|
||||
# Wände
|
||||
|
|
@ -124,7 +124,24 @@ class Game:
|
|||
# Surfaces aktualisieren
|
||||
pygame.display.update()
|
||||
|
||||
def create_light_points(self) -> list[pygame.Vector2]:
|
||||
points: list[pygame.Vector2] = []
|
||||
origin: Vector2 = self.player.pos
|
||||
base_ray = pygame.Vector2(LIGHT_RADIUS, 0)
|
||||
|
||||
# Lichtstrahlen berechnen
|
||||
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
|
||||
intersection = wall.clipline(origin, ray_end)
|
||||
if intersection:
|
||||
ray_end = pygame.Vector2(intersection[0])
|
||||
points.append(ray_end)
|
||||
|
||||
return points
|
||||
|
||||
def run(self) -> None:
|
||||
while self.running:
|
||||
|
|
@ -190,8 +207,8 @@ class Player:
|
|||
pygame.draw.rect(surface, (255, 0, 0), self.rect)
|
||||
|
||||
|
||||
class Flashlight:
|
||||
def __init__(self, game, sprite):
|
||||
class Taschenlampe:
|
||||
def __init__(self, game):
|
||||
self.light_points: list[pygame.Vector2]
|
||||
self.light_surface: pygame.Surface = pygame.Surface(
|
||||
(SCREEN_WIDTH, SCREEN_HEIGHT), pygame.SRCALPHA
|
||||
|
|
@ -199,60 +216,36 @@ class Flashlight:
|
|||
self.light_state: bool = True
|
||||
self.game = game
|
||||
self.render_item = False
|
||||
self.sprite = sprite
|
||||
|
||||
def update(self):
|
||||
self.light_points: list[Vector2] = self.create_light_points()
|
||||
self.light_points: list[Vector2] = self.game.create_light_points()
|
||||
|
||||
def render(self, surface) -> bool:
|
||||
if self.light_state:
|
||||
self.light_surface.fill((0, 0, 0, 0))
|
||||
pygame.draw.polygon(
|
||||
self.light_surface, (243, 255, 74, 255), self.create_light_points()
|
||||
self.light_surface, (243, 255, 74, 255), self.game.create_light_points()
|
||||
)
|
||||
surface.blit(self.light_surface, (0, 0))
|
||||
light_mask = pygame.mask.from_surface(self.light_surface)
|
||||
|
||||
if (
|
||||
light_mask.overlap(
|
||||
self.game.test_item_mask, self.game.test_item.rect.topleft
|
||||
)
|
||||
is not None
|
||||
):
|
||||
if light_mask.overlap(self.game.test_item_mask, self.game.test_item.rect.topleft) is not None:
|
||||
self.render_item = True
|
||||
else:
|
||||
self.render_item = False
|
||||
|
||||
|
||||
# Item zeichnen, wenn Masken sich überlappen
|
||||
|
||||
def create_light_points(self) -> list[pygame.Vector2]:
|
||||
points: list[pygame.Vector2] = []
|
||||
origin: Vector2 = self.sprite.pos
|
||||
base_ray = pygame.Vector2(LIGHT_RADIUS, 0)
|
||||
|
||||
# Lichtstrahlen berechnen
|
||||
for angle in range(360):
|
||||
ray_end = origin + base_ray.rotate(angle)
|
||||
|
||||
# Überschneidung mit den Wänden prüfen
|
||||
for wall in self.game.walls:
|
||||
# Überschneidung
|
||||
intersection = wall.clipline(origin, ray_end)
|
||||
if intersection:
|
||||
ray_end = pygame.Vector2(intersection[0])
|
||||
points.append(ray_end)
|
||||
|
||||
return points
|
||||
|
||||
game = Game()
|
||||
game.run()
|
||||
|
||||
|
||||
"""
|
||||
in Klasse Flashlight:
|
||||
class Taschenlampe erstellen
|
||||
|
||||
Methoden: init(), update(), render()
|
||||
|
||||
create_light_points() in Flashlight machen
|
||||
|
||||
render_item in Item Klasse machen
|
||||
WICHTIG: Alles in ihre richtigen Methoden
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import math
|
||||
|
||||
import pygame
|
||||
|
||||
|
|
|
|||