X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml-runner;h=fc49988296b8d92a0d4aff88a6d66a0f2c122187;hp=fc57bcedd82f92929ed28c09b54602d1e668b73c;hb=28775523f6cd56422d3fbd0ae96eebccbe7235c4;hpb=b246fe5b1c35b4d0a189e7c28597927e6e5241e8

diff --git a/bulletml-runner b/bulletml-runner
index fc57bce..fc49988 100755
--- a/bulletml-runner
+++ b/bulletml-runner
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import os
 import sys
 
 import pygame
@@ -7,16 +8,21 @@ import pygame
 import bulletml
 
 def main(argv):
+    if not argv:
+        raise SystemExit("Usage: %s filename ..." % sys.argv[0])
+
     pygame.display.init()
     screen = pygame.display.set_mode([600, 600], pygame.DOUBLEBUF)
     bullet = pygame.Surface([3, 3])
     bullet.fill([255, 0, 0])
-    filename = argv[0]
-    doc = bulletml.BulletML(open(filename, "rU"))
     clock = pygame.time.Clock()
     target = bulletml.Bullet()
 
+    file_idx = 0
+
     while True:
+        filename = argv[file_idx % len(argv)]
+        doc = bulletml.BulletML(open(filename, "rU"))
         source = bulletml.Bullet.FromDoc(
             doc, x=150, y=150, target=target, rank=0.5)
                                          
@@ -27,8 +33,11 @@ def main(argv):
         frames = 0
         total = 0
         paused = False
+        newfile = False
+
+        pygame.display.set_caption(os.path.basename(filename))
 
-        while active:
+        while active and not newfile:
             go = False
 
             for event in pygame.event.get():
@@ -39,11 +48,25 @@ def main(argv):
                         paused ^= True
                     elif event.key == pygame.K_RIGHT:
                         go = True
+                    elif event.key == pygame.K_PAGEUP:
+                        file_idx -= 1
+                        newfile = True
+                    elif event.key == pygame.K_PAGEDOWN:
+                        file_idx += 1
+                        newfile = True
+                    elif event.key == pygame.K_RETURN:
+                        newfile = True
+                    elif event.key == pygame.K_s:
+                        source = bulletml.Bullet.FromDoc(
+                            doc, x=150, y=150, target=target, rank=0.5)
+                        source.vanished = True
+                        active.add(source)
             target.x, target.y = pygame.mouse.get_pos()
             target.x /= 2
-            target.y = (screen.get_height() - target.y) / 2
+            target.y /= 2
 
             if not paused or go:
+
                 for obj in list(active):
                     new = obj.step()
                     total += len(new)
@@ -70,11 +93,20 @@ def main(argv):
                         y *= 2
                         x -= 1
                         y -= 1
-                        screen.blit(bullet, [x, screen.get_height() - y])
+                        screen.blit(bullet, [x, y])
             pygame.display.flip()
 
             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__":