Mercurial > touhou
diff pytouhou/game/effect.pyx @ 631:cd8a2baf468c
Move Particle to its own module, to not pollute pytouhou.game.effect.
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> |
---|---|
date | Tue, 05 May 2015 14:49:22 +0200 |
parents | e35bef07290d |
children |
line wrap: on
line diff
--- a/pytouhou/game/effect.pyx +++ b/pytouhou/game/effect.pyx @@ -15,8 +15,6 @@ from pytouhou.game.sprite cimport Sprite from pytouhou.vm import ANMRunner -from pytouhou.game.game cimport Game - cdef class Effect(Element): def __init__(self, pos, index, anm): @@ -33,32 +31,3 @@ cdef class Effect(Element): if self.sprite.removed: self.sprite = None self.removed = True - - - -cdef class Particle(Effect): - def __init__(self, pos, index, anm, long amp, Game game, bint reverse=False, long duration=24): - Effect.__init__(self, pos, index, anm) - - self.frame = 0 - self.duration = duration - - random_pos = (self.x + amp * game.prng.rand_double() - amp / 2, - self.y + amp * game.prng.rand_double() - amp / 2) - - if not reverse: - self.pos_interpolator = Interpolator((self.x, self.y), 0, - random_pos, duration, formula=(lambda x: 2. * x - x ** 2)) - else: - self.pos_interpolator = Interpolator(random_pos, 0, - (self.x, self.y), duration, formula=(lambda x: 2. * x - x ** 2)) - self.x, self.y = random_pos - - - cpdef update(self): - Effect.update(self) - - self.pos_interpolator.update(self.frame) - self.x, self.y = self.pos_interpolator.values - - self.frame += 1