Merge branch 'expand-1DEffects' into mdev
This commit is contained in:
@@ -4108,14 +4108,14 @@ uint16_t mode_dancing_shadows(void)
|
||||
|
||||
if (spotlights[i].width <= 1) {
|
||||
if (start >= 0 && start < SEGLEN) {
|
||||
SEGMENT.blendPixelColor(start, color, 128); // TODO
|
||||
SEGMENT.blendPixelColor(start, color, 128);
|
||||
}
|
||||
} else {
|
||||
switch (spotlights[i].type) {
|
||||
case SPOT_TYPE_SOLID:
|
||||
for (size_t j = 0; j < spotlights[i].width; j++) {
|
||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||
SEGMENT.blendPixelColor(start + j, color, 128); // TODO
|
||||
SEGMENT.blendPixelColor(start + j, color, 128);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -4123,7 +4123,7 @@ uint16_t mode_dancing_shadows(void)
|
||||
case SPOT_TYPE_GRADIENT:
|
||||
for (size_t j = 0; j < spotlights[i].width; j++) {
|
||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||
SEGMENT.blendPixelColor(start + j, color, cubicwave8(map(j, 0, spotlights[i].width - 1, 0, 255))); // TODO
|
||||
SEGMENT.blendPixelColor(start + j, color, cubicwave8(map(j, 0, spotlights[i].width - 1, 0, 255)));
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -4131,7 +4131,7 @@ uint16_t mode_dancing_shadows(void)
|
||||
case SPOT_TYPE_2X_GRADIENT:
|
||||
for (size_t j = 0; j < spotlights[i].width; j++) {
|
||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||
SEGMENT.blendPixelColor(start + j, color, cubicwave8(2 * map(j, 0, spotlights[i].width - 1, 0, 255))); // TODO
|
||||
SEGMENT.blendPixelColor(start + j, color, cubicwave8(2 * map(j, 0, spotlights[i].width - 1, 0, 255)));
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -4139,7 +4139,7 @@ uint16_t mode_dancing_shadows(void)
|
||||
case SPOT_TYPE_2X_DOT:
|
||||
for (size_t j = 0; j < spotlights[i].width; j += 2) {
|
||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||
SEGMENT.blendPixelColor(start + j, color, 128); // TODO
|
||||
SEGMENT.blendPixelColor(start + j, color, 128);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -4147,7 +4147,7 @@ uint16_t mode_dancing_shadows(void)
|
||||
case SPOT_TYPE_3X_DOT:
|
||||
for (size_t j = 0; j < spotlights[i].width; j += 3) {
|
||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||
SEGMENT.blendPixelColor(start + j, color, 128); // TODO
|
||||
SEGMENT.blendPixelColor(start + j, color, 128);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -4155,7 +4155,7 @@ uint16_t mode_dancing_shadows(void)
|
||||
case SPOT_TYPE_4X_DOT:
|
||||
for (size_t j = 0; j < spotlights[i].width; j += 4) {
|
||||
if ((start + j) >= 0 && (start + j) < SEGLEN) {
|
||||
SEGMENT.blendPixelColor(start + j, color, 128); // TODO
|
||||
SEGMENT.blendPixelColor(start + j, color, 128);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -4165,7 +4165,7 @@ uint16_t mode_dancing_shadows(void)
|
||||
|
||||
return FRAMETIME;
|
||||
}
|
||||
static const char _data_FX_MODE_DANCING_SHADOWS[] PROGMEM = "Dancing Shadows@!,# of shadows;!,,;!;1d";
|
||||
static const char _data_FX_MODE_DANCING_SHADOWS[] PROGMEM = "Dancing Shadows@!,# of shadows;!,!,!;!;1d";
|
||||
|
||||
|
||||
/*
|
||||
@@ -4526,7 +4526,7 @@ uint16_t mode_perlinmove(void) {
|
||||
|
||||
return FRAMETIME;
|
||||
} // mode_perlinmove()
|
||||
static const char _data_FX_MODE_PERLINMOVE[] PROGMEM = "Perlin Move@!,# of pixels,fade rate;,!;!;1d";
|
||||
static const char _data_FX_MODE_PERLINMOVE[] PROGMEM = "Perlin Move@!,# of pixels,fade rate;!,!;!;1d";
|
||||
|
||||
|
||||
/////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user