projects
/
python-bulletml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bullet.finished: Check vanished before checking actions, it's faster.
[python-bulletml.git]
/
bulletml
/
impl.py
diff --git
a/bulletml/impl.py
b/bulletml/impl.py
index
92982db
..
af3f153
100644
(file)
--- a/
bulletml/impl.py
+++ b/
bulletml/impl.py
@@
-12,6
+12,8
@@
from bulletml import parser
# TODO(jfw): This is very non-Pythonic, it's pretty much just the
# BulletML reference ActionImpl translated to Python.
# TODO(jfw): This is very non-Pythonic, it's pretty much just the
# BulletML reference ActionImpl translated to Python.
+PI_2 = math.pi * 2
+
class Action(object):
"""Running action implementation."""
class Action(object):
"""Running action implementation."""
@@
-37,6
+39,7
@@
class Action(object):
self.params = params
self.rank = rank
self.pc = -1
self.params = params
self.rank = rank
self.pc = -1
+ self.finished = False
if parent:
self.copy_state(parent)
if parent:
self.copy_state(parent)
@@
-44,16
+47,15
@@
class Action(object):
return "%s(pc=%r, actions=%r)" % (
type(self).__name__, self.pc, self.actions)
return "%s(pc=%r, actions=%r)" % (
type(self).__name__, self.pc, self.actions)
- @property
- def finished(self):
- return self.pc is None
-
def vanish(self):
def vanish(self):
+ """End this action and its parents."""
if self.parent:
self.parent.vanish()
self.pc = None
if self.parent:
self.parent.vanish()
self.pc = None
+ self.finished = True
def copy_state(self, other):
def copy_state(self, other):
+ """Copy fire/movement state from other to self."""
self.direction_frames = other.direction_frames
self.direction = other.direction
self.aiming = other.aiming
self.direction_frames = other.direction_frames
self.direction = other.direction
self.aiming = other.aiming
@@
-66,6
+68,7
@@
class Action(object):
self.previous_fire_speed = other.previous_fire_speed
def step(self):
self.previous_fire_speed = other.previous_fire_speed
def step(self):
+ """Advance by one frame."""
created = []
if self.speed_frames > 0:
created = []
if self.speed_frames > 0:
@@
-99,6
+102,7
@@
class Action(object):
self.repeat -= 1
if self.repeat <= 0:
self.pc = None
self.repeat -= 1
if self.repeat <= 0:
self.pc = None
+ self.finished = True
if self.parent is not None:
self.parent.copy_state(self)
self.owner.replace(self, self.parent)
if self.parent is not None:
self.parent.copy_state(self)
self.owner.replace(self, self.parent)
@@
-175,7
+179,7
@@
class Action(object):
if type == "absolute":
self.aiming = False
self.direction = (
if type == "absolute":
self.aiming = False
self.direction = (
- direction - self.owner.direction) %
360
+ direction - self.owner.direction) %
PI_2
elif type == "relative":
self.aiming = False
self.direction = direction
elif type == "relative":
self.aiming = False
self.direction = direction
@@
-184,12
+188,12
@@
class Action(object):
self.direction = (
direction
+ self.owner.aim
self.direction = (
direction
+ self.owner.aim
- - self.owner.direction) %
360
+ - self.owner.direction) %
PI_2
- while self.direction >
180
:
- self.direction -=
360
- while self.direction < -
180
:
- self.direction +=
360
+ while self.direction >
math.pi
:
+ self.direction -=
PI_2
+ while self.direction < -
math.pi
:
+ self.direction +=
PI_2
self.direction /= self.direction_frames
elif isinstance(action, parser.Accel):
self.direction /= self.direction_frames
elif isinstance(action, parser.Accel):
@@
-255,15
+259,17
@@
class Bullet(object):
if self.target is None:
return self.direction
else:
if self.target is None:
return self.direction
else:
- return math.degrees(
- math.atan2(self.target.x - self.x, self.y - self.target.y))
+ return math.atan2(self.target.x - self.x, self.y - self.target.y)
@property
def finished(self):
@property
def finished(self):
+ """Check if this bullet is finished running."""
+ if not self.vanished:
+ return False
for action in self.actions:
if not action.finished:
return False
for action in self.actions:
if not action.finished:
return False
- return
self.vanished
+ return
True
def vanish(self):
"""Vanish this bullet and stop all actions."""
def vanish(self):
"""Vanish this bullet and stop all actions."""
@@
-273,6
+279,7
@@
class Bullet(object):
self.actions = []
def replace(self, old, new):
self.actions = []
def replace(self, old, new):
+ """Replace an active action with another."""
try:
idx = self.actions.index(old)
except ValueError:
try:
idx = self.actions.index(old)
except ValueError:
@@
-281,16
+288,16
@@
class Bullet(object):
self.actions[idx] = new
def step(self):
self.actions[idx] = new
def step(self):
+ """Advance by one frame."""
created = []
for action in self.actions:
created.extend(action.step())
created = []
for action in self.actions:
created.extend(action.step())
- direction = math.radians(self.direction)
self.px = self.x
self.py = self.y
self.px = self.x
self.py = self.y
- self.x += self.mx + math.sin(direction) * self.speed
- self.y += self.my - math.cos(direction) * self.speed
+ self.x += self.mx + math.sin(
self.
direction) * self.speed
+ self.y += self.my - math.cos(
self.
direction) * self.speed
return created
return created