Fixed line collision detection

1024Adam · Mar 4, 2017 · 372e93d · 372e93d
1 parent 003e687
commit 372e93d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/infinite_maze/Game.py b/infinite_maze/Game.py
@@ -40,7 +40,7 @@ def updateScreen(self, player, lines):
         self.screen.fill(self.bgColor)
         self.screen.blit(player.getCursor(), player.getPosition())
         for line in lines:
-            pygame.draw.line(self.getScreen(), self.fgColor, line.getStart(), line.getEnd(), 10)
+            pygame.draw.line(self.getScreen(), self.fgColor, line.getStart(), line.getEnd(), 1)
 
         prevClock = self.clock.getSecs()
 

diff --git a/infinite_maze/infinite_maze.py b/infinite_maze/infinite_maze.py
@@ -23,29 +23,37 @@ def maze():
             if (keys[pygame.K_RIGHT] or keys[pygame.K_d]):
                 blocked = 0
                 for line in lines:
-                    if ((player.getX() + player.getSpeed() >= line.getXStart()) and (player.getX() <= line.getXStart()) and (player.getY() + 5 > line.getYStart()) and (player.getY() - 5 < line.getYStart())):
+                    if ((player.getX() + player.getSpeed() >= line.getXStart()) and (player.getX() <= line.getXStart()) and (player.getY() + 6 >= line.getYStart()) and (player.getY() - 6 <= line.getYStart())):
+                        blocked = 1
+                    if ((player.getX() + 5 + player.getSpeed() >= line.getXStart()) and (player.getX() <= line.getXStart()) and (player.getY() >= line.getYStart()) and (player.getY() <= line.getYEnd())):
                         blocked = 1
                 if (not blocked):
                     player.moveX(1)
                     game.updateScore(1)
             if (keys[pygame.K_DOWN] or keys[pygame.K_s]):
                 blocked = 0
                 for line in lines:
-                    if ((player.getY() + player.getSpeed() >= line.getYStart()) and (player.getY() <= line.getYStart()) and (player.getX() + 5 > line.getXStart()) and (player.getX() - 5 < line.getXStart())):
+                    if ((player.getY() + player.getSpeed() >= line.getYStart()) and (player.getY() <= line.getYStart()) and (player.getX() + 6 > line.getXStart()) and (player.getX() - 6 < line.getXStart())):
+                        blocked = 1
+                    if ((player.getY() + 8 + player.getSpeed() >= line.getYStart()) and (player.getY() <= line.getYStart()) and (player.getX() >= line.getXStart()) and (player.getX() <= line.getXEnd())):
                         blocked = 1
                 if (not blocked):
                     player.moveY(1)
             if (keys[pygame.K_UP] or keys[pygame.K_w]):
                 blocked = 0
                 for line in lines:
-                    if ((player.getY() - player.getSpeed() <= line.getYStart()) and (player.getY() >= line.getYStart()) and (player.getX() + 5 > line.getXStart()) and (player.getX() - 5 < line.getXStart())):
+                    if ((player.getY() - player.getSpeed() <= line.getYEnd()) and (player.getY() >= line.getYEnd()) and (player.getX() + 5 > line.getXStart()) and (player.getX() - 5 < line.getXStart())):
+                        blocked = 1
+                    if ((player.getY() - 8 - player.getSpeed() <= line.getYEnd()) and (player.getY() >= line.getYEnd()) and (player.getX() >= line.getXStart()) and (player.getX() <= line.getXEnd())):
                         blocked = 1
                 if (not blocked):
                     player.moveY(-1)
             if (keys[pygame.K_LEFT] or keys[pygame.K_a]):
                 blocked = 0
                 for line in lines:
-                    if ((player.getX() - player.getSpeed() <= line.getXStart()) and (player.getX() >= line.getXStart()) and (player.getY() + 5 > line.getYStart()) and (player.getY() - 5 < line.getYStart())):
+                    if ((player.getX() + 1 - player.getSpeed() <= line.getXEnd()) and (player.getX() >= line.getXEnd()) and (player.getY() + 6 >= line.getYStart()) and (player.getY() - 6 <= line.getYStart())):
+                        blocked = 1
+                    if ((player.getX() - player.getSpeed() <= line.getXEnd()) and (player.getX() >= line.getXEnd()) and (player.getY() >= line.getYStart()) and (player.getY() <= line.getYEnd())):
                         blocked = 1
                 if (not blocked):
                     player.moveX(-1)
@@ -93,7 +101,7 @@ def maze():
             player.reset(80, (game.getHeight() / 2))
 
             # Maze Details
-            lines = Line.generateMaze(5, 5)
+            lines = Line.generateMaze(game, 15, 20)
 
         if (keys[pygame.K_n]):
             game.quit()