Skip to content

Commit a6aa390

Browse files
bandi13bandi13
committed
Consolidate to camel case
1 parent 2ee702e commit a6aa390

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

‎wled00/FX.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2506,7 +2506,7 @@ uint16_t ripple_base()
25062506
uint16_t cx = rippleorigin >> 8;
25072507
uint16_t cy = rippleorigin & 0xFF;
25082508
uint8_t mag = scale8(sin8((propF>>2)), amp);
2509-
if (propI > 0) SEGMENT.draw_circle(cx, cy, propI, color_blend(SEGMENT.getPixelColorXY(cx + propI, cy), col, mag));
2509+
if (propI > 0) SEGMENT.drawCircle(cx, cy, propI, color_blend(SEGMENT.getPixelColorXY(cx + propI, cy), col, mag));
25102510
} else
25112511
#endif
25122512
{
@@ -4893,7 +4893,7 @@ uint16_t mode_2DAnalogClock(void) { // By Andras Fekete (bandi1
48934893
uint16_t second_y = centerY + second_len * sin_t(second_angle);
48944894

48954895
SEGMENT.fill(BLACK);
4896-
SEGMENT.draw_circle_antialiased(centerX, centerY, radius, DARKSLATEGRAY);
4896+
SEGMENT.drawCircleAntialiased(centerX, centerY, radius, DARKSLATEGRAY);
48974897
SEGMENT.drawLineAntialiased(centerX, centerY, second_x, second_y, BLUE);
48984898
SEGMENT.drawLineAntialiased(centerX, centerY, minute_x, minute_y, GREEN);
48994899
SEGMENT.drawLineAntialiased(centerX, centerY, hour_x, hour_y, RED);
@@ -5998,7 +5998,7 @@ uint16_t mode_2Dghostrider(void) {
59985998
SEGMENT.fadeToBlackBy((SEGMENT.speed>>2)+64);
59995999

60006000
CRGB color = CRGB::White;
6001-
SEGMENT.wu_pixel(lighter->gPosX * 256 / 10, lighter->gPosY * 256 / 10, color);
6001+
SEGMENT.wuPixel(lighter->gPosX * 256 / 10, lighter->gPosY * 256 / 10, color);
60026002

60036003
lighter->gPosX += lighter->Vspeed * sin_t(radians(lighter->gAngle));
60046004
lighter->gPosY += lighter->Vspeed * cos_t(radians(lighter->gAngle));
@@ -6026,7 +6026,7 @@ uint16_t mode_2Dghostrider(void) {
60266026
lighter->lightersPosX[i] += -7 * sin_t(radians(lighter->Angle[i]));
60276027
lighter->lightersPosY[i] += -7 * cos_t(radians(lighter->Angle[i]));
60286028
}
6029-
SEGMENT.wu_pixel(lighter->lightersPosX[i] * 256 / 10, lighter->lightersPosY[i] * 256 / 10, ColorFromPalette(SEGPALETTE, (256 - lighter->time[i])));
6029+
SEGMENT.wuPixel(lighter->lightersPosX[i] * 256 / 10, lighter->lightersPosY[i] * 256 / 10, ColorFromPalette(SEGPALETTE, (256 - lighter->time[i])));
60306030
}
60316031
SEGMENT.blur(SEGMENT.intensity>>3);
60326032
}
@@ -6097,7 +6097,7 @@ uint16_t mode_2Dfloatingblobs(void) {
60976097
}
60986098
}
60996099
uint32_t c = SEGMENT.color_from_palette(blob->color[i], false, false, 0);
6100-
if (blob->r[i] > 1.f) SEGMENT.fill_circle(roundf(blob->x[i]), roundf(blob->y[i]), roundf(blob->r[i]), c);
6100+
if (blob->r[i] > 1.f) SEGMENT.fillCircle(roundf(blob->x[i]), roundf(blob->y[i]), roundf(blob->r[i]), c);
61016101
else SEGMENT.setPixelColorXY((int)roundf(blob->x[i]), (int)roundf(blob->y[i]), c);
61026102
// move x
61036103
if (blob->x[i] + blob->r[i] >= cols - 1) blob->x[i] += (blob->sX[i] * ((cols - 1 - blob->x[i]) / blob->r[i] + 0.005f));
@@ -6255,7 +6255,7 @@ uint16_t mode_2Ddriftrose(void) {
62556255
float angle = radians(i * 10);
62566256
uint32_t x = (CX + (sin_t(angle) * (beatsin8(i, 0, L*2)-L))) * 255.f;
62576257
uint32_t y = (CY + (cos_t(angle) * (beatsin8(i, 0, L*2)-L))) * 255.f;
6258-
SEGMENT.wu_pixel(x, y, CHSV(i * 10, 255, 255));
6258+
SEGMENT.wuPixel(x, y, CHSV(i * 10, 255, 255));
62596259
}
62606260
SEGMENT.blur((SEGMENT.intensity>>4)+1);
62616261

‎wled00/FX.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -619,22 +619,22 @@ typedef struct Segment {
619619
inline void addPixelColorXY(int x, int y, byte r, byte g, byte b, byte w = 0, bool fast = false) { addPixelColorXY(x, y, RGBW32(r,g,b,w), fast); }
620620
inline void addPixelColorXY(int x, int y, CRGB c, bool fast = false) { addPixelColorXY(x, y, RGBW32(c.r,c.g,c.b,0), fast); }
621621
inline void fadePixelColorXY(uint16_t x, uint16_t y, uint8_t fade) { setPixelColorXY(x, y, color_fade(getPixelColorXY(x,y), fade, true)); }
622-
void box_blur(uint16_t i, bool vertical, fract8 blur_amount); // 1D box blur (with weight)
622+
void boxBlur(uint16_t i, bool vertical, fract8 blur_amount); // 1D box blur (with weight)
623623
void blurRow(uint32_t row, fract8 blur_amount, bool smear = false);
624624
void blurCol(uint32_t col, fract8 blur_amount, bool smear = false);
625625
void moveX(int8_t delta, bool wrap = false);
626626
void moveY(int8_t delta, bool wrap = false);
627627
void move(uint8_t dir, uint8_t delta, bool wrap = false);
628-
void draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
629-
void draw_circle_antialiased(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
630-
void fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
628+
void drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
629+
void drawCircleAntialiased(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
630+
void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
631631
void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c);
632632
inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0)); } // automatic inline
633633
void drawLineAntialiased(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c);
634634
void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2 = 0, int8_t rotate = 0);
635635
inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c) { drawCharacter(chr, x, y, w, h, RGBW32(c.r,c.g,c.b,0)); } // automatic inline
636636
inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c, CRGB c2, int8_t rotate = 0) { drawCharacter(chr, x, y, w, h, RGBW32(c.r,c.g,c.b,0), RGBW32(c2.r,c2.g,c2.b,0), rotate); } // automatic inline
637-
void wu_pixel(uint32_t x, uint32_t y, CRGB c);
637+
void wuPixel(uint32_t x, uint32_t y, CRGB c);
638638
void blur1d(fract8 blur_amount); // blur all rows in 1 dimension
639639
inline void blur2d(fract8 blur_amount) { blur(blur_amount); }
640640
inline void fill_solid(CRGB c) { fill(RGBW32(c.r,c.g,c.b,0)); }
@@ -657,19 +657,19 @@ typedef struct Segment {
657657
inline void addPixelColorXY(int x, int y, byte r, byte g, byte b, byte w = 0, bool fast = false) { addPixelColor(x, RGBW32(r,g,b,w), fast); }
658658
inline void addPixelColorXY(int x, int y, CRGB c, bool fast = false) { addPixelColor(x, RGBW32(c.r,c.g,c.b,0), fast); }
659659
inline void fadePixelColorXY(uint16_t x, uint16_t y, uint8_t fade) { fadePixelColor(x, fade); }
660-
inline void box_blur(uint16_t i, bool vertical, fract8 blur_amount) {}
660+
inline void boxBlur(uint16_t i, bool vertical, fract8 blur_amount) {}
661661
inline void blurRow(uint32_t row, fract8 blur_amount, bool smear = false) {}
662662
inline void blurCol(uint32_t col, fract8 blur_amount, bool smear = false) {}
663663
inline void moveX(int8_t delta, bool wrap = false) {}
664664
inline void moveY(int8_t delta, bool wrap = false) {}
665665
inline void move(uint8_t dir, uint8_t delta, bool wrap = false) {}
666-
inline void fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c) {}
666+
inline void fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c) {}
667667
inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c) {}
668668
inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c) {}
669669
inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t = 0, int8_t = 0) {}
670670
inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB color) {}
671671
inline void drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, CRGB c, CRGB c2, int8_t rotate = 0) {}
672-
inline void wu_pixel(uint32_t x, uint32_t y, CRGB c) {}
672+
inline void wuPixel(uint32_t x, uint32_t y, CRGB c) {}
673673
#endif
674674
} segment;
675675
//static int segSize = sizeof(Segment);

‎wled00/FX_2Dfcn.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void Segment::blurCol(uint32_t col, fract8 blur_amount, bool smear) {
340340
}
341341

342342
// 1D Box blur (with added weight - blur_amount: [0=no blur, 255=max blur])
343-
void Segment::box_blur(uint16_t i, bool vertical, fract8 blur_amount) {
343+
void Segment::boxBlur(uint16_t i, bool vertical, fract8 blur_amount) {
344344
if (!isActive() || blur_amount == 0) return; // not active
345345
const unsigned cols = virtualWidth();
346346
const unsigned rows = virtualHeight();
@@ -447,7 +447,7 @@ void Segment::move(uint8_t dir, uint8_t delta, bool wrap) {
447447
}
448448
}
449449

450-
void Segment::draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
450+
void Segment::drawCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
451451
if (!isActive() || radius == 0) return; // not active
452452
// Bresenham’s Algorithm
453453
int d = 3 - (2*radius);
@@ -471,7 +471,7 @@ void Segment::draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
471471
}
472472
}
473473

474-
void Segment::draw_circle_antialiased(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
474+
void Segment::drawCircleAntialiased(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
475475
if (!isActive() || radius == 0) return; // not active
476476
const uint16_t cols = virtualWidth();
477477
const uint16_t rows = virtualHeight();
@@ -498,7 +498,7 @@ void Segment::draw_circle_antialiased(uint16_t cx, uint16_t cy, uint8_t radius,
498498
}
499499

500500
// by stepko, taken from https://editor.soulmatelights.com/gallery/573-blobs
501-
void Segment::fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
501+
void Segment::fillCircle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
502502
if (!isActive() || radius == 0) return; // not active
503503
const int cols = virtualWidth();
504504
const int rows = virtualHeight();
@@ -615,7 +615,7 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
615615
}
616616

617617
#define WU_WEIGHT(a,b) ((uint8_t) (((a)*(b)+(a)+(b))>>8))
618-
void Segment::wu_pixel(uint32_t x, uint32_t y, CRGB c) { //awesome wu_pixel procedure by reddit u/sutaburosu
618+
void Segment::wuPixel(uint32_t x, uint32_t y, CRGB c) { //awesome wu_pixel procedure by reddit u/sutaburosu
619619
if (!isActive()) return; // not active
620620
// extract the fractional parts and derive their inverses
621621
unsigned xx = x & 0xff, yy = y & 0xff, ix = 255 - xx, iy = 255 - yy;

0 commit comments

Comments
 (0)