Add projection `space` option as a generic attribute #1596

ffreyer · 2022-01-15T13:52:06Z

Description

This pr adds space as a general attribute to switch between camera space, pixel space, unit space (0..1) and maybe clip space (-1..1). That way you can adjust the units of the plot without creating another scene or messing with camera matrices.

Currently works in GLMakie:

using GLMakie
fig = Figure()
# ax = LScene(fig[1, 1])
# ax = Axis(fig[1, 1])
ax = Axis3(fig[1, 1])
meshscatter!(ax, Point3f.(1:10, 1:10, 1:10), space = :data, color = :blue)
# scatter!(ax, Point2f.(1:10, 1:10), space = :data, color = :blue)
scatter!(ax, Point2f.(200, 100:100:500), space = :pixel, color = :red)
scatter!(ax, Point2f.(0.6, 0.1:0.1:0.9), space = :relative, color = :green)
scatter!(ax, Point2f.(0.9, -0.9:0.2:0.9), space = :clip, color = :orange)
display(fig)

Type of change

Breaking change because the space attribute in text has been renamed to markerspace and space now means something else.

Checklist

Related issues

fixes scatter + Axis3 + GLMakie does not work #994 (somehow)
fixes Text not rendered correctly with 3d orthographic camera #1602 (probably because I switched away from project?)
closes [FR] Plotting text in "axis coordinates" #1472
implements "display", "figure/scene/axis" and "data" coordinates from Thoughts on transformations #369

ffreyer · 2022-01-16T19:49:17Z

I think I got all combinations of space and markerspace to work with text and scatter now

fig = Figure(resolution = (700, 700))
ax = Axis(fig[1, 1], width = 600, height = 600)
spaces = (:data, :pixel, :relative, :clip)
xs = [
    [0.1, 0.35, 0.6, 0.85], 
    [0.1, 0.35, 0.6, 0.85] * 600,
    [0.1, 0.35, 0.6, 0.85],
    2 .* [0.1, 0.35, 0.6, 0.85] .- 1
]
for (i, space) in enumerate(spaces)
    for (mspace, j, scale) in zip(spaces, 1:4, (0.02, 12, 0.02, 0.04))
        scatter!(
            ax, Point2f(xs[i][i], xs[i][j]), 
            markersize = 5scale, space = space, markerspace = mspace
        )
        text!(
            ax, "$space\n$mspace", position = Point2f(xs[i][i], xs[i][j]), 
            textsize = scale, space = space, markerspace = mspace,
            align = (:center, :center)
        )
    end
end
xlims!(ax, 0, 1)
ylims!(ax, 0, 1)
fig

ffreyer · 2022-01-20T12:29:30Z

The depth shift test should fail here because I changed some things back to how they were when the test was added:

I removed the axes. It seems like the scenekw=(show_axis = false,) didn't get adjusted with the scene rework.
I added an explicit center!. It seems like that used to run after translate! and scale! before, but not anymore.

ffreyer · 2022-01-20T17:23:34Z

I checked a bunch of the lower scoring tests. In GLMakie:

"Depth Shift" is fine, see above
"Streamplot animation" seems fine
"image scatter" is a 3D scatter plot with screenspace markers so it's scaling got changed
"Text rotation" looks exactly the same as the refimage to me?
"3D Contour with 2d countour slices" looks different because it's from before fix fuzzy contours #1559
"3D screenspace annotations" hides part of the text inside the scattered spheres which is technically correct but differs from before

I also checked a few of the worst cases in CairoMakie. Most of them are just 3D plots

ffreyer · 2022-02-01T13:00:47Z

#1632 moves the the preprojection math into shaders in GLMakie and WGLMakie. I kept it separate to make it a bit easier to review (though it ended up being very little work in shaders)

MakieBot · 2022-03-01T14:36:44Z

Compile Times benchmark

ffreyer · 2022-03-01T15:56:25Z

Tests are still fine

* remove overly eager optimizations (#1713) * small clean ups * clean up implementation a bit, use only one name for space * address review

ffreyer · 2022-03-03T17:06:44Z

Another TODO:

scatter with FastPixel currently doesn't have camera matrices attached in GLMakie

SimonDanisch · 2022-03-03T17:16:37Z

and:

fix text offset

ffreyer · 2022-03-03T17:59:42Z

I checked a couple of rectangles in the example above. Seems like it's generally a bit better centered after the pr. Before the offsets of the centers of text bounding boxes to centers of heatmap rectangles at the corners are

(1, 0.5) ... (0.5, 0.5)
   :              :
(1, 1.5) ... (0.5, 1.5)

pixel and after it's (-0.5, +0.5) with some rectangle inside being (-0.5, +0.5). I'd say it's better now.

SimonDanisch · 2022-03-04T09:22:16Z

Ok, I fixed the FastPixel marker. I tried uploading the new reference images, but it currently doesnt work :(
I'll merge this nevertheless, to finally be able to merge all these other PRs that have merge conflict with this one. We can update the reference images later.

simonbyrne · 2022-03-11T07:27:55Z

This appears to have broken GeoMakie:

julia> fig = Figure()

julia> ax = GeoAxis(fig[1,1]; dest = "+proj=wintri")
ERROR: Space screen not recognized. Must be one of (:data, :pixel, :relative, :clip)
Stacktrace:
  [1] error(s::String)
    @ Base ./error.jl:33
  [2] space_to_clip
    @ ~/.julia/dev/Makie/src/camera/projection_math.jl:324 [inlined]
  [3] space_to_clip
    @ ~/.julia/dev/Makie/src/camera/projection_math.jl:315 [inlined]
  [4] (::GLMakie.var"#143#154"{Camera})(s::Symbol, ms::Symbol, pv::StaticArrays.SMatrix{4, 4, Float32, 16}, res::Vec{2, Float32})
    @ GLMakie ~/.julia/dev/Makie/GLMakie/src/drawing_primitives.jl:384
  [5] map(::GLMakie.var"#143#154"{Camera}, ::Observable{Symbol}, ::Observable{Symbol}, ::Vararg{Any}; kwargs::Base.Pairs{Symbol, Union{}, Tuple{}, NamedTuple{(), Tuple{}}})
    @ Observables ~/.julia/packages/Observables/OFj0u/src/Observables.jl:477
  [6] map(::GLMakie.var"#143#154"{Camera}, ::Observable{Symbol}, ::Observable{Symbol}, ::Observable{StaticArrays.SMatrix{4, 4, Float32, 16}}, ::Vararg{Any})
    @ Observables ~/.julia/packages/Observables/OFj0u/src/Observables.jl:466
  [7] (::GLMakie.var"#133#144"{Scene, MakieCore.Text{Tuple{Makie.GlyphCollection}}})(gl_attributes::Dict{Symbol, Any})
    @ GLMakie ~/.julia/dev/Makie/GLMakie/src/drawing_primitives.jl:383
  [8] (::GLMakie.var"#103#106"{GLMakie.var"#133#144"{Scene, MakieCore.Text{Tuple{Makie.GlyphCollection}}}, GLMakie.Screen, Scene, MakieCore.Text{Tuple{Makie.GlyphCollection}}})()
    @ GLMakie ~/.julia/dev/Makie/GLMakie/src/drawing_primitives.jl:107
  [9] get!(default::GLMakie.var"#103#106"{GLMakie.var"#133#144"{Scene, MakieCore.Text{Tuple{Makie.GlyphCollection}}}, GLMakie.Screen, Scene, MakieCore.Text{Tuple{Makie.GlyphCollection}}}, h::Dict{UInt64, GLMakie.GLAbstraction.RenderObject}, key::UInt64)
    @ Base ./dict.jl:464
 [10] cached_robj!(robj_func::GLMakie.var"#133#144"{Scene, MakieCore.Text{Tuple{Makie.GlyphCollection}}}, screen::GLMakie.Screen, scene::Scene, x::MakieCore.Text{Tuple{Makie.GlyphCollection}})
    @ GLMakie ~/.julia/dev/Makie/GLMakie/src/drawing_primitives.jl:85
 [11] draw_atomic
    @ ~/.julia/dev/Makie/GLMakie/src/drawing_primitives.jl:304 [inlined]
 [12] insert!
    @ ~/.julia/dev/Makie/GLMakie/src/drawing_primitives.jl:121 [inlined]
 [13] (::GLMakie.var"#109#110"{GLMakie.Screen, Scene})(x::MakieCore.Text{Tuple{Makie.GlyphCollection}})
    @ GLMakie ~/.julia/dev/Makie/GLMakie/src/drawing_primitives.jl:126
 [14] foreach(f::GLMakie.var"#109#110"{GLMakie.Screen, Scene}, itr::Vector{AbstractPlot})
    @ Base ./abstractarray.jl:2694
 [15] insert!(screen::GLMakie.Screen, scene::Scene, x::Combined)
    @ GLMakie ~/.julia/dev/Makie/GLMakie/src/drawing_primitives.jl:123
 [16] push!(scene::Scene, plot::MakieCore.Text{Tuple{String}})
    @ Makie ~/.julia/dev/Makie/src/scenes.jl:368
 [17] plot!(scene::Scene, P::Type{MakieCore.Text{Tuple{String}}}, attributes::Attributes, input::Tuple{Observable{Any}}, args::Observable{Tuple{String}})
    @ Makie ~/.julia/dev/Makie/src/interfaces.jl:403
 [18] plot!(scene::Scene, P::Type{MakieCore.Text}, attributes::Attributes, args::Observable{Any}; kw_attributes::Base.Pairs{Symbol, Union{}, Tuple{}, NamedTuple{(), Tuple{}}})
    @ Makie ~/.julia/dev/Makie/src/interfaces.jl:320
 [19] plot!
    @ ~/.julia/dev/Makie/src/interfaces.jl:288 [inlined]
 [20] #plot!#145
    @ ~/.julia/dev/Makie/src/interfaces.jl:271 [inlined]
 [21] text!(::Scene, ::Vararg{Any}; attributes::Base.Pairs{Symbol, Any, NTuple{9, Symbol}, NamedTuple{(:textsize, :color, :position, :visible, :align, :rotation, :font, :markerspace, :inspectable), Tuple{Observable{Any}, Observable{Any}, Observable{Point{2, Float32}}, Observable{Any}, Observable{Tuple{Symbol, Symbol}}, Observable{Float32}, Observable{Any}, Symbol, Bool}}})
    @ MakieCore ~/.julia/packages/MakieCore/A0hGm/src/recipes.jl:37
 [22] Makie.MakieLayout.LineAxis(parent::Scene; kwargs::Base.Pairs{Symbol, Observable, NTuple{36, Symbol}, NamedTuple{(:endpoints, :limits, :flipped, :ticklabelrotation, :ticklabelalign, :labelsize, :labelpadding, :ticklabelpad, :labelvisible, :label, :labelfont, :ticklabelfont, :ticklabelcolor, :labelcolor, :tickalign, :ticklabelspace, :ticks, :tickformat, :ticklabelsvisible, :ticksvisible, :spinevisible, :spinecolor, :spinewidth, :ticklabelsize, :trimspine, :ticksize, :reversed, :tickwidth, :tickcolor, :minorticksvisible, :minortickalign, :minorticksize, :minortickwidth, :minortickcolor, :minorticks, :scale), Tuple{Observable{Tuple{Point{2, Float32}, Point{2, Float32}}}, Observable{Tuple{Float32, Float32}}, Observable{Bool}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Bool}, Observable{Symbol}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}, Observable{Any}}}})
    @ Makie.MakieLayout ~/.julia/dev/Makie/src/makielayout/lineaxis.jl:174
 [23] layoutable(::Type{Axis}, fig_or_scene::Figure; bbox::Nothing, kwargs::Base.Pairs{Symbol, Any, NTuple{4, Symbol}, NamedTuple{(:aspect, :xticks, :yticks, :limits), Tuple{DataAspect, Tuple{Vector{Float32}, Vector{String}}, Tuple{Vector{Float32}, Vector{String}}, Tuple{Tuple{Int64, Int64}, Tuple{Int64, Int64}}}}})
    @ Makie.MakieLayout ~/.julia/dev/Makie/src/makielayout/layoutables/axis.jl:208
 [24] #_layoutable#11
    @ ~/.julia/dev/Makie/src/makielayout/layoutables.jl:69 [inlined]
 [25] _layoutable(::Type{Axis}, ::GridPosition; kwargs::Base.Pairs{Symbol, Any, NTuple{4, Symbol}, NamedTuple{(:aspect, :xticks, :yticks, :limits), Tuple{DataAspect, Tuple{Vector{Float32}, Vector{String}}, Tuple{Vector{Float32}, Vector{String}}, Tuple{Tuple{Int64, Int64}, Tuple{Int64, Int64}}}}})
    @ Makie.MakieLayout ~/.julia/dev/Makie/src/makielayout/layoutables.jl:64
 [26] #_#9
    @ ~/.julia/dev/Makie/src/makielayout/layoutables.jl:49 [inlined]
 [27] GeoAxis(args::GridPosition; source::String, dest::String, transformation::Proj4.Transformation, lonticks::StepRange{Int64, Int64}, latticks::StepRange{Int64, Int64}, hidespines::Bool, coastlines::Bool, coastline_attributes::NamedTuple{(), Tuple{}}, aspect::DataAspect, kw::Base.Pairs{Symbol, Union{}, Tuple{}, NamedTuple{(), Tuple{}}})
    @ GeoMakie ~/.julia/dev/GeoMakie/src/geoaxis.jl:74
 [28] top-level scope
    @ REPL[7]:1

simonbyrne · 2022-03-11T07:42:08Z

Ah, nevermind, I hadn't dev-ed MakieCore.

ffreyer added 6 commits December 15, 2021 14:57

use markerspace::Symbol for text and scatter

c0933b3

Merge branch 'master' into ff/transform

c552755

adjust camera matrices based on space

2ede6ad

only include data space plots in limits

582128f

add is_data_space etc

8469e69

update text

6772375

ffreyer added 4 commits January 16, 2022 23:42

cleanup markerspace

1364026

markerspace for scatter

2f57595

fix interactivity

0528362

add default marker/-space

46a7bb0

ffreyer mentioned this pull request Jan 19, 2022

Text not rendered correctly with 3d orthographic camera #1602

Closed

ffreyer added 5 commits January 19, 2022 16:20

add efault space

a7a724c

get WGLMakie working

f6da424

fix heatmap

940c4b9

fix tests

8e61e9e

fix typo

b64411a

ffreyer added 8 commits January 20, 2022 15:30

get CairoMakie working

926cb8f

fix circle marker transform

04b6482

add 2D space+markerspace tests

76fd5db

fix mesh3D space

d111fd8

add 3D space test

34ee3d2

fix poly and band

d4b70d6

change space to markerspace

96120c7

fix rotations

9bdfba0

ffreyer added 3 commits January 20, 2022 18:31

fix 1.3 test error?

22c6a27

fix 1.3

f12585f

fix 1.3 error

b041e2e

move preprojection into shaders

9ff018e

ffreyer mentioned this pull request Feb 1, 2022

move preprojection into shaders #1632

Closed

ffreyer added 3 commits February 1, 2022 16:33

minor cleanup

53018ef

remove deleted import

1d04275

Merge branch 'master' into ff/transform_in_shader

486fbcf

SimonDanisch mentioned this pull request Feb 2, 2022

Specify text anchor in screen coordinates #1638

Closed

ffreyer mentioned this pull request Feb 8, 2022

Bounding Boxes #1653

Closed

Merge branch 'master' into ff/transform

fec5832

ffreyer added 2 commits March 1, 2022 16:35

fix test

3e98e72

clarify comment

1b3e156

SimonDanisch added 3 commits March 3, 2022 13:05

Small clean ups (#1717)

cd5c42d

* remove overly eager optimizations (#1713) * small clean ups * clean up implementation a bit, use only one name for space * address review

fix usage of space_to_clip

1d3da6a

fix cairomakie

ab66486

fix fastpixel and add tests

da4211e

SimonDanisch merged commit 432b8ab into master Mar 4, 2022

SimonDanisch deleted the ff/transform branch March 4, 2022 09:22

ffreyer mentioned this pull request Mar 6, 2022

Add mixed coordinate spaces #1730

Open

8 tasks

This was referenced Mar 15, 2022

scatter and text transformations act on the wrong space #1753

Closed

add new theme. #1746

Open

fatteneder mentioned this pull request Mar 26, 2022

Space screen not recognized #1787

Closed

hexaeder mentioned this pull request Apr 28, 2022

Compatibility with Makie 0.17 MakieOrg/GraphMakie.jl#78

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add projection `space` option as a generic attribute #1596

Add projection `space` option as a generic attribute #1596

ffreyer commented Jan 15, 2022 •

edited

ffreyer commented Jan 16, 2022 •

edited

ffreyer commented Jan 20, 2022

ffreyer commented Jan 20, 2022

ffreyer commented Feb 1, 2022

MakieBot commented Mar 1, 2022

ffreyer commented Mar 1, 2022

ffreyer commented Mar 3, 2022 •

edited by SimonDanisch

SimonDanisch commented Mar 3, 2022 •

edited

ffreyer commented Mar 3, 2022

SimonDanisch commented Mar 4, 2022

simonbyrne commented Mar 11, 2022

simonbyrne commented Mar 11, 2022

Add projection space option as a generic attribute #1596

Add projection space option as a generic attribute #1596

Conversation

ffreyer commented Jan 15, 2022 • edited

Description

Type of change

Checklist

Related issues

ffreyer commented Jan 16, 2022 • edited

ffreyer commented Jan 20, 2022

ffreyer commented Jan 20, 2022

ffreyer commented Feb 1, 2022

MakieBot commented Mar 1, 2022

Compile Times benchmark

ffreyer commented Mar 1, 2022

ffreyer commented Mar 3, 2022 • edited by SimonDanisch

SimonDanisch commented Mar 3, 2022 • edited

ffreyer commented Mar 3, 2022

SimonDanisch commented Mar 4, 2022

simonbyrne commented Mar 11, 2022

simonbyrne commented Mar 11, 2022

Add projection `space` option as a generic attribute #1596

Add projection `space` option as a generic attribute #1596

ffreyer commented Jan 15, 2022 •

edited

ffreyer commented Jan 16, 2022 •

edited

ffreyer commented Mar 3, 2022 •

edited by SimonDanisch

SimonDanisch commented Mar 3, 2022 •

edited