Changeset 3:af02cd410e37

Timestamp:

12/18/10 15:20:51 (5 years ago)

Author:

Olga Zolotareva <olya_zol@òÀæ>

Branch:

default

Children:

4:7313e5a09453, 6:b95121219b90

Message:

modules changed

Files:

• body.py (modified) (4 diffs, 1 prop)
• game.py (modified) (4 diffs, 1 prop)
• user.py (modified) (1 prop)
• vector.py (modified) (5 diffs, 1 prop)

body.py

@@ -1 +1 @@
 import vector
+import math
+delta_phi = math.pi   # deltha phi = math.pi
+speed_delta = 1
+delta_t = 1
+max_velocity = 2
 
 class Body(object):
-        def __init__(self, position, velocity, next_position, radius=1):
+        def __init__(self, position, velocity, next_position, radius):
                 self.position = position
                 self.velocity = velocity
@@ -13 +18 @@
                 self.strength = strength
                 self.turret = turret
-                self.base_orientation = base_orientation
+                self.base_orientation = base_orientation # 1 or -1
                 self.game = game
                 self.user = user
-        def rotate_base(tank, angle):
-                pass
+
+        def rotate_base(tank, angle): 
+                tank.base_velocity.phi += angle
+                tank.velocity.phi *= tank.base_orientation
 
         def rotate_turret(tank, angle):
@@ -23 +30 @@
 
         def accelerate(tank, speed_delta):
-                pass
+                tank.velocity.rho += speed_delta * delta_t
+                if tank.velocity.rho > max_velocity:
+                        tank.velocity.rho = max_velocity
 
         def fire(tank):
@@ -29 +38 @@
 
         def on_tick(tank,other_tanks, bullets):
-                pass
+                if tank.user.base_left == True:
+                        tank.rotate_base(delta_phi)
+                if tank.user.base_right == True:
+                        tank.rotate_base(-1*delta_phi)
+                if tank.user.accelerate == True:
+                        tank.accelerate(speed_delta)
 
         def on_spawn(tank):

game.py

@@ -ˆà +1 @@
+other_tanks = []
+bullets = []
+
 class Game(object):
         def __init__(self, bodies, users, width, height):
@@ -17 +20 @@
                 delta_t = 1
                 for i in game.bodies:
-                        i.next_position = i.position + i.velocity.mul_v(delta_t)
+                        i.next_position = i.position + i.velocity*(delta_t)
         
 
@@ -31 +34 @@
         def check_walls(game):
                 for i in game.bodies :
-                        if (i.next_position.x <= 0) or (i.next_position.y <= 0) or (i.next_position.x <= width) or (i.next_position.y >= 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()
                 
@@ -40 +43 @@
 
         def invoke_ticks(game):
-                pass
+                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.respawn()
-
-
- 
+                                i.tank.on_spawn()
+                                i.tank.strength = 1 

vector.py

@@ -13 +13 @@
                 return result
 
-        def mul_v(self, alpha):
+        def __mul__(self, alpha):
                 result = Vector()
                 result.x = self.x * alpha
@@ -22 +22 @@
                 return  self.x*other.x + self.y*other.y 
 
-        def len_v(self):
+        def __abs__(self):
                 return (self.x**2 + self.y**2)**0.5
         
@@ -29 +29 @@
 
         def is_null(self):
-                if self.len_v()  == 0 :
+                if abs(self)     == 0 :
                         return 1
                 else :
@@ -36 +36 @@
 
         def get_rho(self):
-                return self.len_v()
+                return abs(self)
 
         def set_rho(self, new_rho):
-                self.x , self.y = self.x*(new_rho/self.len_v()) , self.y*(new_rho/self.len_v())
+                self.x , self.y = self.x*(new_rho/abs(self)) , self.y*(new_rho/abs(self))
 
         rho = property(get_rho, set_rho) 
         
         def get_phi(self):
-                cos = self.dot_product(Vector(1,0))/(self.len_v()*1)
+                cos = self.dot_product(Vector(1,0))/(abs(self)*1)
                 if self.y < 0 : 
                         phi = -acos(cos)
@@ -52 +52 @@
              
         def set_phi(self, new_phi):
-                self.x , self.y = self.len_v()*cos(new_phi) , self.len_v()*sin(new_phi)
+                self.x , self.y = abs(self)*cos(new_phi) , abs(self)*sin(new_phi)
 
         phi = property(get_phi, set_phi)