Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Pinwheel Expand 1D Effect #3961

Merged
merged 18 commits into from
May 15, 2024
Merged

Added Pinwheel Expand 1D Effect #3961

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
da79b93
Added Pinwheel Expand 1D Effect
Brandon502 May 7, 2024
6a18ce0
Pinwheel Expand1D changes
Brandon502 May 10, 2024
d3492b5
Pinwheel Expand 1D Bug Fix
Brandon502 May 10, 2024
9e468bd
Pinwheel Expand 1D Optimizations
Brandon502 May 11, 2024
c91e0fc
Merge branch '0_15' into pr/3961
softhack007 May 12, 2024
3078bea
Pinwheel optimization: do nor repaint "same" pixels in a line
softhack007 May 12, 2024
c84d4c6
Pinwheel Expand 1D Optimization
Brandon502 May 12, 2024
28348f9
Merge branch '0_15' into pr/3961
softhack007 May 12, 2024
f26bb26
Update FX_fcn.cpp
softhack007 May 12, 2024
ea83ec4
pinwheel - parameter tuning to fix some holes
softhack007 May 12, 2024
9e0b91a
Pinwheel changes.
Brandon502 May 12, 2024
2e1e917
Merge branch '0_15' of https://github.com/Brandon502/WLED into 0_15
Brandon502 May 12, 2024
1d7789f
pinwheel bugfixing
softhack007 May 13, 2024
1d20f18
Pinwheel bugfix
Brandon502 May 13, 2024
ecb861d
pinwheel code cleanup
softhack007 May 14, 2024
a5a6a8e
pinwheel : fix holes on large matrix, minor code cleanup
softhack007 May 14, 2024
c0cb677
Pinwheel cleanup
Brandon502 May 14, 2024
3cb6b17
Pinwheel fix
Brandon502 May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pinwheel code cleanup 
reducing code duplication between sPC and gPC
  • Loading branch information
@softhack007
softhack007 committed May 14, 2024
commit ecb861de561673618f5493ebb29fb716cbcf4f21
16 changes: 10 additions & 6 deletions wled00/FX_fcn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,12 @@ constexpr int Pinwheel_Steps_Big = 304; // no holes expected up to 56x56
constexpr float Int_to_Rad_Small = (DEG_TO_RAD * 360) / Pinwheel_Steps_Small; // conversion: from 0...72 to Radians
constexpr float Int_to_Rad_Med = (DEG_TO_RAD * 360) / Pinwheel_Steps_Medium; // conversion: from 0...192 to Radians
constexpr float Int_to_Rad_Big = (DEG_TO_RAD * 360) / Pinwheel_Steps_Big; // conversion: from 0...304 to Radians
constexpr int Fixed_Scale = 512; // fixpoint scaling factor (9bit for fraction)
// Pinwheel helper function: pixel index to radians
static float getPinwheelAngle(int i, int vW, int vH) {
int maxXY = max(vW, vH);
return (maxXY > Pinwheel_Size_Small) ? ((maxXY > Pinwheel_Size_Medium) ? float(i) * Int_to_Rad_Big : float(i) * Int_to_Rad_Med) : float(i) * Int_to_Rad_Small;
}

// 1D strip
uint16_t IRAM_ATTR Segment::virtualLength() const {
Expand Down Expand Up @@ -740,7 +746,7 @@ void IRAM_ATTR Segment::setPixelColor(int i, uint32_t col)
// i = angle --> 0 - 296 (Big), 0 - 192 (Medium), 0 - 72 (Small)
float centerX = roundf((vW-1) / 2.0f);
float centerY = roundf((vH-1) / 2.0f);
float angleRad = (max(vW, vH) > Pinwheel_Size_Small ? (max(vW, vH) > Pinwheel_Size_Medium ? float(i) * Int_to_Rad_Big : float(i) * Int_to_Rad_Med) : float(i) * Int_to_Rad_Small); // angle in radians
float angleRad = getPinwheelAngle(i, vW, vH); // angle in radians
float cosVal = cos_t(angleRad);
float sinVal = sin_t(angleRad);

Expand All @@ -750,7 +756,6 @@ void IRAM_ATTR Segment::setPixelColor(int i, uint32_t col)
// draw line at angle, starting at center and ending at the segment edge
// we use fixed point math for better speed. Starting distance is 0.5 for better rounding
// int_fast16_t and int_fast32_t types changed to int, minimum bits commented
constexpr int Fixed_Scale = 512; // fixpoint scaling factor (9bit for fraction)
int posx = (centerX + 0.5f * cosVal) * Fixed_Scale; // X starting position in fixed point 18 bit
int posy = (centerY + 0.5f * sinVal) * Fixed_Scale; // Y starting position in fixed point 18 bit
int inc_x = cosVal * Fixed_Scale; // X increment per step (fixed point) 10 bit
Expand Down Expand Up @@ -899,23 +904,22 @@ uint32_t IRAM_ATTR Segment::getPixelColor(int i)
return vW>vH ? getPixelColorXY(i, 0) : getPixelColorXY(0, i);
break;
case M12_sPinwheel:
// not 100% accurate, returns outer edge of circle
// not 100% accurate, returns pixel at outer edge
// i = angle --> 0 - 296 (Big), 0 - 192 (Medium), 0 - 72 (Small)
float centerX = roundf((vW-1) / 2.0f);
float centerY = roundf((vH-1) / 2.0f);
float angleRad = (max(vW, vH) > Pinwheel_Size_Small ? (max(vW, vH) > Pinwheel_Size_Medium ? float(i) * Int_to_Rad_Big : float(i) * Int_to_Rad_Med) : float(i) * Int_to_Rad_Small); // angle in radians
float angleRad = getPinwheelAngle(i, vW, vH); // angle in radians
float cosVal = cos_t(angleRad);
float sinVal = sin_t(angleRad);

constexpr int Fixed_Scale = 512; // fixpoint scaling factor (9bit for fraction)
int posx = (centerX + 0.5f * cosVal) * Fixed_Scale; // X starting position in fixed point 18 bit
int posy = (centerY + 0.5f * sinVal) * Fixed_Scale; // Y starting position in fixed point 18 bit
int inc_x = cosVal * Fixed_Scale; // X increment per step (fixed point) 10 bit
int inc_y = sinVal * Fixed_Scale; // Y increment per step (fixed point) 10 bit

int32_t maxX = vW * Fixed_Scale; // X edge in fixedpoint
int32_t maxY = vH * Fixed_Scale; // Y edge in fixedpoint

// trace ray from center until we hit any edge - to avoid rounding problems, we use the same method as in setPixelColor
int x = INT_MIN;
int y = INT_MIN;
while ((posx >= 0) && (posy >= 0) && (posx < maxX) && (posy < maxY)) {
Expand Down