projects
/
python-bulletml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Optimizations:
[python-bulletml.git]
/
bulletml
/
impl.py
diff --git
a/bulletml/impl.py
b/bulletml/impl.py
index
8f94d55
..
f3d7e12
100644
(file)
--- a/
bulletml/impl.py
+++ b/
bulletml/impl.py
@@
-61,9
+61,9
@@
class Action(object):
self.previous_fire_direction = other.previous_fire_direction
self.previous_fire_speed = other.previous_fire_speed
self.previous_fire_direction = other.previous_fire_direction
self.previous_fire_speed = other.previous_fire_speed
- def step(self, owner, rank):
+ def step(self, owner, rank
, created, sin=math.sin, cos=math.cos
):
"""Advance by one frame."""
"""Advance by one frame."""
- created = []
+ s_params = self.params
if self.speed_frames > 0:
self.speed_frames -= 1
if self.speed_frames > 0:
self.speed_frames -= 1
@@
-86,11
+86,11
@@
class Action(object):
owner.my += self.my
if self.pc is None:
owner.my += self.my
if self.pc is None:
- return
created
+ return
if self.wait_frames > 0:
self.wait_frames -= 1
if self.wait_frames > 0:
self.wait_frames -= 1
- return
created
+ return
while True:
self.pc += 1
while True:
self.pc += 1
@@
-111,21
+111,21
@@
class Action(object):
action = self.actions[self.pc]
if isinstance(action, parser.Repeat):
action = self.actions[self.pc]
if isinstance(action, parser.Repeat):
- repeat, (actions, params) = action(s
elf.
params, rank)
+ repeat, (actions, params) = action(s
_
params, rank)
child = Action(owner, self, actions, params, rank, repeat)
owner.replace(self, child)
child = Action(owner, self, actions, params, rank, repeat)
owner.replace(self, child)
- c
reated.extend(child.step(owner, rank)
)
+ c
hild.step(owner, rank, created, sin, cos
)
break
elif isinstance(action, (parser.ActionDef, parser.ActionRef)):
break
elif isinstance(action, (parser.ActionDef, parser.ActionRef)):
- actions, params = action(s
elf.
params, rank)
+ actions, params = action(s
_
params, rank)
child = Action(owner, self, actions, params, rank)
owner.replace(self, child)
child = Action(owner, self, actions, params, rank)
owner.replace(self, child)
- c
reated.extend(child.step(owner, rank)
)
+ c
hild.step(owner, rank, created, sin, cos
)
break
elif isinstance(action, (parser.FireDef, parser.FireRef)):
break
elif isinstance(action, (parser.FireDef, parser.FireRef)):
- direction, speed, actions, offset = action(s
elf.
params, rank)
+ direction, speed, actions, offset = action(s
_
params, rank)
if direction:
direction, type = direction
if type == "aim" or type is None:
if direction:
direction, type = direction
if type == "aim" or type is None:
@@
-155,12
+155,12
@@
class Action(object):
x, y = owner.x, owner.y
if offset:
x, y = owner.x, owner.y
if offset:
- off_x, off_y = offset(s
elf.
params, rank)
+ off_x, off_y = offset(s
_
params, rank)
if offset.type == "relative":
if offset.type == "relative":
- s
in = math.
sin(direction)
- c
os = math.
cos(direction)
- x += c
os * off_x + sin
* off_y
- y += s
in * off_x - cos
* off_y
+ s
=
sin(direction)
+ c
=
cos(direction)
+ x += c
* off_x + s
* off_y
+ y += s
* off_x - c
* off_y
else:
x += off_x
y += off_y
else:
x += off_x
y += off_y
@@
-170,7
+170,7
@@
class Action(object):
created.append(bullet)
elif isinstance(action, parser.ChangeSpeed):
created.append(bullet)
elif isinstance(action, parser.ChangeSpeed):
- frames, (speed, type) = action(s
elf.
params, rank)
+ frames, (speed, type) = action(s
_
params, rank)
self.speed_frames = frames
if type == "sequence":
self.speed = speed
self.speed_frames = frames
if type == "sequence":
self.speed = speed
@@
-180,32
+180,25
@@
class Action(object):
self.speed = (speed - owner.speed) / frames
elif isinstance(action, parser.ChangeDirection):
self.speed = (speed - owner.speed) / frames
elif isinstance(action, parser.ChangeDirection):
- frames, (direction, type) = action(s
elf.
params, rank)
+ frames, (direction, type) = action(s
_
params, rank)
self.direction_frames = frames
self.aiming = False
if type == "sequence":
self.direction = direction
else:
if type == "absolute":
self.direction_frames = frames
self.aiming = False
if type == "sequence":
self.direction = direction
else:
if type == "absolute":
- self.direction = (
- direction - owner.direction) % PI_2
+ direction -= owner.direction
elif type == "relative":
elif type == "relative":
-
self.
direction = direction
+ direction = direction
else:
self.aiming = True
else:
self.aiming = True
- self.direction = (
- direction
- + owner.aim
- - owner.direction) % PI_2
+ direction += owner.aim - owner.direction
- if self.direction > math.pi:
- self.direction -= PI_2
- if self.direction < -math.pi:
- self.direction += PI_2
- self.direction /= self.direction_frames
+ self.direction = (
+ (direction + math.pi) % PI_2 - math.pi) / frames
elif isinstance(action, parser.Accel):
elif isinstance(action, parser.Accel):
- frames, horizontal, vertical = action(s
elf.
params, rank)
+ frames, horizontal, vertical = action(s
_
params, rank)
self.accel_frames = frames
if horizontal:
mx, type = horizontal
self.accel_frames = frames
if horizontal:
mx, type = horizontal
@@
-234,15
+227,13
@@
class Action(object):
pass
elif isinstance(action, parser.Wait):
pass
elif isinstance(action, parser.Wait):
- self.wait_frames = action(s
elf.
params, rank)
+ self.wait_frames = action(s
_
params, rank)
break
elif isinstance(action, parser.Vanish):
owner.vanish()
break
break
elif isinstance(action, parser.Vanish):
owner.vanish()
break
- return created
-
class Bullet(object):
"""Simple bullet implementation.
class Bullet(object):
"""Simple bullet implementation.
@@
-333,7
+324,7
@@
class Bullet(object):
else:
self._actions[idx] = new
else:
self._actions[idx] = new
- def step(self):
+ def step(self
, sin=math.sin, cos=math.cos
):
"""Advance by one frame.
This updates the position and velocity, and may also set the
"""Advance by one frame.
This updates the position and velocity, and may also set the
@@
-344,11
+335,11
@@
class Bullet(object):
created = []
for action in self._actions:
created = []
for action in self._actions:
-
created.extend(action.step(self, self.rank)
)
+
action.step(self, self.rank, created, sin, cos
)
self.px = self.x
self.py = self.y
self.px = self.x
self.py = self.y
- self.x += self.mx +
math.
sin(self.direction) * self.speed
- self.y += self.my -
math.
cos(self.direction) * self.speed
+ self.x += self.mx + sin(self.direction) * self.speed
+ self.y += self.my - cos(self.direction) * self.speed
return created
return created