Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

segment functions for better upstream compatibility

Browse Source 
* added vLength(), vHeight(), vWidth() and mapped them to their WLED-MM counterparts
* added SEG_W and SEG_H macros
* minor variable renaming to avoid name clashes with vWidth, vHeight, vLength
This commit is contained in:
Frank
2025-12-16 23:22:38 +01:00
parent db5f3f7461
commit 3ac0a0a619
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wled00/FX.cpp
View File

@@ -19,6 +19,11 @@
#undef SEGENV
#define SEGMENT (*strip._currentSeg) // saves us many calls to strip._segments[strip.getCurrSegmentId()]
#define SEGENV SEGMENT
// need to re-define SEG_W and SEG_H to get the fast SEGMENT macro
#undef SEG_W
#undef SEG_H
#define SEG_W (SEGMENT.virtualWidth())
#define SEG_H (SEGMENT.virtualHeight())
#endif
#if !(defined(WLED_DISABLE_PARTICLESYSTEM2D) && defined(WLED_DISABLE_PARTICLESYSTEM1D))
@@ -8380,10 +8385,10 @@ uint16_t mode_2DGEQ(void) { // By Will Tatam. Code reduction by Ewoud Wijma. Fla
bool flatMode = !SEGMENT.is2D() || (SEGMENT.width() < 3) || (SEGMENT.height() < 3); // also use flat mode when less than 3 colums or rows
const int NUM_BANDS = map2(SEGMENT.custom1, 0, 255, 1, 16);
const int vLength = SEGLEN; // for flat mode
const uint16_t cols = flatMode ? min(max(2, NUM_BANDS), (vLength+1)/2) : SEGMENT.virtualWidth();
const uint16_t rows = flatMode ? vLength / cols : SEGMENT.virtualHeight();
const unsigned offset = flatMode ? max(0, (vLength - rows*cols +1) / 2) : 0; // flatmode: always center effect
const int virtLength = SEGLEN; // for flat mode
const uint16_t cols = flatMode ? min(max(2, NUM_BANDS), (virtLength+1)/2) : SEGMENT.virtualWidth();
const uint16_t rows = flatMode ? virtLength / cols : SEGMENT.virtualHeight();
const unsigned offset = flatMode ? max(0, (virtLength - rows*cols +1) / 2) : 0; // flatmode: always center effect
if ((cols <=1) || (rows <=1)) return mode_oops(); // too small