Changeset 20:ee776b889df7

Timestamp:

12/20/10 08:08:18 (5 years ago)

Author:

Peter Zotov <whitequark@òÀæ>

Branch:

default

Message:

Improve Game interface.

File:

• tanchiki/game.py (modified) (1 diff)

tanchiki/game.py

@@ -3 +3 @@
 
 class Game(object):
-        def __init__(self, bodies, users, width, height):
+        def __init__(self, width, height, bodies):
                 self.bodies = bodies
-                self.users = users
                 self.width = width
                 self.height = height
 
-        def step(game, delta_t):
-                game.next_positions()
-                game.check_collisions()
-                game.check_walls()
-                game.update_positions()
-                game.invoke_ticks()
-                game.respawn()
+        def step(self, delta_t):
+                self.__calculate_positions(delta_t)
+                self.__check_walls()
+                self.__check_collisions()
+                self.__update_positions()
+                self.__invoke_ticks()
 
-        def next_positions(game, delta_t):
+        def __calculate_positions(game, delta_t):
                 for i in game.bodies :
                         i.next_position = i.position + i.velocity*(delta_t)
 
-        def check_collisions(game):
+        def __update_positions(self):
+                for i in self.bodies :
+                        i.position = i.next_position
+
+        def __collides(self, body1, body2):
                 pass
 
-        def collides(self,body1,body2):
+        def __handle_collision(self, body1, body2):
                 pass
 
-        def handle_collision(self,body1,body2):
+        def __check_collisions(game):
                 pass
 
-        def check_walls(game):
+        def __check_walls(game):
                 for i in game.bodies :
-                        if ((i.next_position.x - i.radius) <= 0) or ((i.next_position.y - i.radius) <= 0) or ((i.next_position.x + i.radius) >= game.width) or ((i.next_position.y + i.radius) >= game.height) :
+                        if ((i.next_position.x - i.radius) <= 0) or
+                           ((i.next_position.y - i.radius) <= 0) or
+                           ((i.next_position.x + i.radius) >= game.width) or
+                           ((i.next_position.y + i.radius) >= game.height) :
                                 i.on_wall()
 
-        def update_positions(game):
-                for i in game.bodies :
+        def __update_positions(self):
+                for i in self.bodies :
                         i.position = i.next_position
 
-        def invoke_ticks(game):
-                for i in game.users :
-                        i.tank.on_tick(other_tanks,bullets)
-        
-        def respawn(game):
-                for i in game.users :
-                        if i.tank.strength == 0 :
-                                i.tank.on_spawn()
-                                i.tank.strength = 1 
+        def __invoke_ticks(self):
+                for i in self.bodies :
+                        if i.controller
+                                i.controller.on_tick(other_tanks, bullets)