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
faaf9e0
..
25fa50b
100755
(executable)
--- a/
bulletml-runner
+++ b/
bulletml-runner
@@
-8,6
+8,7
@@
import pygame
import bulletml
import bulletml.bulletyaml
import bulletml
import bulletml.bulletyaml
+from bulletml.collision import collides
try:
import yaml
try:
import yaml
@@
-82,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)
@@
-93,6
+94,7
@@
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
elapsed = time.time() - start
frames += 1