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
Add webgl support to Annulus
, Wedge
and AnnularWedge
#12704
Conversation
Codecov Report
@@ Coverage Diff @@
## branch-3.2 #12704 +/- ##
===========================================
Coverage 92.35% 92.35%
===========================================
Files 315 315
Lines 19963 19963
===========================================
Hits 18437 18437
Misses 1526 1526 |
7928593
to
4d3e6ea
Compare
c278762
to
7ee5e73
Compare
7ee5e73
to
dd7fb9f
Compare
dd7fb9f
to
e2fe04f
Compare
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.
Noting that the new WebGL AnnularWedge
and Wedge
glyphs do not support line joins yet. It doesn't have to be in this PR as it only really affects large line widths, but it will need to be done eventually.
#endif | ||
|
||
#if defined(USE_ELLIPSE) | ||
// From https://www.shadertoy.com/view/tttfzr (MIT licensed) |
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 am not really comfortable with copying someone else's code and pasting it into Bokeh. Ideally I would like the person submitting such code to demonstrate they understand it and take ownership of it in terms of supporting it in future, for two reasons:
- I'd like to ask about the iterative Newton solver in the code block below. Why iterative? Why 5 iterations? Does it cope well with long thin ellipses? Is the
0.01
value critical or would0.0
be OK? - Eventually the code for some of these new shapes is going to have to support line joins and line dashes, so it is going to need to be understood and modified.
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.
@ianthomas23 it looks like this ellipse code has been removed for now, are you otherwise happy with this PR?
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'm pretty sure I commented earlier, but maybe I didn't click "Comment". In anycase, I removed the implementation of ellipse glyph, because it's the most complex of new glyphs, one that I don't fully understand and it's not urgently needed anyway. I may get back to this at some point, when I can actually explain the details of this implementation.
82f399a
to
b47f7dd
Compare
b47f7dd
to
0e0a0f2
Compare
Annulus
, Wedge
, AnnularWedge
and Ellipse
Annulus
, Wedge
and AnnularWedge
234c8b8
to
87e6016
Compare
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.
Thanks for removing the ellipse changes. As discussed, this is something we can return to later.
87e6016
to
c8b0271
Compare
@ianthomas23, this is already approved, but I forgot to update release notes and documentation. This PR was rebased, but only the last two commits make any changes. |
@mattpap Understood. That's OK by me, so feel free to self-merge if/when you are happy with CI. |
AnnularWedge
:Annulus
:Wedge
:This PR:
Annulus
,Wedge
,AnnularWedge
)_set_data()
, etc.)settings.force_webgl
in testsTODO: