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.

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

Breaking release 0.22 #4477

Merged
merged 63 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
591cb16
update CI
ffreyer Oct 14, 2024
341fe52
update versions
ffreyer Oct 14, 2024
91646ab
dont test on branch push (already runs for prs against master)
ffreyer Oct 14, 2024
53b7e7e
fix versions
ffreyer Oct 14, 2024
d6f9fdb
Updates for GeometryBasics refactor (#4319)
ffreyer Oct 16, 2024
89fa714
rename clear_faceviews
ffreyer Oct 16, 2024
adef598
update GeometryBasics dev branch
ffreyer Oct 16, 2024
8cb5985
Merge branch 'master' into breaking-0.22
ffreyer Oct 16, 2024
5a30e86
Merge branch 'master' into breaking-0.22
ffreyer Oct 16, 2024
6db5d75
Merge branch 'master' into breaking-0.22
ffreyer Oct 21, 2024
d4721be
update CI
ffreyer Oct 21, 2024
59a4f34
more CI bumps
ffreyer Oct 21, 2024
0d6532b
Merge branch 'master' into breaking-0.22
ffreyer Oct 21, 2024
8e2be19
fix relocatibility CI
ffreyer Oct 21, 2024
c164de6
Merge branch 'breaking-0.22' of https://github.com/MakieOrg/Makie.jl …
ffreyer Oct 21, 2024
d629c0e
fix 2x2 surface
ffreyer Oct 21, 2024
af4ce5e
Merge branch 'master' into breaking-0.22
ffreyer Oct 22, 2024
c0a9c5d
fix CairoMakie
ffreyer Oct 22, 2024
16e3536
fix WGLMakie 2x2 surface
ffreyer Oct 22, 2024
63d3a4f
Merge branch 'master' into breaking-0.22
ffreyer Oct 30, 2024
afb5929
fix picking tests
ffreyer Oct 30, 2024
e34c2b7
remove reliance on Rect mesh generation
ffreyer Oct 30, 2024
4c4d7e3
Metamesh and multi mesh loading (#4496)
SimonDanisch Oct 31, 2024
8886792
rename Tesselation -> Tessellation (#4564)
ffreyer Nov 4, 2024
030a5a4
try fix benchmark
ffreyer Nov 4, 2024
0e59252
Merge branch 'master' into breaking-0.22
ffreyer Nov 4, 2024
245a942
regenerate bundled
ffreyer Nov 4, 2024
9fc37d2
update Changelog [skip CI]
ffreyer Nov 5, 2024
d6b2dbc
Merge branch 'master' into breaking-0.22
ffreyer Nov 5, 2024
a04c2c7
Merge branch 'master' into breaking-0.22
ffreyer Nov 12, 2024
1de359b
Merge branch 'master' into breaking-0.22
ffreyer Nov 14, 2024
885b4f1
allow GeometryBasics 0.5 [skip ci]
ffreyer Nov 14, 2024
89a1d50
Change automatic color generation for Voronoiplot (#4357)
DanielVandH Nov 14, 2024
882b554
Merge branch 'master' into breaking-0.22
ffreyer Nov 15, 2024
6a7b297
add precompile for refreshcallback
ffreyer Nov 16, 2024
c1d80a0
try gc() between compile timings
ffreyer Nov 16, 2024
81e119c
update GeometryBasics, MeshIO versions
ffreyer Nov 19, 2024
98284c6
Merge branch 'master' into breaking-0.22
ffreyer Nov 19, 2024
1fec49e
update ShaderAbstractions & CI
ffreyer Nov 19, 2024
d131f76
Merge branch 'breaking-0.22' of https://github.com/MakieOrg/Makie.jl …
ffreyer Nov 19, 2024
95cef27
Merge branch 'master' into breaking-0.22
ffreyer Nov 19, 2024
06a0bd5
remove branches from relocatability
ffreyer Nov 19, 2024
75c8bb7
Merge branch 'breaking-0.22' of https://github.com/MakieOrg/Makie.jl …
ffreyer Nov 19, 2024
f255e03
remove dev branches from docs
ffreyer Nov 19, 2024
a4fea2c
Merge branch 'master' into breaking-0.22
ffreyer Nov 20, 2024
468555a
Split marker_offset from quad_offset (#4594)
ffreyer Nov 20, 2024
f8e5519
Merge branch 'master' into breaking-0.22
ffreyer Nov 23, 2024
8f6b037
Merge branch 'master' into breaking-0.22
SimonDanisch Nov 28, 2024
abcb25f
Merge branch 'master' into breaking-0.22
SimonDanisch Nov 28, 2024
a0d3ecd
Add `transform_marker` attribute to meshscatter (#4606)
ffreyer Nov 28, 2024
48da477
Merge branch 'master' into breaking-0.22
ffreyer Nov 28, 2024
eca0f7f
Add zooming & translation controls to Axis3 (#4131)
ffreyer Nov 29, 2024
fa1c5cb
Fix Float32 constraints in poly pipeline (#4615)
asinghvi17 Nov 29, 2024
0b9fd11
Merge branch 'master' into breaking-0.22
ffreyer Dec 2, 2024
67cfe07
Merge branch 'master' into breaking-0.22
ffreyer Dec 2, 2024
557310f
Merge branch 'master' into breaking-0.22
ffreyer Dec 9, 2024
199fe7d
Merge branch 'master' into breaking-0.22
SimonDanisch Dec 11, 2024
d8c4dbd
try fixing memory leak
SimonDanisch Dec 12, 2024
98e6c10
aggressively clean up objects
SimonDanisch Dec 12, 2024
2c00afb
check screen outside animationframe + upload electron logs in CI
SimonDanisch Dec 12, 2024
5162a26
Merge branch 'master' into breaking-0.22
SimonDanisch Dec 12, 2024
3a4dd31
Clean up CI + CHangelog
SimonDanisch Dec 12, 2024
1a6ff6c
Update CHANGELOG.md
SimonDanisch Dec 12, 2024
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: 1 addition & 2 deletions .github/workflows/Docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ on:
pull_request:
branches:
- master
- breaking-0.21
push:
tags:
- '*'
branches:
- master
- breaking-0.21

workflow_dispatch:

concurrency:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/compilation-benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,3 @@ jobs:
![GLMakie](${{ env.GIST_URL_USERCONTENT }}/raw/GLMakie.svg)
![CairoMakie](${{ env.GIST_URL_USERCONTENT }}/raw/CairoMakie.svg)
![WGLMakie](${{ env.GIST_URL_USERCONTENT }}/raw/WGLMakie.svg)


5 changes: 5 additions & 0 deletions .github/workflows/reference_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@ jobs:
with:
name: ReferenceImages_WGLMakie_${{ matrix.version }}
path: ./WGLMakie/test/reference_images/
- name: Upload test Electron logs
uses: actions/upload-artifact@v4
with:
name: Electron_Logs_WGLMakie_${{ matrix.version }}
path: ./WGLMakie/test/electron.log
- name: Fail after artifacts if tests failed
if: ${{ env.TESTS_SUCCESSFUL != 'true' }}
run: exit 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/relocatability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ jobs:
DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --color=yes ./relocatability.jl ${{ matrix.backend }}
else
julia --color=yes ./relocatability.jl ${{ matrix.backend }}
fi
fi
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ docs/documentation/news.md
metrics/ttfp/current-pr-project/
metrics/ttfp/benchmark-projects/*
*benchmark.json
WGLMakie/test/electron.log
28 changes: 24 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@

## [Unreleased]

## [0.22.0] - 2024-12-12

- Updated to GeometryBasics 0.5: [GeometryBasics#173](https://github.com/JuliaGeometry/GeometryBasics.jl/pull/173), [GeometryBasics#219](https://github.com/JuliaGeometry/GeometryBasics.jl/pull/219) [#4319](https://github.com/MakieOrg/Makie.jl/pull/4319)
- Removed `meta` infrastructure. Vertex attributes are now passed as kwargs.
- Simplified GeometryBasics Mesh type, improving compile times
- Added `FaceView` to allow different vertex attributes to use different indices for specifying data of the same vertex. This can be used to specify per-face data.
- Added `GeometryBasics.face_normals(points, faces)`
- Changed the order of `Rect2` coordinates to be counter-clockwise.
- Updated `Cylinder` to avoid visually rounding off the top and bottom.
- Added `MetaMesh` to store non-vertex metadata in a GeometryBasics Mesh object. These are now produced by MeshIO for `.obj` files, containing information from `.mtl` files.
- Renamed `Tesselation/tesselation` to `Tessellation/tessellation` [GeometryBasics#227](https://github.com/JuliaGeometry/GeometryBasics.jl/pull/227) [#4564](https://github.com/MakieOrg/Makie.jl/pull/4564)
- Added `Makie.mesh` option for `MetaMesh` which applies some of the bundled information [#4368](https://github.com/MakieOrg/Makie.jl/pull/4368), [#4496](https://github.com/MakieOrg/Makie.jl/pull/4496)
- `Voronoiplot`s automatic colors are now defined based on the underlying point set instead of only those generators appearing in the tessellation. This makes the selected colors consistent between tessellations when generators might have been deleted or added. [#4357](https://github.com/MakieOrg/Makie.jl/pull/4357)
- Added `viewmode = :free` and translation, zoom, limit reset and cursor-focus interactions to Axis3. [4131](https://github.com/MakieOrg/Makie.jl/pull/4131)
- Split `marker_offset` handling from marker centering and fix various bugs with it [#4594](https://github.com/MakieOrg/Makie.jl/pull/4594)
- Added `transform_marker` attribute to meshscatter and changed the default behavior to not transform marker/mesh vertices [#4606](https://github.com/MakieOrg/Makie.jl/pull/4606)
- Fixed some issues with meshscatter not correctly transforming with transform functions and float32 rescaling [#4606](https://github.com/MakieOrg/Makie.jl/pull/4606)
- Fixed `poly` pipeline for 3D and/or Float64 polygons that begin from an empty vector [#4615](https://github.com/MakieOrg/Makie.jl/pull/4615).

## [0.21.18] - 2024-12-12

- Allow for user defined recipes to be used in SpecApi [#4655](https://github.com/MakieOrg/Makie.jl/pull/4655).
Expand All @@ -26,10 +45,10 @@
- Added conversions for 1 and 2 value paddings in `Label` and `tooltip` [#4599](https://github.com/MakieOrg/Makie.jl/pull/4599)
- Fixed `NaN` in scatter rotation and markersize breaking Cairo state [#4599](https://github.com/MakieOrg/Makie.jl/pull/4599)
- Fixed heatmap cells being 0.5px/units too large in CairoMakie [4633](https://github.com/MakieOrg/Makie.jl/pull/4633)
- Fix bounds error when recording video with WGLMakie [#4639](https://github.com/MakieOrg/Makie.jl/pull/4639).
- Add `axis.(x/y)ticklabelspace = :max_auto`, to only grow tickspace but never shrink to reduce jitter [#4642](https://github.com/MakieOrg/Makie.jl/pull/4642).
- Fixed bounds error when recording video with WGLMakie [#4639](https://github.com/MakieOrg/Makie.jl/pull/4639).
- Added `axis.(x/y)ticklabelspace = :max_auto`, to only grow tickspace but never shrink to reduce jitter [#4642](https://github.com/MakieOrg/Makie.jl/pull/4642).
- The error shown for invalid attributes will now also show suggestions for nearby attributes (if there are any) [#4394](https://github.com/MakieOrg/Makie.jl/pull/4394).
- Add (x/y)axislinks to S.GridLayout and make sure limits don't reset when linking axes [#4643](https://github.com/MakieOrg/Makie.jl/pull/4643).
- Added (x/y)axislinks to S.GridLayout and make sure limits don't reset when linking axes [#4643](https://github.com/MakieOrg/Makie.jl/pull/4643).

## [0.21.16] - 2024-11-06

Expand Down Expand Up @@ -687,7 +706,8 @@ All other changes are collected [in this PR](https://github.com/MakieOrg/Makie.j
- Fixed rendering of `heatmap`s with one or more reversed ranges in CairoMakie, as in `heatmap(1:10, 10:-1:1, rand(10, 10))` [#1100](https://github.com/MakieOrg/Makie.jl/pull/1100).
- Fixed volume slice recipe and added docs for it [#1123](https://github.com/MakieOrg/Makie.jl/pull/1123).

[Unreleased]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.18...HEAD
[Unreleased]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.0...HEAD
[0.22.0]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.18...v0.22.0
[0.21.18]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.17...v0.21.18
[0.21.17]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.16...v0.21.17
[0.21.16]: https://github.com/MakieOrg/Makie.jl/compare/v0.21.15...v0.21.16
Expand Down
6 changes: 3 additions & 3 deletions CairoMakie/Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "CairoMakie"
uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
author = ["Simon Danisch <[email protected]>"]
version = "0.12.18"
version = "0.13.0"

[deps]
CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
Expand All @@ -22,9 +22,9 @@ Cairo_jll = "1.18.0"
Colors = "0.10, 0.11, 0.12, 0.13"
FileIO = "1.1"
FreeType = "3, 4.0"
GeometryBasics = "0.4.11"
GeometryBasics = "0.5"
LinearAlgebra = "1.0, 1.6"
Makie = "=0.21.18"
Makie = "=0.22.0"
PrecompileTools = "1.0"
julia = "1.3"

Expand Down
16 changes: 10 additions & 6 deletions CairoMakie/src/overrides.jl
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function draw_plot(scene::Scene, screen::Screen, poly::Poly)
# dispatch on input arguments to poly to use smarter drawing methods than
# meshes if possible.
# however, since recipes exist, we can't explicitly handle all cases here
# so, we should also take a look at converted
# so, we should also take a look at converted
# First, we check whether a `draw_poly` method exists for the input arguments
# before conversion:
return if Base.hasmethod(draw_poly, Tuple{Scene, Screen, typeof(poly), typeof.(to_value.(poly.args))...})
Expand Down Expand Up @@ -85,10 +85,14 @@ draw_poly(scene::Scene, screen::Screen, poly, rect::Rect2) = draw_poly(scene, sc
draw_poly(scene::Scene, screen::Screen, poly, bezierpath::BezierPath) = draw_poly(scene, screen, poly, [bezierpath])

function draw_poly(scene::Scene, screen::Screen, poly, shapes::Vector{<:Union{Rect2, BezierPath}})
model = poly.model[]
space = to_value(get(poly, :space, :data))
clipped_shapes = clip_shape.(Ref(poly.clip_planes[]), shapes, space, Ref(model))
projected_shapes = project_shape.(Ref(poly), space, clipped_shapes, Ref(model))
model = poly.model[]::Mat4d
space = to_value(get(poly, :space, :data))::Symbol
planes = poly.clip_planes[]::Vector{Plane3f}

projected_shapes = map(shapes) do shape
clipped = clip_shape(planes, shape, space, model)
return project_shape(poly, space, clipped, model)
end

color = to_cairo_color(poly.color[], poly)

Expand Down Expand Up @@ -188,7 +192,7 @@ end
function draw_poly(scene::Scene, screen::Screen, poly, polygons::AbstractArray{<: MultiPolygon})
model = poly.model[]
space = to_value(get(poly, :space, :data))
projected_polys = map(polygons) do polygon
projected_polys = map(polygons) do polygon
project_multipolygon(poly, space, polygon, poly.clip_planes[], model)
end

Expand Down
1 change: 1 addition & 0 deletions CairoMakie/src/precompiles.jl
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ let
include(shared_precompile)
end
end
precompile(openurl, (String,))
precompile(draw_atomic_scatter, (Scene, Cairo.CairoContext, Tuple{typeof(identity),typeof(identity)},
Vector{ColorTypes.RGBA{Float32}}, Vec{2,Float32}, ColorTypes.RGBA{Float32},
Float32, BezierPath, Vec{2,Float32}, Quaternionf,
Expand Down
Loading
Loading