X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml-runner;h=9136f2133ff7090cf09800970df47374ae4c7e13;hp=fc49988296b8d92a0d4aff88a6d66a0f2c122187;hb=8186eda32d3764ceb7b75fac65bd968f598c4ac8;hpb=1efe1d12fc72141c05765f7db8a8e964cb6d2982

diff --git a/bulletml-runner b/bulletml-runner
index fc49988..9136f21 100755
--- a/bulletml-runner
+++ b/bulletml-runner
@@ -2,10 +2,24 @@
 
 import os
 import sys
+import time
 
 import pygame
 
 import bulletml
+import bulletml.bulletyaml
+
+try:
+    import yaml
+except ImportError:
+    yaml = None
+
+try:
+    import psyco
+except ImportError:
+    pass
+else:
+    psyco.full()
 
 def main(argv):
     if not argv:
@@ -22,14 +36,15 @@ def main(argv):
 
     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)
+        doc = bulletml.BulletML.FromDocument(open(filename, "rU"))
+        actions = [act([], 0.5) for act in doc.actions]
+        source = bulletml.Bullet(
+            x=150, y=150, target=target, actions=actions, rank=0.5)
                                          
         active = set([source])
         source.vanished = True
         print filename
-        print "  Loaded %d top-level actions." % len(source.actions)
+        print "  Loaded %d top-level actions." % len(source._actions)
         frames = 0
         total = 0
         paused = False
@@ -57,8 +72,10 @@ def main(argv):
                     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)
+                        actions = [act([], 0.5) for act in doc.actions]
+                        source = bulletml.Bullet(
+                            x=150, y=150, target=target,
+                            actions=actions, rank=0.5)
                         source.vanished = True
                         active.add(source)
             target.x, target.y = pygame.mouse.get_pos()
@@ -67,6 +84,8 @@ def main(argv):
 
             if not paused or go:
 
+                start = time.time()
+                count = len(active)
                 for obj in list(active):
                     new = obj.step()
                     total += len(new)
@@ -75,11 +94,17 @@ def main(argv):
                         or not (-50 < obj.x < 350)
                         or not (-50 < obj.y < 350)):
                         active.remove(obj)
+                elapsed = time.time() - start
 
                 frames += 1
                 if frames % 100 == 0:
                     print "  Processing: %04d: %d bullets, %d active." % (
-                        frames, total, len(active))
+                        frames, total, count)
+                    if elapsed:
+                        seconds_per_bullet = elapsed / count
+                        bullets_per_second = count / elapsed
+                        print "  %g seconds per bullet (60Hz max: %g)." % (
+                            seconds_per_bullet, bullets_per_second / 60)
 
             screen.fill([0, 0, 0])
             for obj in active:
@@ -94,18 +119,8 @@ def main(argv):
                         x -= 1
                         y -= 1
                         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
+            pygame.display.flip()
 
         print "  Finished: %04d: %d bullets." % (frames, total)