X-Git-Url: https://git.yukkurigames.com/?p=python-bulletml.git;a=blobdiff_plain;f=bulletml-runner;h=25fa50b595f0590921d6b0db8d43ac5c0d9be143;hp=ec6007b5738f8e570be849629cbe6406df53943f;hb=0f067785de711c772c2c44c7f1e1cf8b44b2704f;hpb=ad4a740bd87e520bc0b13c0db2c332aba54cf68f

diff --git a/bulletml-runner b/bulletml-runner
index ec6007b..25fa50b 100755
--- a/bulletml-runner
+++ b/bulletml-runner
@@ -7,6 +7,20 @@ import time
 import pygame
 
 import bulletml
+import bulletml.bulletyaml
+from bulletml.collision import collides
+
+try:
+    import yaml
+except ImportError:
+    yaml = None
+
+try:
+    import psyco
+except ImportError:
+    pass
+else:
+    psyco.full()
 
 def main(argv):
     if not argv:
@@ -24,9 +38,8 @@ def main(argv):
     while True:
         filename = argv[file_idx % len(argv)]
         doc = bulletml.BulletML.FromDocument(open(filename, "rU"))
-        actions = [act([], 0.5) for act in doc.top]
-        source = bulletml.Bullet(
-            x=150, y=150, target=target, actions=actions, rank=0.5)
+        source = bulletml.Bullet.FromDocument(
+            doc, x=150, y=150, target=target, rank=0.5)
                                          
         active = set([source])
         source.vanished = True
@@ -59,7 +72,7 @@ def main(argv):
                     elif event.key == pygame.K_RETURN:
                         newfile = True
                     elif event.key == pygame.K_s:
-                        actions = [act([], 0.5) for act in doc.top]
+                        actions = [act([], 0.5) for act in doc.actions]
                         source = bulletml.Bullet(
                             x=150, y=150, target=target,
                             actions=actions, rank=0.5)
@@ -70,10 +83,10 @@ def main(argv):
             target.y /= 2
 
             if not paused or go:
-
+                lactive = list(active)
                 start = time.time()
                 count = len(active)
-                for obj in list(active):
+                for obj in lactive:
                     new = obj.step()
                     total += len(new)
                     active.update(new)
@@ -81,6 +94,7 @@ def main(argv):
                         or not (-50 < obj.x < 350)
                         or not (-50 < obj.y < 350)):
                         active.remove(obj)
+                    collides(obj, lactive[0])
                 elapsed = time.time() - start
 
                 frames += 1
@@ -88,9 +102,9 @@ def main(argv):
                     print "  Processing: %04d: %d bullets, %d 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 = elapsed / count
-                            bullets_per_second = count / elapsed
                             seconds_per_bullet, bullets_per_second / 60)
 
             screen.fill([0, 0, 0])