-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
spots effect accuracy improvements #5341
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.
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
Draft
softhack007
wants to merge
3
commits into
main
Choose a base branch
from
spots_improvement
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2914,20 +2914,25 @@ static void spots_base(uint16_t threshold) | |
| if (SEGLEN <= 1) FX_FALLBACK_STATIC; | ||
| if (!SEGMENT.check2) SEGMENT.fill(SEGCOLOR(1)); | ||
|
|
||
| unsigned maxZones = SEGLEN >> 2; | ||
| unsigned zones = 1 + ((SEGMENT.intensity * maxZones) >> 8); | ||
| unsigned zoneLen = SEGLEN / zones; | ||
| unsigned offset = (SEGLEN - zones * zoneLen) >> 1; | ||
| // constants for fixed point scaling | ||
| constexpr uint8_t ZONELEN_FP_SHIFT = 3; | ||
| constexpr uint32_t ZONELEN_FP_SCALE = 1U << ZONELEN_FP_SHIFT; | ||
|
|
||
| unsigned maxZones = max(1U, SEGLEN >> 2); // prevents "0 zones" | ||
| unsigned zones = 1U + ((uint32_t(SEGMENT.intensity) * maxZones) >> 8); | ||
| unsigned zoneLen = SEGLEN / zones; | ||
| unsigned zoneLen8 = (SEGLEN * ZONELEN_FP_SCALE) / zones; // zoneLength * 8 (fixed‑point) -> avoids gaps at right/left sides | ||
| unsigned offset = (SEGLEN - ((zones * zoneLen8) >> ZONELEN_FP_SHIFT)) >> 1; | ||
|
|
||
| for (unsigned z = 0; z < zones; z++) | ||
| { | ||
| unsigned pos = offset + z * zoneLen; | ||
| unsigned pos = offset + ((z * zoneLen8) >> ZONELEN_FP_SHIFT); | ||
| for (unsigned i = 0; i < zoneLen; i++) | ||
| { | ||
| unsigned wave = triwave16((i * 0xFFFF) / zoneLen); | ||
| if (wave > threshold) { | ||
| unsigned index = 0 + pos + i; | ||
| unsigned s = (wave - threshold)*255 / (0xFFFF - threshold); | ||
| unsigned index = pos + i; | ||
| unsigned s = ((wave - threshold)*255 / (0xFFFF - threshold)) & 0xFF; // & 0xFF prevents overflow in next line | ||
| SEGMENT.setPixelColor(index, color_blend(SEGMENT.color_from_palette(index, true, PALETTE_SOLID_WRAP, 0), SEGCOLOR(1), uint8_t(255-s))); | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| } | ||
| } | ||
|
|
@@ -2951,7 +2956,7 @@ void mode_spots_fade() | |
| unsigned tr = (t >> 1) + (t >> 2); | ||
| spots_base(tr); | ||
| } | ||
| static const char _data_FX_MODE_SPOTS_FADE[] PROGMEM = "Spots Fade@Spread,Width,,,,,Overlay;!,!;!"; | ||
| static const char _data_FX_MODE_SPOTS_FADE[] PROGMEM = "Spots Fade@Speed,Width,,,,,Overlay;!,!;!"; | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. while you are at it: rename "Width" to "Density" for both variants? |
||
|
|
||
| //each needs 12 bytes | ||
| typedef struct Ball { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use boundary-derived widths to keep the spots evenly spaced.
Line 2923 still fixes every zone to
SEGLEN / zones, while Line 2929 places starts on fractional boundaries. On lengths that do not divide evenly, the leftover pixels turn into visible holes instead of evenly spaced spots. Derive each zone width from the next boundary instead of reusing the truncated integer width.♻️ Proposed fix
🤖 Prompt for AI Agents