Skip to content

Commit f492075

Browse files
committed
Flow, Rain, Drip, Heartbeat xy
1 parent 8dfbc0a commit f492075

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/MoonLight/Nodes/Effects/E_WLED.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,12 +1638,12 @@ class FlowEffect : public Node {
16381638
counter = counter >> 8;
16391639
}
16401640

1641-
uint16_t maxZones = layer->size.x / 6; // only looks good if each zone has at least 6 LEDs
1641+
uint16_t maxZones = layer->size.y / 6; // only looks good if each zone has at least 6 LEDs
16421642
uint16_t zones = (zonesControl * maxZones) >> 8;
16431643
if (zones & 0x01) zones++; // zones must be even
16441644
if (zones < 2) zones = 2;
1645-
uint16_t zoneLen = layer->size.x / zones;
1646-
uint16_t offset = (layer->size.x - zones * zoneLen) >> 1;
1645+
uint16_t zoneLen = layer->size.y / zones;
1646+
uint16_t offset = (layer->size.y - zones * zoneLen) >> 1;
16471647

16481648
layer->fill_solid(ColorFromPalette(layerP.palette, -counter));
16491649

@@ -1652,7 +1652,7 @@ class FlowEffect : public Node {
16521652
for (int i = 0; i < zoneLen; i++) {
16531653
uint8_t colorIndex = (i * 255 / zoneLen) - counter;
16541654
uint16_t led = (z & 0x01) ? i : (zoneLen - 1) - i;
1655-
layer->setRGB(pos + led, ColorFromPalette(layerP.palette, colorIndex));
1655+
layer->setRGB(Coord3D(0, pos + led), ColorFromPalette(layerP.palette, colorIndex));
16561656
}
16571657
}
16581658
}
@@ -1668,8 +1668,8 @@ static void mode_fireworks(VirtualLayer* layer, uint16_t x, uint16_t aux0, uint1
16681668
bool valid1 = (aux0 < layer->size.y);
16691669
bool valid2 = (aux1 < layer->size.y);
16701670
CRGB sv1 = 0, sv2 = 0;
1671-
if (valid1) sv1 = layer->getRGB(Coord3D(0, layer->size.y - 1 - aux0));
1672-
if (valid2) sv2 = layer->getRGB(Coord3D(0, layer->size.y - 1 - aux1));
1671+
if (valid1) sv1 = layer->getRGB(Coord3D(x, layer->size.y - 1 - aux0));
1672+
if (valid2) sv2 = layer->getRGB(Coord3D(x, layer->size.y - 1 - aux1));
16731673

16741674
// WLEDSR
16751675
uint8_t blurAmount = 255 - speed;
@@ -1793,7 +1793,7 @@ class RainEffect : public Node {
17931793
class DripEffect : public Node {
17941794
public:
17951795
static const char* name() { return "Drip"; }
1796-
static uint8_t dim() { return _1D; }
1796+
static uint8_t dim() { return _2D; }
17971797
static const char* tags() { return "🐙💫"; }
17981798

17991799
uint8_t gravityControl = 128;
@@ -1935,8 +1935,8 @@ class HeartBeatEffect : public Node {
19351935
step = millis();
19361936
}
19371937

1938-
for (int i = 0; i < layer->size.x; i++) {
1939-
layer->setRGB(i, ColorFromPalette(layerP.palette, ::map(i, 0, layer->size.x, 0, 255), 255 - (bri_lower >> 8)));
1938+
for (int i = 0; i < layer->size.y; i++) {
1939+
layer->setRGB(Coord3D(0, i), ColorFromPalette(layerP.palette, ::map(i, 0, layer->size.y, 0, 255), 255 - (bri_lower >> 8)));
19401940
}
19411941
}
19421942
}; // HeartBeatEffect

0 commit comments

Comments
 (0)