Add webgl support to `Annulus`, `Wedge` and `AnnularWedge` #12704

mattpap · 2023-01-01T10:36:04Z

AnnularWedge:
Annulus:
Wedge:

This PR:

adds support for more GL glyphs (Annulus, Wedge, AnnularWedge)
simplifies loading of GL glyphs in base glyphs (greatly reduced code duplication)
greatly reduces code duplication and complexity in GL glyphs (in _set_data(), etc.)
improves handling of settings.force_webgl in tests

TODO:

resolve issues with GL attribute number limitations

codecov · 2023-01-01T10:53:44Z

Codecov Report

Merging #12704 (c8b0271) into branch-3.2 (0da7e85) will not change coverage.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           branch-3.2   #12704   +/-   ##
===========================================
  Coverage       92.35%   92.35%           
===========================================
  Files             315      315           
  Lines           19963    19963           
===========================================
  Hits            18437    18437           
  Misses           1526     1526

ianthomas23

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.

bokehjs/src/lib/models/glyphs/webgl/annulus.ts

bokehjs/src/lib/models/glyphs/webgl/marker.frag

ianthomas23 · 2023-01-30T14:05:59Z

bokehjs/src/lib/models/glyphs/webgl/marker.frag

+#endif
+
+#if defined(USE_ELLIPSE)
+// From https://www.shadertoy.com/view/tttfzr (MIT licensed)


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 would 0.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.

@ianthomas23 it looks like this ellipse code has been removed for now, are you otherwise happy with this PR?

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.

ianthomas23

Thanks for removing the ellipse changes. As discussed, this is something we can return to later.

mattpap · 2023-04-06T13:32:41Z

@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.

ianthomas23 · 2023-04-06T13:52:50Z

@mattpap Understood. That's OK by me, so feel free to self-merge if/when you are happy with CI.

* Naively force webgl rendering in glyphs * Improve typing around marker types * Add support for ellipse webgl rendering * Add support for annulus webgl rendering * Add support for wedge webgl rendering * Add support for annular wedge webgl rendering * Don't use Circle.angle property * Simplify initialization of _show buffer * Use TypedArray.fill(v) where applicable * Reduce code duplication in single marker glyphs * Don't reimplement SingleMarkerGL._get_visuals() * Reduce duplication in SingleMarkerGL._set_data() * Simplify loading/initialization of GL glyphs * Perform size hinting only for multi markers * Extract array interleaving to a utility function * Add 'rect' to GLMarkerType * Simplify initialization of visuals * Don't duplicate code in markers with hatch * Simplify BaseMarkerGL construction * Reorganize base marker's props * Define {u,v}_border_radius only for 'rect' * Allow passing radius and start/end angles to shaders * Test of webgl rendering of newly added gl glyphs * Finalize new glyph implementations * Add integration tests for various angle spans * Update visual baselines * Fix handling of circle radius * Override force_webgl in an integration test * Fix rendering of hex tile glyph * Rename a baseline to avoid FS issues * Use the default length in set_from_scalar() * Set unused attributes only once * Rename cro2() to cross_z() * Remove Ellipse support for now * Update visual baselines * Fix a strict boolean expressions lint error * Add release notes and refactor links * Update webgl documentation with new glyphs

github-actions · 2024-10-26T00:30:17Z

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

mattpap added the status: WIP label Jan 1, 2023

mattpap added this to the 3.1 milestone Jan 1, 2023

mattpap force-pushed the mattpap/gl_glyphs branch from 7928593 to 4d3e6ea Compare January 2, 2023 16:10

mattpap mentioned this pull request Jan 2, 2023

Add support for background, border, padding, border radius and anchor to Text glyph #12655

Merged

2 tasks

mattpap force-pushed the mattpap/gl_glyphs branch 3 times, most recently from c278762 to 7ee5e73 Compare January 10, 2023 23:56

mattpap force-pushed the mattpap/gl_glyphs branch from 7ee5e73 to dd7fb9f Compare January 17, 2023 10:07

mattpap force-pushed the mattpap/gl_glyphs branch from dd7fb9f to e2fe04f Compare January 27, 2023 22:49

mattpap added status: ready and removed status: WIP labels Jan 27, 2023

mattpap requested a review from ianthomas23 January 27, 2023 22:55

ianthomas23 reviewed Jan 30, 2023

View reviewed changes

mattpap modified the milestones: 3.1, 3.2 Feb 9, 2023

mattpap force-pushed the mattpap/gl_glyphs branch from 82f399a to b47f7dd Compare February 20, 2023 19:32

mattpap changed the base branch from branch-3.1 to branch-3.2 March 4, 2023 15:48

mattpap force-pushed the mattpap/gl_glyphs branch from b47f7dd to 0e0a0f2 Compare March 28, 2023 14:12

mattpap changed the title ~~Add webgl support to Annulus, Wedge, AnnularWedge and Ellipse~~ Add webgl support to Annulus, Wedge and AnnularWedge Mar 28, 2023

mattpap force-pushed the mattpap/gl_glyphs branch from 234c8b8 to 87e6016 Compare April 5, 2023 19:55

ianthomas23 approved these changes Apr 6, 2023

View reviewed changes

mattpap added status: accepted and removed status: ready labels Apr 6, 2023

mattpap added 6 commits April 6, 2023 15:22

Naively force webgl rendering in glyphs

0325803

Improve typing around marker types

ef6c066

Add support for ellipse webgl rendering

bf5266b

Add support for annulus webgl rendering

39858f2

Add support for wedge webgl rendering

41ddbac

Add support for annular wedge webgl rendering

26e8401

mattpap added 19 commits April 6, 2023 15:22

Reorganize base marker's props

77134ef

Define {u,v}_border_radius only for 'rect'

42d0c11

Allow passing radius and start/end angles to shaders

5277c32

Test of webgl rendering of newly added gl glyphs

bc1b6a1

Finalize new glyph implementations

1d4a849

Add integration tests for various angle spans

0a7e6da

Update visual baselines

81364c2

Fix handling of circle radius

bd93575

Override force_webgl in an integration test

edc5fca

Fix rendering of hex tile glyph

79b3846

Rename a baseline to avoid FS issues

b5b8084

Use the default length in set_from_scalar()

d3fdc67

Set unused attributes only once

c52ee26

Rename cro2() to cross_z()

6412a0d

Remove Ellipse support for now

5496c0f

Update visual baselines

d31a5ad

Fix a strict boolean expressions lint error

1422ad9

Add release notes and refactor links

f5d4ed3

Update webgl documentation with new glyphs

c8b0271

mattpap force-pushed the mattpap/gl_glyphs branch from 87e6016 to c8b0271 Compare April 6, 2023 13:31

mattpap added type: feature reso: completed tag: webgl labels Apr 6, 2023

mattpap merged commit 5190f24 into branch-3.2 Apr 6, 2023

mattpap deleted the mattpap/gl_glyphs branch April 6, 2023 17:00

github-actions bot locked as resolved and limited conversation to collaborators Oct 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Add webgl support to `Annulus`, `Wedge` and `AnnularWedge` #12704

Add webgl support to `Annulus`, `Wedge` and `AnnularWedge` #12704

Uh oh!

mattpap commented Jan 1, 2023 •

edited

Loading

Uh oh!

codecov bot commented Jan 1, 2023 •

edited

Loading

Uh oh!

ianthomas23 left a comment

Uh oh!

Uh oh!

Uh oh!

ianthomas23 Jan 30, 2023

Uh oh!

bryevdv Apr 5, 2023

Uh oh!

mattpap Apr 6, 2023

Uh oh!

ianthomas23 left a comment

Uh oh!

mattpap commented Apr 6, 2023

Uh oh!

ianthomas23 commented Apr 6, 2023

Uh oh!

github-actions bot commented Oct 26, 2024

Uh oh!

Uh oh!

Uh oh!

Add webgl support to Annulus, Wedge and AnnularWedge #12704

Add webgl support to Annulus, Wedge and AnnularWedge #12704

Uh oh!

Conversation

mattpap commented Jan 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Jan 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ianthomas23 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ianthomas23 Jan 30, 2023

Choose a reason for hiding this comment

Uh oh!

bryevdv Apr 5, 2023

Choose a reason for hiding this comment

Uh oh!

mattpap Apr 6, 2023

Choose a reason for hiding this comment

Uh oh!

ianthomas23 left a comment

Choose a reason for hiding this comment

Uh oh!

mattpap commented Apr 6, 2023

Uh oh!

ianthomas23 commented Apr 6, 2023

Uh oh!

github-actions bot commented Oct 26, 2024

Uh oh!

Uh oh!

Add webgl support to `Annulus`, `Wedge` and `AnnularWedge` #12704

Add webgl support to `Annulus`, `Wedge` and `AnnularWedge` #12704

mattpap commented Jan 1, 2023 •

edited

Loading

codecov bot commented Jan 1, 2023 •

edited

Loading