Kollisionslogik angepasst:
- Für Item und Lichtkegel wird jeweils eine Maske erstellt. - Bei Überschneidung der Masken findet die Kollision statt. - Ursprüngliche Kollisionsmethode entfernt
This commit is contained in:
parent
bb1a796c1c
commit
926092fe11
1 changed files with 23 additions and 21 deletions
42
game.py
42
game.py
|
|
@ -39,32 +39,31 @@ class Game:
|
||||||
self.player = Player(self, self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE)
|
self.player = Player(self, self.player_pos, width=PLAYER_SIZE, height=PLAYER_SIZE)
|
||||||
# Items
|
# Items
|
||||||
self.test_item = Item(140 ,300, 20, 20, "blue")
|
self.test_item = Item(140 ,300, 20, 20, "blue")
|
||||||
|
self.test_item_mask = pygame.mask.Mask(self.test_item.rect.size, fill=True)
|
||||||
# Level
|
# 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 = [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
|
# Licht
|
||||||
self.light_points: list[pygame.Vector2]
|
self.light_points: list[pygame.Vector2]
|
||||||
|
self.light_surface: pygame.Surface = pygame.Surface((SCREEN_WIDTH,SCREEN_HEIGHT), pygame.SRCALPHA)
|
||||||
|
|
||||||
def calculate_collsions(self) -> None:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def create_light_points(self)-> list[pygame.Vector2]:
|
def create_light_points(self)-> list[pygame.Vector2]:
|
||||||
light_points: 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
|
# Lichtstrahlen berechnen
|
||||||
for i in range(360):
|
for angle in range(360):
|
||||||
rotated_vector = vector.rotate(i)
|
ray_end = origin + base_ray.rotate(angle)
|
||||||
ray_end = self.player_pos + rotated_vector
|
|
||||||
|
|
||||||
# Überschneidung mit den Wänden prüfen
|
# Überschneidung mit den Wänden prüfen
|
||||||
for wall in self.walls:
|
for wall in self.walls:
|
||||||
überschneidung = wall.clipline(self.player_pos, ray_end)
|
# Überschneidung
|
||||||
if überschneidung:
|
intersection = wall.clipline(origin, ray_end)
|
||||||
schnittpunkt = pygame.Vector2(überschneidung[0])
|
if intersection:
|
||||||
ray_end = schnittpunkt
|
ray_end = pygame.Vector2(intersection[0])
|
||||||
light_points.append(ray_end)
|
light_points.append(ray_end)
|
||||||
|
|
||||||
return light_points
|
return light_points
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -86,18 +85,22 @@ class Game:
|
||||||
|
|
||||||
def render(self) -> None:
|
def render(self) -> None:
|
||||||
self.screen.fill((0, 0, 0, 0))
|
self.screen.fill((0, 0, 0, 0))
|
||||||
|
|
||||||
# Licht
|
# Licht
|
||||||
pygame.draw.polygon(self.screen, (243, 255, 74), self.light_points)
|
self.light_surface.fill((0, 0, 0, 0))
|
||||||
# Item
|
pygame.draw.polygon(self.light_surface, (243, 255, 74, 255), self.create_light_points())
|
||||||
pygame.draw.rect(self.screen, "blue", self.test_item)
|
|
||||||
# Player
|
self.screen.blit(self.light_surface, (0, 0))
|
||||||
self.player.render(surface=self.screen)
|
|
||||||
|
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:
|
for wall in self.walls:
|
||||||
pygame.draw.rect(self.screen, "grey", wall)
|
pygame.draw.rect(self.screen, "grey", wall)
|
||||||
|
|
||||||
self.test_item.render(self.screen)
|
# Player
|
||||||
|
self.player.render(self.screen)
|
||||||
|
|
||||||
pygame.display.update()
|
pygame.display.update()
|
||||||
|
|
||||||
|
|
@ -106,7 +109,6 @@ class Game:
|
||||||
while self.running:
|
while self.running:
|
||||||
self.dt: float = self.clock.tick(60) / 1000.0
|
self.dt: float = self.clock.tick(60) / 1000.0
|
||||||
self.update()
|
self.update()
|
||||||
self.calculate_collsions()
|
|
||||||
self.render()
|
self.render()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue