Changes in [27:b9856f9de9e2:28:4ef6336d1707]

Location:

tanchiki

Files:

• body.py (modified) (4 diffs)
• game.py (modified) (1 diff)
• vector.py (modified) (4 diffs)

tanchiki/body.py

@@ -5 +5 @@
 
 class Body(object):
-        def __init__(self, position, velocity = vector.Vector.null):
+        def __init__(self, game, position, velocity = vector.Vector.null):
+                self.game = game
                 self.position = position
                 self.velocity = velocity
@@ -13 +14 @@
         model = "tank"
 
-        def __init__(self, position, controller):
-                Body.__init__(self, position)
+        def __init__(self, game, position, controller):
+                Body.__init__(self, game, position)
                 self.controller = controller
                 self.turret = vector.Vector()
@@ -20 +21 @@
 
         def rotate_base(tank, angle): 
-                self.velocity.phi += angle
+                if abs(angle) < self.game.max_base_delta :
+                        self.velocity.phi += angle
+                else :
+                        self.velocity.phi += self.game.max_base_delta
 
         def rotate_turret(self, angle):
-                self.turret.phi += angle
+                if abs(angle) < self.game.max_base_delta :
+                        self.turret.phi += angle
+                else :
+                        self.turret.phi += self.game.max_turret_delta
 
         def accelerate(self, speed_delta):
-                self.velocity.rho += speed_delta * delta_t
+                self.velocity += self.velocity.normalize() * speed_delta
                 if self.velocity.rho > max_velocity :
                         self.velocity.rho = max_velocity
 
         def fire(self):
-                pass
+                bullet_position = self.position + self.turret * (self.radius + 0.1)
+                bullet_velocity = self.turret.normalize() * self.game.bullet_speed
+                bullet = Bullet(bullet_position, bullet_velocity, self)
+                self.game.bodies.append(bullet)
 
 class Bullet(Body):
@@ -37 +47 @@
         model = "bullet"
 
-        pass
+        def __init__(self, position, velocity, tank):
+                Body.__init__(self, position, velocity)
+                self.origin = origin

tanchiki/game.py

@@ -24 +24 @@
 
         def __collides(self, body1, body2):
-                pass
+                return (abs(body1.position - body2.position) <= (body1.radius + body2.radius))
+                       and (body1 != body2)
 
         def __handle_collision(self, body1, body2):
-                pass
+                if isinstance(body1, body.Tank) == True : 
+                        if isinstance(body2, body.Tank) == True :
+                                body1.on_collision(body2)
+                                body2.on_collision(body1)
+                        else :
+                                body1.on_hit()
+                                body1.on_death()
+                else :
+                        if isinstance(body2, body.Tank) == True :
+                                body2.on_hit()
+                                body2.on_death()
 
         def __check_collisions(game):
-                pass
+                for i in range(len(self.bodies)) :
+                        for j in range(i, len(self.bodies)) :
+                                a, b = self.bodies[i], self.bodies[j]
+                                if self.collides(a, b) == True :
+                                        self.handle_collision(a, b)
 
-        def __check_walls(game):
-                for i in game.bodies :
+        def __check_walls(self):
+                for i in self.bodies :
                         if ((i.next_position.x - i.radius) <= -game.width/2) or \
                            ((i.next_position.y - i.radius) <= -game.width/2) or \

tanchiki/vector.py

@@ -1 +1 @@
 import math
 
-class Vector(object):
-        def __init__(self, x=0 , y=0):
+class Vector(object):   
+
+        def __init__(self, x=0 , y=0):         
                 self.x = x
                 self.y = y
-
+        
         def __add__(self, other):
                 result = Vector(0,0)
@@ -19 +20 @@
 
         def dot_product(self, other):
-                return self.x*other.x + self.y*other.y
+                return  self.x*other.x + self.y*other.y 
 
         def __abs__(self):
@@ -33 +34 @@
                         return 0
 
+        def normalize(self):
+                result = Vector()
+                result.x = self.x
+                result.y = self.y
+                result.rho = 1
+                return result
+
         def get_rho(self):
                 return abs(self)
 
         def set_rho(self, new_rho):
-                if self.is_null() == 1 :
+                if self.is_null() == 1:
                         self.x , self.y = new_rho*math.cos(self.phi) , new_rho*math.sin(self.phi)
                 else :
@@ -48 +56 @@
                 if self.is_null == 1:
                         phi = 0
-                return phi
+                return  phi
 
         def set_phi(self, new_phi):
                 rho = abs(self)
-                self.x, self.y = rho*math.cos(new_phi) , rho*math.sin(new_phi)
+                self.x , self.y = rho*math.cos(new_phi) , rho*math.sin(new_phi)
 
         phi = property(get_phi, set_phi)
-
-Vector.null = Vector(0,0)