Added Game Scene

pong/app/app.py

@@ -12,7 +12,7 @@
 point = pygame.mixer.Sound(pong.config.basepath + '/sounds/ohno.wav')
 
 
-class App():
+class App(object):
     def __init__(self):
         self.window = pong.app.window.Window(800, 600, 'Japong!')
 

pong/app/scene.py

@@ -0,0 +1,9 @@
+from pong.app.window import Window
+
+
+class Scene(object):
+    def __init__(self, window: Window):
+        self.window = window
+
+    def run(self):
+        return 0

pong/app/window.py

@@ -8,11 +8,10 @@ def __init__(self, width: int, height: int, title: str):
         self.width = width
         self.height = height
         self.title = title
-
-    def run(self):
         size = (self.width, self.height)
-        screen = pygame.display.set_mode(size)
+        self.screen = pygame.display.set_mode(size)
         pygame.display.set_caption(self.title)
 
-        pong.ponggame.ponggame(screen)
+    def run(self):
+        pong.ponggame.ponggame(self.screen)
         return 0

pong/scenes/gamescene.py

@@ -0,0 +1,98 @@
+import pygame
+
+from pong.app.scene import Scene
+from pong.app.window import Window
+
+
+class GameScene(Scene):
+    def __init__(self, window: Window):
+        super().__init__(window)
+
+    def run(self):
+        import pong.ball
+        import pong.border
+        import pong.config
+        import pong.goal
+        import pong.pad
+        import pong.player
+        import pong.scoreboard
+
+        screen = self.window.screen
+        # game loop control
+        done = False
+        # screen updates
+        clock = pygame.time.Clock()
+        ball = pong.ball.Ball(pong.config.yellow, 10)
+        pad_left = pong.pad.Pad('left')
+        pad_right = pong.pad.Pad('right')
+        pads = pygame.sprite.Group()
+        pads.add(pad_left)
+        pads.add(pad_right)
+        border_top = pong.border.Border(0)
+        border_bottom = pong.border.Border(590)
+        player1 = pong.player.Player('left')
+        player2 = pong.player.Player('computer')
+        score_board = pong.scoreboard.ScoreBoard(player1, player2)
+        goal_left = pong.goal.Goal(0, player2)
+        goal_right = pong.goal.Goal(790, player1)
+        # Prepare sprites
+        all_sprites = pygame.sprite.Group()
+        all_sprites.add(ball)
+        all_sprites.add(border_top)
+        all_sprites.add(border_bottom)
+        all_sprites.add(goal_left)
+        all_sprites.add(goal_right)
+        all_sprites.add(pad_left)
+        all_sprites.add(pad_right)
+        borders = pygame.sprite.Group()
+        borders.add(border_top)
+        borders.add(border_bottom)
+        ball.borders = borders
+        pad_left.borders = borders
+        pad_right.borders = borders
+        ball.pads = pads
+        goals = pygame.sprite.Group()
+        goals.add(goal_left)
+        goals.add(goal_right)
+        # Game loop
+        while not done:
+            # Event
+            for event in pygame.event.get():
+                if event.type == pygame.QUIT:
+                    done = True
+
+            # Game logic
+            pygame.event.pump()
+            key = pygame.key.get_pressed()
+            if key[pygame.K_w]:
+                pad_left.up()
+            elif key[pygame.K_s]:
+                pad_left.down()
+            else:
+                pad_left.stop()
+
+            pad_right.follow(ball)
+
+            all_sprites.update()
+
+            # Manage collisions
+            goal_collisions = pygame.sprite.spritecollide(ball, goals, False)
+            for goal in goal_collisions:
+                goal.hit()
+                goal.player.point()
+                ball.restart()
+
+            # Game draw
+            screen.fill(pong.config.green)
+            score_board.draw(screen)
+            all_sprites.draw(screen)
+
+            # Screen update
+            pygame.display.flip()
+
+            if score_board.stop():
+                done = True
+
+            clock.tick(pong.config.FPS)
+
+        return 0

pong/tests/game-scene-test.py

@@ -0,0 +1,18 @@
+import unittest.mock
+
+import pong.scenes.gamescene
+from pong.app.window import Window
+from pong.tests import events
+
+
+class GameSceneTestCase(unittest.TestCase):
+    @unittest.mock.patch('pygame.event.get', return_value=[events.quit_event])
+    def test_should_run_fine(self, mock):
+        window = pong.app.window.Window(800, 600, 'Test')
+        scene = pong.scenes.gamescene.GameScene(window)
+
+        self.assertEqual(0, scene.run())
+
+
+if __name__ == '__main__':
+    unittest.main()

pong/tests/scene-test.py

@@ -0,0 +1,15 @@
+import unittest.mock
+
+import pong.app.window
+from pong.app.scene import Scene
+from pong.scenes.ganescene import GameScene
+
+class SceneTestCase(unittest.TestCase):
+    def test_should_run_fine(self):
+        window = pong.app.window.Window(800, 600, 'Test')
+        scene = Scene(window)
+        self.assertEquals(0, scene.run())
+
+
+if __name__ == '__main__':
+    unittest.main()