projects
/
python-bulletml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Basic static/moving circle collisions. (Fixes issue #5)
[python-bulletml.git]
/
bulletml-runner
diff --git
a/bulletml-runner
b/bulletml-runner
index
de0fa5a
..
25fa50b
100755
(executable)
--- a/
bulletml-runner
+++ b/
bulletml-runner
@@
-7,6
+7,20
@@
import time
import pygame
import bulletml
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:
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"))
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
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:
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)
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:
target.y /= 2
if not paused or go:
-
+ lactive = list(active)
start = time.time()
count = len(active)
start = time.time()
count = len(active)
- for obj in l
ist(active)
:
+ for obj in l
active
:
new = obj.step()
total += len(new)
active.update(new)
new = obj.step()
total += len(new)
active.update(new)
@@
-81,16
+94,18
@@
def main(argv):
or not (-50 < obj.x < 350)
or not (-50 < obj.y < 350)):
active.remove(obj)
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
if frames % 100 == 0:
elapsed = time.time() - start
frames += 1
if frames % 100 == 0:
- seconds_per_bullet = elapsed / count
- bullets_per_second = count / elapsed
print " Processing: %04d: %d bullets, %d active." % (
frames, total, count)
print " Processing: %04d: %d bullets, %d active." % (
frames, total, count)
- print " %g seconds per bullet (60Hz max: %g)." % (
- seconds_per_bullet, bullets_per_second / 60)
+ 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:
screen.fill([0, 0, 0])
for obj in active: