Changeset 38:cf05c46d014c

Timestamp:

12/20/10 19:27:24 (5 years ago)

Author:

Daniil Alexeyevsky <me.dendik@òÀæ>

Branch:

new

Message:

Moved UI-related tank stuff into tk_ui.Tank; updated tk_ui to match the current project structure

Files:

• body.py (modified) (1 diff)
• tk_ui.py (modified) (2 diffs)
• user.py (modified) (1 diff)

body.py

@@ -58 +58 @@
 
         def on_tick(self,other_tanks, bullets):
-                if self.user.base_left == True:
-                        self.rotate_base(base_angle)
-                if self.user.base_right == True:
-                        self.rotate_base(-1*base_angle)
-                if self.user.accelerate == True:
-                        self.accelerate(speed_delta)
-                if self.user.decelerate == True:
-                        self.accelerate(-1*speed_delta)
-                if self.user.turret_left == True:
-                        self.rotate_turret(turret_angle)
-                if self.user.turret_right == True:
-                        self.rotate_turret(-1*turret_angle)
-                if self.user.fire == True:
-                        self.fire()
+                pass
 
         def on_spawn(self):

tk_ui.py

@@ -1 +1 @@
 import math
 import Tkinter as tk
+import body
 from game import Game
-from body import Tank, Bullet
-from vector import Vector
-from user_controller import UserController
+from vector import Vector, null
+
+game_size = 100, 100
+keys = {
+        'a': 'base_left',
+        'd': 'base_right',
+        'q': 'turret_left',
+        'e': 'turret_right',
+        'w': 'accelerate',
+        's': 'decelerate',
+        'x': 'fire',
+}
+
+class Tank(body.Tank):
+
+        def on_tick(self, tanks, bullets):
+                if self.user.base_left:
+                        self.rotate_base(game.delta_phi)
+                if self.user.base_right:
+                        self.rotate_base(-game.delta_phi)
+                if self.user.turret_left:
+                        self.rotate_turret(game.delta_phi)
+                if self.user.turret_right:
+                        self.rotate_turret(-game.delta_phi)
+                if self.user.accelerate:
+                        self.accelerate(game.speed_delta)
+                if self.user.decelerate:
+                        self.accelerate(-game.speed_delta)
+                if self.user.fire:
+                        self.fire()
 
 class UI(object):
+
         def __init__(self):
                 self.init_game()
                 self.init_ui()
                 self.step()
+
+        def init_game(self):
+                self.user = User(keys)
+                tank = Tank(null, self.user)
+                self.game = Game(bodies, users=[], *game_size)
 
         def init_ui(self):
@@ -19 +53 @@
 
         def on_key(self, ev):
-                self.controller
-
-        def init_game(self):
-                bodies = []
-                self.game = Game(100, 100, bodies)
-                tank = Tank(self.game, Vector.null, None)
-                controller = UserController('a', 'd', 'q', 'e', 'w', 's', 'x', tank)
-                tank.controller = controller
-                bodies.append(tank)
+                self.game.tanks[0].on_keypress(ev.keysym)
 
         def step(self):

user.py

@@ -1 +1 @@
 class User(object):     
 
-        def __init__(self, tank, keyset):
-                self.tank = tank
+        def __init__(self, keyset):
+                self.tank = None
                 self.keyset = keyset
                 self.base_left = False