Changeset 231

Timestamp:

01/04/07 02:50:21 (5 years ago)

Author:

mg

Message:

Show an animation (expanding bubble) when ships respawn.

Location:

trunk

Files:

• NEWS.txt (modified) (1 diff)
• src/pyspacewar/ui.py (modified) (5 diffs)
• src/pyspacewar/version.py (modified) (1 diff)
• src/pyspacewar/world.py (modified) (2 diffs)

trunk/NEWS.txt

@@ +1 @@
+January 5, 2006: Happy New Year!
+
+  - Show an animation (expanding bubble) when ships respawn.
+
 December 25, 2006: Released version 0.9.3: the Christmas release.
 

trunk/src/pyspacewar/ui.py

@@ -172 +172 @@
 
 
+def linear(x, xmax, y1, y2):
+    """Calculate a linear transition from y1 to y2 as x moves from 0 to xmax.
+
+        >>> for x in range(10):
+        ...     print '*' * int(linear(x, 9, 1, 10))
+        *
+        **
+        ***
+        ****
+        *****
+        ******
+        *******
+        ********
+        *********
+        **********
+
+    """
+    return y1 + (y2 - y1) * float(x) / xmax
+
+
 def smooth(x, xmax, y1, y2):
     """Calculate a smooth transition from y1 to y2 as x moves from 0 to xmax.
@@ -192 +212 @@
     value = 1 / (1 + math.exp(-t))
     return y1 + (y2 - y1) * value
-
 
 
@@ -1735 +1754 @@
     visibility_margin = 120 # Keep ships at least 120px from screen edges
 
+    respawn_animation = 100 # Time (game ticks) to show respawn animation
+
     _ui_mode = None         # Previous user interface mode
 
@@ -2233 +2254 @@
             color = colorblend(color, (0x20, 0x20, 0x20), 0.2)
             color = colorblend(color, (0, 0, 0), ratio)
+        elif self.game.world.time - ship.spawn_time < self.respawn_animation:
+            self.draw_Ship_spawn_animation(ship)
         direction_vector = ship.direction_vector * ship.size
         side_vector = direction_vector.perpendicular()
@@ -2316 +2339 @@
         return (front, back, left_front, left_back, right_front, right_back)
 
+    def draw_Ship_spawn_animation(self, ship):
+        sp = self.viewport.screen_pos(ship.position)
+        color = self.ship_colors[ship.appearance]
+        t = math.sqrt((self.game.world.time - ship.spawn_time)
+                      / self.respawn_animation)
+        radius = linear(t, 1, 1, 100)
+        color = colorblend((0, 0, 0), color, linear(t, 1, 0.2, 0.9))
+        pygame.draw.circle(self.screen, color, sp, int(radius), 1)
+
     def update_missile_trails(self):
         """Update missile trails."""

trunk/src/pyspacewar/version.py

@@ -6 +6 @@
 
 svn_revision = "$Revision$"[11:-2]
-version = "0.9.3"
+version = "0.9.3svn"
 
 if version.endswith('svn'):

trunk/src/pyspacewar/world.py

@@ -552 +552 @@
         self.frags = 0
         self.dead = False
+        self.spawn_time = 0 # the value of world.time when last respawned
 
     def _set_direction(self, direction):
@@ -660 +661 @@
         self.dead = False
         self.health = 1.0
+        if self.world:
+            self.spawn_time = self.world.time
 
     def launch(self):