diff --git a/adafruit_led_animation/animation/__init__.py b/adafruit_led_animation/animation/__init__.py index e870b5f..ab4b834 100644 --- a/adafruit_led_animation/animation/__init__.py +++ b/adafruit_led_animation/animation/__init__.py @@ -83,7 +83,6 @@ def animate(self, show=True): for anim in self._peers: anim.draw_count += 1 anim.draw() - anim.after_draw() if show: for anim in self._peers: diff --git a/adafruit_led_animation/animation/rainbowsparkle.py b/adafruit_led_animation/animation/rainbowsparkle.py index 0be7a71..8538fb8 100644 --- a/adafruit_led_animation/animation/rainbowsparkle.py +++ b/adafruit_led_animation/animation/rainbowsparkle.py @@ -89,8 +89,8 @@ def generate_rainbow(self): int(self._background_brightness * color[2]), ) - def after_draw(self): - self.show() + def draw(self): + super().draw() pixels = [ random.randint(0, len(self.pixel_object) - 1) for n in range(self._num_sparkles) diff --git a/adafruit_led_animation/animation/sparkle.py b/adafruit_led_animation/animation/sparkle.py index cbe8a80..ee2a326 100644 --- a/adafruit_led_animation/animation/sparkle.py +++ b/adafruit_led_animation/animation/sparkle.py @@ -83,13 +83,10 @@ def _random_in_mask(self): return self._mask[random.randint(0, (len(self._mask) - 1))] def draw(self): - self._pixels = [self._random_in_mask() for _ in range(self._num_sparkles)] - for pixel in self._pixels: - self.pixel_object[pixel] = self._sparkle_color - - def after_draw(self): - self.show() for pixel in self._pixels: self.pixel_object[pixel % self._num_pixels] = self._half_color if (pixel + 1) % self._num_pixels in self._mask: self.pixel_object[(pixel + 1) % self._num_pixels] = self._dim_color + self._pixels = [self._random_in_mask() for _ in range(self._num_sparkles)] + for pixel in self._pixels: + self.pixel_object[pixel] = self._sparkle_color diff --git a/adafruit_led_animation/animation/sparklepulse.py b/adafruit_led_animation/animation/sparklepulse.py index efb0d1d..cd469e2 100644 --- a/adafruit_led_animation/animation/sparklepulse.py +++ b/adafruit_led_animation/animation/sparklepulse.py @@ -64,10 +64,8 @@ def __init__( def _set_color(self, color): self._color = color + super()._set_color(color) def draw(self): self._sparkle_color = next(self._generator) super().draw() - - def after_draw(self): - self.show()