jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-25 11:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent push transition if effect stays the same

Browse Source
This commit is contained in:
Blaž Kristan 2025-02-16 10:21:24 +01:00
parent 6ea9535463
commit d22fe9227b
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wled00/FX_fcn.cpp
View File

@ -1550,6 +1550,11 @@ void WS2812FX::service() {
#ifndef WLED_DISABLE_MODE_BLEND #ifndef WLED_DISABLE_MODE_BLEND
Segment::setClippingRect(0, 0); // disable clipping (just in case) Segment::setClippingRect(0, 0); // disable clipping (just in case)
if (seg.isInTransition()) { if (seg.isInTransition()) {
// a hack to determine if effect has changed
uint8_t m = seg.currentMode();
Segment::modeBlend(true); // set semaphore
bool sameEffect = (m == seg.currentMode());
Segment::modeBlend(false); // clear semaphore
// set clipping rectangle // set clipping rectangle
// new mode is run inside clipping area and old mode outside clipping area // new mode is run inside clipping area and old mode outside clipping area
unsigned p = seg.progress(); unsigned p = seg.progress();
@ -1558,7 +1563,20 @@ void WS2812FX::service() {
unsigned dw = p * w / 0xFFFFU + 1; unsigned dw = p * w / 0xFFFFU + 1;
unsigned dh = p * h / 0xFFFFU + 1; unsigned dh = p * h / 0xFFFFU + 1;
unsigned orgBS = blendingStyle; unsigned orgBS = blendingStyle;
if (w*h == 1) blendingStyle = BLEND_STYLE_FADE; // disable belending for single pixel segments (use fade instead) if (w*h == 1) blendingStyle = BLEND_STYLE_FADE; // disable style for single pixel segments (use fade instead)
else if (sameEffect && (blendingStyle & BLEND_STYLE_PUSH_MASK)) {
// when effect stays the same push will look awful, change it to swipe
switch (blendingStyle) {
case BLEND_STYLE_PUSH_BR:
case BLEND_STYLE_PUSH_TR:
case BLEND_STYLE_PUSH_RIGHT: blendingStyle = BLEND_STYLE_SWIPE_RIGHT; break;
case BLEND_STYLE_PUSH_BL:
case BLEND_STYLE_PUSH_TL:
case BLEND_STYLE_PUSH_LEFT: blendingStyle = BLEND_STYLE_SWIPE_LEFT; break;
case BLEND_STYLE_PUSH_DOWN: blendingStyle = BLEND_STYLE_SWIPE_DOWN; break;
case BLEND_STYLE_PUSH_UP: blendingStyle = BLEND_STYLE_SWIPE_UP; break;
}
}
switch (blendingStyle) { switch (blendingStyle) {
case BLEND_STYLE_FAIRY_DUST: // fairy dust (must set entire segment, see isPixelXYClipped()) case BLEND_STYLE_FAIRY_DUST: // fairy dust (must set entire segment, see isPixelXYClipped())
Segment::setClippingRect(0, w, 0, h); Segment::setClippingRect(0, w, 0, h);
@ -1604,7 +1622,7 @@ void WS2812FX::service() {
Segment::setClippingRect(0, dw, h - dh, h); Segment::setClippingRect(0, dw, h - dh, h);
break; break;
} }
frameDelay = (*_mode[seg.currentMode()])(); // run new/current mode frameDelay = (*_mode[m])(); // run new/current mode
// now run old/previous mode // now run old/previous mode
Segment::tmpsegd_t _tmpSegData; Segment::tmpsegd_t _tmpSegData;
Segment::modeBlend(true); // set semaphore Segment::modeBlend(true); // set semaphore