Knock out final bugs caused by misparenting. Runs all tests as the demo applet.

diff --git a/bulletml-runner b/bulletml-runner
index fc57bcedd82f92929ed28c09b54602d1e668b73c..d4919886a39b08b30432bc3a8b8081b172e95e71 100755 (executable)
--- a/bulletml-runner
+++ b/bulletml-runner
@@ -44,6 +44,7 @@ def main(argv):
             target.y = (screen.get_height() - target.y) / 2
 
             if not paused or go:
+
                 for obj in list(active):
                     new = obj.step()
                     total += len(new)
@@ -75,6 +76,15 @@ def main(argv):
 
             clock.tick(60)
 
+        for event in pygame.event.get():
+            if event.type == pygame.QUIT:
+                raise SystemExit
+            elif event.type == pygame.KEYDOWN:
+                if event.key == pygame.K_SPACE:
+                    paused ^= True
+                elif event.key == pygame.K_RIGHT:
+                    go = True
+
         print "  Finished: %04d: %d bullets." % (frames, total)
 
 if __name__ == "__main__":

diff --git a/bulletml/impl.py b/bulletml/impl.py
index a0ef92ccdd0952087b9e79f7b665dbd352e23616..2c938d22f8299fbbd4ab5e0ac6de91967a4912ca 100644 (file)
--- a/bulletml/impl.py
+++ b/bulletml/impl.py
@@ -18,7 +18,7 @@ class Action(object):
     def __init__(self, owner, parent, actions, params, rank):
         self.actions = actions
         self.parent = parent
-        self.repeat = 0
+        self.repeat = 1
         self.wait_frames = 0
         self.speed = 0
         self.speed_frames = 0
@@ -40,10 +40,17 @@ class Action(object):
         if parent:
             self.copy_state(parent)
 
+    def __repr__(self):
+        return "%s(pc=%r, actions=%r)" % (
+            type(self).__name__, self.pc, self.actions)
+
+    @property
+    def finished(self):
+        return self.pc is None
+
     def vanish(self):
         if self.parent:
             self.parent.vanish()
-        self.repeat = 0
         self.pc = None
 
     def copy_state(self, other):
@@ -64,6 +71,7 @@ class Action(object):
         if self.speed_frames > 0:
             self.speed_frames -= 1
             self.owner.speed += self.speed
+
         if self.direction_frames > 0:
             self.direction_frames -= 1
             if self.direction_frames <= 0:
@@ -71,6 +79,7 @@ class Action(object):
                     self.owner.direction += self.owner.aim
             else:
                 self.owner.direction += self.direction
+
         if self.accel_frames > 0:
             self.accel_frames -= 1
             self.owner.mx += self.mx
@@ -85,13 +94,14 @@ class Action(object):
 
         while True:
             self.pc += 1
+
             if self.pc >= len(self.actions):
                 self.repeat -= 1
                 if self.repeat <= 0:
                     self.pc = None
                     if self.parent is not None:
                         self.parent.copy_state(self)
-                    self.owner.replace(self, self.parent)
+                        self.owner.replace(self, self.parent)
                     break
                 else:
                     self.pc = 0
@@ -229,8 +239,8 @@ class Bullet(object):
         if rank is None:
             rank = parent.rank if parent else 0.5
         for action, params in actions:
-            self.actions.append(
-                Action(self, parent, action, params, rank))
+            # New bullets reset the parent hierarchy.
+            self.actions.append(Action(self, None, action, params, rank))
 
     def __repr__(self):
         return ("%s(%r, %r, accel=%r, direction=%r, speed=%r, "
@@ -250,7 +260,10 @@ class Bullet(object):
 
     @property
     def finished(self):
-        return self.vanished and not self.actions
+        for action in self.actions:
+            if not action.finished:
+                return False
+        return self.vanished
 
     def vanish(self):
         """Vanish this bullet and stop all actions."""
@@ -270,14 +283,12 @@ class Bullet(object):
     def step(self):
         created = []
 
-        self.actions = filter(None, self.actions)
-
         for action in self.actions:
             created.extend(action.step())
 
         direction = math.radians(self.direction)
         self.x += self.mx + math.sin(direction) * self.speed
-        self.y += self.my + math.cos(direction) * self.speed
+        self.y += self.my - math.cos(direction) * self.speed
 
         return created