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

Octopus Radial Wave mode

Browse Source
This commit is contained in:
Frank
2024-11-28 17:51:39 +01:00
committed by GitHub
parent f21b2949f1
commit 1670330b1b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wled00/FX.cpp
View File

@@ -8575,6 +8575,7 @@ static const char _data_FX_MODE_2DSOAP[] PROGMEM = "Soap@!,Smoothness;;!;2";
//Octopus (https://editor.soulmatelights.com/gallery/671-octopus) //Octopus (https://editor.soulmatelights.com/gallery/671-octopus)
//Stepko and Sutaburosu //Stepko and Sutaburosu
// adapted for WLED by @blazoncek // adapted for WLED by @blazoncek
// RadialWave mode added by @softhack007, based on https://editor.soulmatelights.com/gallery/1090-radialwave
uint16_t mode_2Doctopus() { uint16_t mode_2Doctopus() {
if (!strip.isMatrix) return mode_static(); // not a 2D set-up if (!strip.isMatrix) return mode_static(); // not a 2D set-up
@@ -8632,12 +8633,19 @@ uint16_t mode_2Doctopus() {
else else
SEGENV.step += SEGMENT.speed / 32 + 1; // 1-4 range SEGENV.step += SEGMENT.speed / 32 + 1; // 1-4 range
uint32_t octopusStep = SEGENV.step/2; // 1/2 for Octopus mode
uint32_t radialStep = 7*SEGENV.step/6; // 7/6 = 1.16 for RadialWave mode
for (int x = xStart; x < xEnd; x++) { for (int x = xStart; x < xEnd; x++) {
for (int y = yStart; y < yEnd; y++) { for (int y = yStart; y < yEnd; y++) {
byte angle = rMap[XY(x,y)].angle; byte angle = rMap[XY(x,y)].angle;
byte radius = rMap[XY(x,y)].radius; byte radius = rMap[XY(x,y)].radius;
//CRGB c = CHSV(SEGENV.step / 2 - radius, 255, sin8(sin8((angle * 4 - radius) / 4 + SEGENV.step) + radius - SEGENV.step * 2 + angle * (SEGMENT.custom3/3+1))); //CRGB c = CHSV(SEGENV.step / 2 - radius, 255, sin8(sin8((angle * 4 - radius) / 4 + SEGENV.step) + radius - SEGENV.step * 2 + angle * (SEGMENT.custom3/3+1)));
uint16_t intensity = sin8(sin8((angle * 4 - radius) / 4 + SEGENV.step/2) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1)); uint16_t intensity;
if (SEGMENT.check3)
intensity = sin8(radialStep + sin8(radialStep - radius) + angle * (SEGMENT.custom3/4+1)); // RadialWave
else
intensity = sin8(sin8((angle * 4 - radius) / 4 + octopusStep) + radius - SEGENV.step + angle * (SEGMENT.custom3/4+1)); // Octopus
intensity = map(intensity*intensity, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display intensity = map(intensity*intensity, 0, 65535, 0, 255); // add a bit of non-linearity for cleaner display
CRGB c = ColorFromPalette(SEGPALETTE, SEGENV.step / 2 - radius, intensity); CRGB c = ColorFromPalette(SEGPALETTE, SEGENV.step / 2 - radius, intensity);
SEGMENT.setPixelColorXY(x, y, c); SEGMENT.setPixelColorXY(x, y, c);
@@ -8645,8 +8653,7 @@ uint16_t mode_2Doctopus() {
} }
return FRAMETIME; return FRAMETIME;
} }
static const char _data_FX_MODE_2DOCTOPUS[] PROGMEM = "Octopus@!,,Offset X,Offset Y,Legs, SuperSync;;!;2;"; static const char _data_FX_MODE_2DOCTOPUS[] PROGMEM = "Octopus@!,,Offset X,Offset Y,Legs, SuperSync,,RadialWave ☾;;!;2;";
//Waving Cell //Waving Cell
//@Stepko (https://editor.soulmatelights.com/gallery/1704-wavingcells) //@Stepko (https://editor.soulmatelights.com/gallery/1704-wavingcells)