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

Jump to bottom

Rework projection code #3040

Closed
wants to merge 24 commits into from
Closed

Rework projection code #3040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ec84a99
set up new spaces
ffreyer Jun 22, 2023
33bf595
fix order related error
ffreyer Jun 22, 2023
3126711
fix typo
ffreyer Jun 30, 2023
b132fe3
implement new project stack and update Makie
ffreyer Jun 30, 2023
7ec76d6
update GLMakie
ffreyer Jun 30, 2023
ab564d1
implement changes in CairoMakie
ffreyer Jul 2, 2023
1312a9a
more nospecialize and some reorganization
ffreyer Jul 2, 2023
9542959
fix zorder
ffreyer Jul 2, 2023
eba581c
cleanup old code
ffreyer Jul 3, 2023
6149c5c
fix test failure
ffreyer Jul 3, 2023
474a24a
improve performance
ffreyer Jul 3, 2023
648a2e6
try to improve compile time with nospecialize
ffreyer Jul 3, 2023
c2a1b20
update WGLMakie & fix model passing
ffreyer Jul 7, 2023
e2370b6
add observable lock for discarding duplicate updates
ffreyer Jul 7, 2023
75d9347
fix lines project
ffreyer Jul 7, 2023
8c1fb81
allow passing transform_func
ffreyer Jul 7, 2023
780868c
generalize some vectypes
ffreyer Jul 7, 2023
4c3daaa
fix missplaced Axis3 frame
ffreyer Jul 8, 2023
61a24b2
add transformation matrix decomposition function
ffreyer Jul 8, 2023
0e58ba1
cleanup iterate_transformed
ffreyer Jul 8, 2023
3a0fdf6
change space Pair to two variables
ffreyer Jul 8, 2023
1535afd
fix space_to_space_matrix call syntax
ffreyer Jul 11, 2023
2f8bd2e
fix infinite loop
ffreyer Jul 13, 2023
26ade46
fix some rebase errors
ffreyer Aug 31, 2023
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
3 changes: 2 additions & 1 deletion CairoMakie/src/CairoMakie.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import Cairo
using Makie: Scene, Lines, Text, Image, Heatmap, Scatter, @key_str, broadcast_foreach
using Makie: convert_attribute, @extractvalue, LineSegments, to_ndim, NativeFont
using Makie: @info, @get_attribute, Combined, MakieScreen
using Makie: to_value, to_colormap, extrema_nan
using Makie: to_value, to_colormap, extrema_nan, get_value
using Makie.Observables
using Makie: spaces, is_data_space, is_pixel_space, is_relative_space, is_clip_space
using Makie: project, pixelarea
using Makie: numbers_to_colors

# re-export Makie, including deprecated names
Expand Down
63 changes: 28 additions & 35 deletions CairoMakie/src/overrides.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
Special method for polys so we don't fall back to atomic meshes, which are much more
complex and slower to draw than standard paths with single color.
"""
function draw_plot(scene::Scene, screen::Screen, poly::Poly)
function draw_plot(scene::Scene, screen::Screen, @nospecialize(poly::Poly))
# dispatch on input arguments to poly to use smarter drawing methods than
# meshes if possible
draw_poly(scene, screen, poly, to_value.(poly.input_args)...)
Expand All @@ -19,33 +19,35 @@ is_cairomakie_atomic_plot(plot::Poly) = true
"""
Fallback method for args without special treatment.
"""
function draw_poly(scene::Scene, screen::Screen, poly, args...)
function draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), args...)
draw_poly_as_mesh(scene, screen, poly)
end

function draw_poly_as_mesh(scene, screen, poly)
function draw_poly_as_mesh(scene, screen, @nospecialize(poly))
draw_plot(scene, screen, poly.plots[1])
draw_plot(scene, screen, poly.plots[2])
end


# in the rare case of per-vertex colors redirect to mesh drawing
function draw_poly(scene::Scene, screen::Screen, poly, points::Vector{<:Point2}, color::AbstractArray, model, strokecolor, strokewidth)
function draw_poly(
scene::Scene, screen::Screen, @nospecialize(poly),
points::Vector{<:Point2}, color::AbstractArray, strokecolor, strokewidth
)
draw_poly_as_mesh(scene, screen, poly)
end

function draw_poly(scene::Scene, screen::Screen, poly, points::Vector{<:Point2})
function draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), points::Vector{<:Point2})
color = to_cairo_color(poly.color[], poly)
strokecolor = to_cairo_color(poly.strokecolor[], poly)
strokestyle = Makie.convert_attribute(poly.linestyle[], key"linestyle"())
draw_poly(scene, screen, poly, points, color, poly.model[], strokecolor, strokestyle, poly.strokewidth[])
draw_poly(scene, screen, poly, points, color, strokecolor, strokestyle, poly.strokewidth[])
end

# when color is a Makie.AbstractPattern, we don't need to go to Mesh
function draw_poly(scene::Scene, screen::Screen, poly, points::Vector{<:Point2}, color::Union{Colorant, Cairo.CairoPattern},
model, strokecolor, strokestyle, strokewidth)
space = to_value(get(poly, :space, :data))
points = project_position.(Ref(scene), space, points, Ref(model))
function draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), points::Vector{<:Point2}, color::Union{Colorant, Cairo.CairoPattern},
strokecolor, strokestyle, strokewidth)
points = cairo_project(poly, points)
Cairo.move_to(screen.context, points[1]...)
for p in points[2:end]
Cairo.line_to(screen.context, p...)
Expand All @@ -61,7 +63,7 @@ function draw_poly(scene::Scene, screen::Screen, poly, points::Vector{<:Point2},
Cairo.stroke(screen.context)
end

function draw_poly(scene::Scene, screen::Screen, poly, points_list::Vector{<:Vector{<:Point2}})
function draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), points_list::Vector{<:Vector{<:Point2}})
color = to_cairo_color(poly.color[], poly)
strokecolor = to_cairo_color(poly.strokecolor[], poly)
strokestyle = Makie.convert_attribute(poly.linestyle[], key"linestyle"())
Expand All @@ -72,13 +74,10 @@ function draw_poly(scene::Scene, screen::Screen, poly, points_list::Vector{<:Vec
end
end

draw_poly(scene::Scene, screen::Screen, poly, rect::Rect2) = draw_poly(scene, screen, poly, [rect])

function draw_poly(scene::Scene, screen::Screen, poly, rects::Vector{<:Rect2})
model = poly.model[]
space = to_value(get(poly, :space, :data))
projected_rects = project_rect.(Ref(scene), space, rects, Ref(model))
draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), rect::Rect2) = draw_poly(scene, screen, poly, [rect])

function draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), rects::Vector{<:Rect2})
projected_rects = cairo_project.((poly,), rects)
color = to_cairo_color(poly.color[], poly)

linestyle = Makie.convert_attribute(poly.linestyle[], key"linestyle"())
Expand Down Expand Up @@ -123,14 +122,15 @@ function polypath(ctx, polygon)
end
end

draw_poly(scene::Scene, screen::Screen, poly, polygon::Polygon) = draw_poly(scene, screen, poly, [polygon])
draw_poly(scene::Scene, screen::Screen, poly, circle::Circle) = draw_poly(scene, screen, poly, decompose(Point2f, circle))

function draw_poly(scene::Scene, screen::Screen, poly, polygons::AbstractArray{<:Polygon})
model = poly.model[]
space = to_value(get(poly, :space, :data))
projected_polys = project_polygon.(Ref(poly), space, polygons, Ref(model))
function draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), polygon::Polygon)
return draw_poly(scene, screen, poly, [polygon])
end
function draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), circle::Circle)
return draw_poly(scene, screen, poly, decompose(Point2f, circle))
end

function draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), polygons::AbstractArray{<:Polygon})
projected_polys = cairo_project.((poly,), polygons)
color = to_cairo_color(poly.color[], poly)
strokecolor = to_cairo_color(poly.strokecolor[], poly)
strokestyle = Makie.convert_attribute(poly.linestyle[], key"linestyle"())
Expand All @@ -146,11 +146,8 @@ function draw_poly(scene::Scene, screen::Screen, poly, polygons::AbstractArray{<

end

function draw_poly(scene::Scene, screen::Screen, poly, polygons::AbstractArray{<: MultiPolygon})
model = poly.model[]
space = to_value(get(poly, :space, :data))
projected_polys = project_multipolygon.(Ref(scene), space, polygons, Ref(model))

function draw_poly(scene::Scene, screen::Screen, @nospecialize(poly), polygons::AbstractArray{<: MultiPolygon})
projected_polys = cairo_project.((poly,), polygons)
color = to_cairo_color(poly.color[], poly)
strokecolor = to_cairo_color(poly.strokecolor[], poly)
strokestyle = Makie.convert_attribute(poly.linestyle[], key"linestyle"())
Expand Down Expand Up @@ -183,9 +180,7 @@ function draw_plot(scene::Scene, screen::Screen,
upperpoints = band[1][]
lowerpoints = band[2][]
points = vcat(lowerpoints, reverse(upperpoints))
model = band.model[]
space = to_value(get(band, :space, :data))
points = project_position.(Ref(scene), space, points, Ref(model))
points = cairo_project(band, points)
Cairo.move_to(screen.context, points[1]...)
for p in points[2:end]
Cairo.line_to(screen.context, p...)
Expand Down Expand Up @@ -221,9 +216,7 @@ function draw_plot(scene::Scene, screen::Screen, tric::Tricontourf)
colornumbers = pol.color[]
colors = to_cairo_color(colornumbers, pol)
polygons = pol[1][]
model = pol.model[]
space = to_value(get(pol, :space, :data))
projected_polys = project_polygon.(Ref(scene), space, polygons, Ref(model))
projected_polys = cairo_project.((tric,), polygons)

function draw_tripolys(polys, colornumbers, colors)
for (i, (pol, colnum, col)) in enumerate(zip(polys, colornumbers, colors))
Expand Down
Loading
Loading