Merge branch 'master' into jk/subsup

.github/workflows/Docs.yml

@@ -37,7 +37,7 @@ jobs:
     - name: Install Julia
       uses: julia-actions/setup-julia@v2
       with:
-        version: '1.10'
+        version: '1'
     - uses: julia-actions/cache@v2
     - name: Build and deploy docs
       env:

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
       matrix:
         version:
           - '1.6'
-          - '1.10'
+          - '1'
         os:
           - ubuntu-20.04
         arch:

.github/workflows/compilation-benchmark.yaml

@@ -28,7 +28,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
       - uses: julia-actions/setup-julia@v2
         with:
-          version: '1.10'
+          version: '1'
           arch: x64
       - uses: julia-actions/cache@v2
       - name: Benchmark

.github/workflows/reference_tests.yml

@@ -25,7 +25,7 @@ jobs:
       matrix:
         version:
           - '1.6'
-          - '1.10'
+          - '1'
         os:
           - ubuntu-20.04
         arch:
@@ -74,7 +74,7 @@ jobs:
       matrix:
         version:
           - '1.6'
-          - '1.10'
+          - '1'
         os:
           - ubuntu-20.04
         arch:
@@ -124,7 +124,7 @@ jobs:
       matrix:
         version:
           - '1.6'
-          - '1.10'
+          - '1'
         os:
           - ubuntu-20.04
         arch:
@@ -172,15 +172,15 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: ReferenceImages_WGLMakie_1.10
+          name: ReferenceImages_WGLMakie_1
           path: ./ReferenceImages/WGLMakie
       - uses: actions/download-artifact@v4
         with:
-          name: ReferenceImages_CairoMakie_1.10
+          name: ReferenceImages_CairoMakie_1
           path: ./ReferenceImages/CairoMakie
       - uses: actions/download-artifact@v4
         with:
-          name: ReferenceImages_GLMakie_1.10
+          name: ReferenceImages_GLMakie_1
           path: ./ReferenceImages/GLMakie
       - name: Consolidate reference image folders
         run: |

.github/workflows/rprmakie.yaml

@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.10'
+          - '1'
         os:
           - ubuntu-20.04
         arch:

CHANGELOG.md

@@ -5,6 +5,8 @@
 - Changed image, heatmap and surface picking indices to correctly index the relevant matrix arguments. [#4459](https://github.com/MakieOrg/Makie.jl/pull/4459)
 - Improved performance of `record` by avoiding unnecessary copying in common cases [#4475](https://github.com/MakieOrg/Makie.jl/pull/4475).
 - Fix usage of `AggMean()` and other aggregations operating on 3d data for `datashader` [#4346](https://github.com/MakieOrg/Makie.jl/pull/4346).
+- Changed default for `circular_rotation` in Camera3D to false, so that the camera doesn't change rotation direction anymore [4492](https://github.com/MakieOrg/Makie.jl/pull/4492)
+- Fixed `pick(scene, rect2)` in WGLMakie [#4488](https://github.com/MakieOrg/Makie.jl/pull/4488)
 
 ## [0.21.14] - 2024-10-11
 

CairoMakie/test/runtests.jl

@@ -184,7 +184,8 @@ excludes = Set([
     "Textured meshscatter", # not yet implemented
     "Voxel - texture mapping", # not yet implemented
     "Miter Joints for line rendering", # CairoMakie does not show overlap here
-    "Scatter with FastPixel" # almost works, but scatter + markerspace=:data seems broken for 3D
+    "Scatter with FastPixel", # almost works, but scatter + markerspace=:data seems broken for 3D
+    "picking", # Not implemented
 ])
 
 functions = [:volume, :volume!, :uv_mesh]

GLMakie/src/picking.jl

@@ -14,7 +14,7 @@ function pick_native(screen::Screen, rect::Rect2i)
     rw, rh = widths(rect)
     w, h = size(screen.root_scene)
     ppu = screen.px_per_unit[]
-    if rx > 0 && ry > 0 && rx + rw <= w && ry + rh <= h
+    if rx >= 0 && ry >= 0 && rx + rw <= w && ry + rh <= h
         rx, ry, rw, rh = round.(Int, ppu .* (rx, ry, rw, rh))
         sid = zeros(SelectionID{UInt32}, rw, rh)
         glReadPixels(rx, ry, rw, rh, buff.format, buff.pixeltype, sid)

GLMakie/test/runtests.jl

@@ -25,7 +25,6 @@ end
 
 # run the unit test suite
 include("unit_tests.jl")
-include("picking.jl")
 
 @testset "Reference Tests" begin
     @testset "refimages" begin