-
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Fix Segment::fade_out for 2d expansion #4712
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
Conversation
Since we're using get/setPixelColorRaw, we need the true length, not the virtual length.
WalkthroughThe Changes
Suggested reviewers
📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
⏰ Context from checks skipped due to timeout of 90000ms (15)
✨ Finishing Touches
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
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.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
wled00/FX_fcn.cpp(1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (19)
- GitHub Check: wled_build / Build Environments (esp01_1m_full_160)
- GitHub Check: wled_build / Build Environments (esp32_wrover)
- GitHub Check: wled_build / Build Environments (esp8266_2m_compat)
- GitHub Check: wled_build / Build Environments (lolin_s2_mini)
- GitHub Check: wled_build / Build Environments (usermods)
- GitHub Check: wled_build / Build Environments (esp32dev_V4)
- GitHub Check: wled_build / Build Environments (esp32s3dev_8MB_opi)
- GitHub Check: wled_build / Build Environments (esp32dev)
- GitHub Check: wled_build / Build Environments (esp32c3dev)
- GitHub Check: wled_build / Build Environments (esp32s3_4M_qspi)
- GitHub Check: wled_build / Build Environments (esp8266_2m_160)
- GitHub Check: wled_build / Build Environments (esp32s3dev_16MB_opi)
- GitHub Check: wled_build / Build Environments (esp32_eth)
- GitHub Check: wled_build / Build Environments (esp01_1m_full_compat)
- GitHub Check: wled_build / Build Environments (nodemcuv2_compat)
- GitHub Check: wled_build / Build Environments (nodemcuv2)
- GitHub Check: wled_build / Build Environments (nodemcuv2_160)
- GitHub Check: wled_build / Build Environments (esp8266_2m)
- GitHub Check: wled_build / Build Environments (esp01_1m_full)
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.
Your findings are odd. If you look at virtualLength()you should see it takes into account 2D.
wled00/FX_fcn.cpp
Outdated
| rate = (256-rate) >> 1; | ||
| const int mappedRate = 256 / (rate + 1); | ||
| for (unsigned j = 0; j < vLength(); j++) { | ||
| const size_t length = is2D() ? (vWidth() * vHeight()) : vLength(); |
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.
This shouldn't be necessary as vLength()/virtualLength()takes into account 2D (and its mapping).
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.
That would be correct if fade_out was using getPixelColor()/setPixelColor(), which apply the mapping. Right now it's using getPixelColorRaw()/setPixelColorRaw(), so it needs the "unmapped" length.
The tradeoff is between calculating the color fade extra times, vs applying the mapping. Given that the author of the function chose the Raw forms I took this to mean that they intended the former, which I agree is probably faster in most cases.
The bug is pretty clearly apparent with any of the Grav* AR FX with bar expansion -- it doesn't fade out properly.
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.
Right. The author would be me.
That only means fade_out() should use regular get/setPixelColor() and skip speed optimisations. This might hold true for all universal functions.
Or re-implement mapping to correctly iterate expanded pixels.
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.
OK - I think the optimization is helpful here, but if you feel strongly that we should go the other way, that's OK by me. (Now that you mention it, there are a couple of other locations with the same issue - I should've checked more thoroughly when I spotted the one.)
Long term I think we should move any and all mapping to the blending stage, where we are guaranteed we're only calculating it once per frame. (Yes, I'm aware there are a couple of FX that do special things in certain mapping modes - I'm sure we can find solutions for them.)
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.
IMO the next best thing is to do for (int i=0; i<length(); i++) ... as that will cover all pixels.
I think that will still be faster than mapping.
This is feasible as actual rendering is done in blending function.
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.
I thought about length() too; I went with vWidth()*vHeight() as it's smaller for any case with grouping or mirroring.
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.
If everything would be properly implemented those 2 functions would be unavailable in WLED_DISABLE_2D.
But I was lazy.
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.
Sometimes lazy is good. :)
I'll update with a fix for all cases.
No need to rely on a sufficiently smart compiler.
Ran in to this one during testing last night. Since we're using get/setPixelColorRaw, we need the true pixel count, not the virtual length.
Summary by CodeRabbit