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

inline segment palette functions for speed

Browse Source 
* make currentMode() inline
* move currentColor() to FX.h
* move Segment::color_wheel() and Segment::color_from_palette() to FX.h
* add a little helper function to fx.h, so it can access strip.paletteBlend which is not defined yet
This commit is contained in:
Frank
2026-01-10 01:25:24 +01:00
parent 0541a1f5b4
commit 428becc301
2 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
wled00/FX.h
View File

@@ -30,6 +30,8 @@ void endImagePlayback(Segment *seg); // implemented in image_loader.c
#include "bus_manager.h"
extern BusManager busses; // same as wled.h
static uint8_t strip_getPaletteBlend(); // forward declaration: little helper to access strip.paletteBlend
#define DEFAULT_BRIGHTNESS (uint8_t)127
#define DEFAULT_MODE (uint8_t)0
#define DEFAULT_SPEED (uint8_t)128
@@ -50,6 +52,12 @@ extern BusManager busses; // same as wled.h
#ifndef RGBW32
#define RGBW32(r,g,b,w) (uint32_t((byte(w) << 24) | (byte(r) << 16) | (byte(g) << 8) | (byte(b))))
#endif
#ifndef W
#define R(c) (byte((c) >> 16))
#define G(c) (byte((c) >> 8))
#define B(c) (byte(c))
#define W(c) (byte((c) >> 24))
#endif
/* Not used in all effects yet */
#define FPS_UNLIMITED 250
@@ -681,7 +689,10 @@ typedef struct Segment {
}
uint8_t currentMode(uint8_t modeNew);
uint32_t currentColor(uint8_t slot, uint32_t colorNew);
inline uint32_t currentColor(uint8_t slot, uint32_t colorNew) const { // WLEDMM moved here from FX_fcn.cpp
return transitional && _t ? color_blend(_t->_colorT[slot], colorNew, progress(), true) : colorNew;
}
CRGBPalette16 &loadPalette(CRGBPalette16 &tgt, uint8_t pal) const;
void setCurrentPalette(void);
@@ -711,8 +722,39 @@ typedef struct Segment {
inline void addPixelColor(int n, CRGB c, bool fast = false) { addPixelColor(n, uint32_t(c) & 0x00FFFFFF, fast); } // automatically inline
void fadePixelColor(uint16_t n, uint8_t fade);
uint8_t get_random_wheel_index(uint8_t pos) const;
uint32_t __attribute__((pure)) color_from_palette(uint_fast16_t, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri = 255);
uint32_t __attribute__((pure)) color_wheel(uint8_t pos);
// WLEDMM function moved here (from FX_fcn.cpp) for better optimization by the compiler
inline uint32_t __attribute__((hot)) color_from_palette(uint_fast16_t i, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri = 255) const {
uint32_t color = gamma32(currentColor(mcol, colors[mcol]));
// default palette or no RGB support on segment
if ((palette == 0 && mcol < NUM_COLORS) || !_isRGB) {
if (pbri == 255) return color;
return RGBW32(scale8_video(R(color),pbri), scale8_video(G(color),pbri), scale8_video(B(color),pbri), scale8_video(W(color),pbri));
}
uint8_t paletteIndex = i;
uint_fast16_t vLen = mapping ? virtualLength() : 1;
if (mapping && vLen > 1) paletteIndex = (i*255)/(vLen -1);
if (!wrap) paletteIndex = scale8(paletteIndex, 240); //cut off blend at palette "end"
CRGB fastled_col = ColorFromPaletteWLED(_currentPalette, paletteIndex, pbri, (strip_getPaletteBlend() == 3)? NOBLEND:LINEARBLEND); // NOTE: paletteBlend should be global
uint8_t w = W(color); // extract white channel
return RGBW32(fastled_col.r, fastled_col.g, fastled_col.b, w);
}
// WLEDMM function moved here (from FX_fcn.cpp) for better optimization by the compiler
inline uint32_t color_wheel(uint8_t pos) const {
if (palette) return color_from_palette(pos, false, true, 0);
uint8_t w = W(currentColor(0, colors[0])); // extract white channel
pos = 255 - pos;
if (pos < 85) {
return RGBW32((255 - pos * 3), 0, (pos * 3), w);
} else if(pos < 170) {
pos -= 85;
return RGBW32(0, (pos * 3), (255 - pos * 3), w);
} else {
pos -= 170;
return RGBW32((pos * 3), (255 - pos * 3), 0, w);
}
}
// 2D Blur: shortcuts for bluring columns or rows only (50% faster than full 2D blur)
inline void blurCols(fract8 blur_amount, bool smear = false) { // blur all columns
@@ -1276,6 +1318,9 @@ class WS2812FX { // 96 bytes
estimateCurrentAndLimitBri(void);
};
extern WS2812FX strip; // same as wled.h
inline uint8_t strip_getPaletteBlend() { return strip.paletteBlend; } // little helper for segment::color_from_palette()
extern const char JSON_mode_names[];
extern const char JSON_palette_names[];

40
wled00/FX_fcn.cpp
View File

@@ -515,13 +515,11 @@ uint8_t IRAM_ATTR_YN Segment::currentBri(uint8_t briNew, bool useCct) const {
}
#endif
uint8_t Segment::currentMode(uint8_t newMode) {
inline uint8_t Segment::currentMode(uint8_t newMode) {
return (progress()>32767U) ? newMode : (_t ? _t->_modeP : newMode); // change effect in the middle of transition
}
uint32_t Segment::currentColor(uint8_t slot, uint32_t colorNew) {
return transitional && _t ? color_blend(_t->_colorT[slot], colorNew, progress(), true) : colorNew;
}
// WLEDMM: Segment::currentColor() moved to FX.h for better optimization by the compiler
void Segment::setCurrentPalette() {
loadPalette(_currentPalette, palette);
@@ -1634,20 +1632,7 @@ void __attribute__((hot)) Segment::blur(uint8_t blur_amount, bool smear) {
* The colours are a transition r -> g -> b -> back to r
* Inspired by the Adafruit examples.
*/
uint32_t Segment::color_wheel(uint8_t pos) {
if (palette) return color_from_palette(pos, false, true, 0);
uint8_t w = W(currentColor(0, colors[0])); // extract white channel
pos = 255 - pos;
if (pos < 85) {
return RGBW32((255 - pos * 3), 0, (pos * 3), w);
} else if(pos < 170) {
pos -= 85;
return RGBW32(0, (pos * 3), (255 - pos * 3), w);
} else {
pos -= 170;
return RGBW32((pos * 3), (255 - pos * 3), 0, w);
}
}
// WLEDMM: Segment::color_wheel(uint8_t pos) moved to FX.h for better optimization by the compiler
/*
* Returns a new, random wheel index with a minimum distance of 42 from pos.
@@ -1673,24 +1658,7 @@ uint8_t Segment::get_random_wheel_index(uint8_t pos) const { // WLEDMM use fast
* @param pbri Value to scale the brightness of the returned color by. Default is 255. (no scaling)
* @returns Single color from palette
*/
uint32_t __attribute__((hot)) Segment::color_from_palette(uint_fast16_t i, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri) // WLEDMM use fast int types
{
uint32_t color = gamma32(currentColor(mcol, colors[mcol]));
// default palette or no RGB support on segment
if ((palette == 0 && mcol < NUM_COLORS) || !_isRGB) {
if (pbri == 255) return color;
return RGBW32(scale8_video(R(color),pbri), scale8_video(G(color),pbri), scale8_video(B(color),pbri), scale8_video(W(color),pbri));
}
uint8_t paletteIndex = i;
uint_fast16_t vLen = mapping ? virtualLength() : 1;
if (mapping && vLen > 1) paletteIndex = (i*255)/(vLen -1);
if (!wrap) paletteIndex = scale8(paletteIndex, 240); //cut off blend at palette "end"
CRGB fastled_col = ColorFromPalette(_currentPalette, paletteIndex, pbri, (strip.paletteBlend == 3)? NOBLEND:LINEARBLEND); // NOTE: paletteBlend should be global
uint8_t w = W(color); // extract white channel
return RGBW32(fastled_col.r, fastled_col.g, fastled_col.b, w);
}
// WLEDMM: Segment::color_from_palette() moved to FX.h for better optimization by the compiler
//WLEDMM netmindz ar palette
uint8_t * Segment::getAudioPalette(int pal) const {