If the code hasn't been touched in this long, its probably release-worthy.
This commit is contained in:
@@ -1,50 +1,72 @@
|
||||
#include <Figments.h>
|
||||
#include "../sprites/Blob.h"
|
||||
#include "SolidAnimation.h"
|
||||
#include "../Static.h"
|
||||
|
||||
class SolidAnimation: public Figment {
|
||||
private:
|
||||
AnimatedNumber m_red, m_green, m_blue;
|
||||
static constexpr int blobCount = 20;
|
||||
SpriteList<Blob, blobCount> m_blobs;
|
||||
SolidAnimation::SolidAnimation() : Figment("Solid", Task::Stopped) {
|
||||
}
|
||||
|
||||
public:
|
||||
SolidAnimation(Task::State initialState) : Figment("Solid", initialState) {
|
||||
m_blobs.forEach([](Blob& blob) {
|
||||
blob.setPos(random(140));
|
||||
blob.setBrightness(random(255));
|
||||
if (random(255) % 2) {
|
||||
blob.setVelocity(-1);
|
||||
}
|
||||
void SolidAnimation::randomize() {
|
||||
m_isRandom = true;
|
||||
m_blobs.forEach([](Blob& blob) {
|
||||
blob.setPos(random(140));
|
||||
blob.setBrightness(random(255));
|
||||
if (random(255) % 2) {
|
||||
blob.setVelocity(-1);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void SolidAnimation::handleEvent(const InputEvent& evt) {
|
||||
if (evt.intent == InputEvent::SetColor) {
|
||||
CRGB nextColor = evt.asRGB();
|
||||
m_red.set(nextColor.red);
|
||||
m_green.set(nextColor.green);
|
||||
m_blue.set(nextColor.blue);
|
||||
m_changePct.set(0, 255);
|
||||
m_prevColor = m_curColor;
|
||||
m_curColor = nextColor;
|
||||
m_horizontal = !m_horizontal;
|
||||
} else if (evt.intent == InputEvent::Beat) {
|
||||
m_isRandom = false;
|
||||
}
|
||||
}
|
||||
|
||||
void SolidAnimation::loop() {
|
||||
if (!m_isRandom) {
|
||||
randomize();
|
||||
}
|
||||
m_red.update(15);
|
||||
m_green.update(15);
|
||||
m_blue.update(15);
|
||||
EVERY_N_MILLIS(16) {
|
||||
m_changePct.update(12);
|
||||
}
|
||||
EVERY_N_MILLIS(6) {
|
||||
CRGB rgb{m_red, m_green, m_blue};
|
||||
CHSV hsv = rgb2hsv_approximate(rgb);
|
||||
m_blobs.forEach([=](Blob& blob) {
|
||||
blob.setHue(hsv.hue);
|
||||
blob.setSaturation(hsv.saturation);
|
||||
});
|
||||
m_blobs.update();
|
||||
}
|
||||
}
|
||||
|
||||
void handleEvent(const InputEvent& evt) override {
|
||||
if (evt.intent == InputEvent::SetColor) {
|
||||
CRGB nextColor = evt.asRGB();
|
||||
m_red.set(nextColor.red);
|
||||
m_green.set(nextColor.green);
|
||||
m_blue.set(nextColor.blue);
|
||||
}
|
||||
}
|
||||
#include <Perfcounter.h>
|
||||
|
||||
void loop() override {
|
||||
m_red.update();
|
||||
m_green.update();
|
||||
m_blue.update();
|
||||
EVERY_N_MILLIS(6) {
|
||||
CRGB rgb{m_red, m_green, m_blue};
|
||||
CHSV hsv = rgb2hsv_approximate(rgb);
|
||||
m_blobs.forEach([=](Blob& blob) {
|
||||
blob.setHue(hsv.hue);
|
||||
blob.setSaturation(hsv.saturation);
|
||||
});
|
||||
m_blobs.update();
|
||||
}
|
||||
void SolidAnimation::render(Display* dpy) const {
|
||||
PerfCounter _("solidRender");
|
||||
CRGB color(m_red.value(), m_green.value(), m_blue.value());
|
||||
uint8_t frame = ease8InOutApprox(m_changePct);
|
||||
if (frame == 255) {
|
||||
Surface(dpy, {0, 0}, {255, 255}) = color;
|
||||
} else {
|
||||
uint8_t cutoff = (frame / 2);
|
||||
uint8_t rotation = m_horizontal ? 0 : 128;
|
||||
Surface(dpy, {0, 0}, {128 - cutoff, 255}, rotation) = m_prevColor;
|
||||
Surface(dpy, {128 - cutoff, 0}, {128 + cutoff, 255}, rotation) = color;
|
||||
Surface(dpy, {128 + cutoff, 0}, {255, 255}, rotation) = m_prevColor;
|
||||
}
|
||||
|
||||
void render(Display* dpy) const override {
|
||||
CRGB color(m_red.value(), m_green.value(), m_blue.value());
|
||||
Surface(dpy, {0, 0}, {255, 0}) = color;
|
||||
m_blobs.render(dpy);
|
||||
}
|
||||
};
|
||||
m_blobs.render(dpy);
|
||||
}
|
||||
STATIC_ALLOC(SolidAnimation);
|
||||
STATIC_TASK(SolidAnimation);
|
||||
|
||||
Reference in New Issue
Block a user