tag v0.20.4 (#3529)

* add available_plotting_methods

* upp all versions, fix news

* fix camera clipping

* use accuratly scaled far

---------

Co-authored-by: ffreyer <[email protected]>

CairoMakie/Project.toml

@@ -1,7 +1,7 @@
 name = "CairoMakie"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 author = ["Simon Danisch <[email protected]>"]
-version = "0.11.4"
+version = "0.11.5"
 
 [deps]
 CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
@@ -24,7 +24,7 @@ FileIO = "1.1"
 FreeType = "3, 4.0"
 GeometryBasics = "0.4.1"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.20.3"
+Makie = "=0.20.4"
 PrecompileTools = "1.0"
 julia = "1.3"
 

GLMakie/Project.toml

@@ -1,6 +1,6 @@
 name = "GLMakie"
 uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
-version = "0.9.4"
+version = "0.9.5"
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
@@ -30,7 +30,7 @@ FreeTypeAbstraction = "0.10"
 GLFW = "3.3"
 GeometryBasics = "0.4.1"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.20.3"
+Makie = "=0.20.4"
 Markdown = "1.0, 1.6"
 MeshIO = "0.4"
 ModernGL = "1"

NEWS.md

@@ -2,8 +2,11 @@
 
 ## master
 
+## 0.20.4
+
 - Changes for Bonito rename and WGLMakie docs improvements [#3477](https://github.com/MakieOrg/Makie.jl/pull/3477).
-- Add stroke and glow support to scatter and text in WGLMakie [#3518](https://github.com/MakieOrg/Makie.jl/pull/3518)
+- Add stroke and glow support to scatter and text in WGLMakie [#3518](https://github.com/MakieOrg/Makie.jl/pull/3518).
+- Fix clipping issues with Camera3D when zooming in [#3529](https://github.com/MakieOrg/Makie.jl/pull/3529)
 
 ## 0.20.3
 

Project.toml

@@ -1,7 +1,7 @@
 name = "Makie"
 uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 authors = ["Simon Danisch", "Julius Krumbiegel"]
-version = "0.20.3"
+version = "0.20.4"
 
 [deps]
 Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"

RPRMakie/Project.toml

@@ -1,7 +1,7 @@
 name = "RPRMakie"
 uuid = "22d9f318-5e34-4b44-b769-6e3734a732a6"
 authors = ["Simon Danisch"]
-version = "0.6.3"
+version = "0.6.4"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -16,7 +16,7 @@ RadeonProRender = "27029320-176d-4a42-b57d-56729d2ad457"
 Colors = "0.9, 0.10, 0.11, 0.12"
 FileIO = "1.6"
 GeometryBasics = "0.4.1"
-Makie = "=0.20.3"
+Makie = "=0.20.4"
 RadeonProRender = "0.3.0"
 julia = "1.3"
 LinearAlgebra = "1.0, 1.6"

WGLMakie/Project.toml

@@ -1,7 +1,7 @@
 name = "WGLMakie"
 uuid = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
 authors = ["SimonDanisch <[email protected]>"]
-version = "0.9.3"
+version = "0.9.4"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -27,7 +27,7 @@ GeometryBasics = "0.4.1"
 Hyperscript = "0.0.3, 0.0.4, 0.0.5"
 Bonito = "3.0.0"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.20.3"
+Makie = "=0.20.4"
 Observables = "0.5.1"
 PNGFiles = "0.3, 0.4"
 PrecompileTools = "1.0"

src/Makie.jl

@@ -241,7 +241,6 @@ export Observable, Observable, lift, to_value, on, onany, @lift, off, connect!
 # utilities and macros
 export @recipe, @extract, @extractvalue, @key_str, @get_attribute
 export broadcast_foreach, to_vector, replace_automatic!
-
 # conversion infrastructure
 export @key_str, convert_attribute, convert_arguments
 export to_color, to_colormap, to_rotation, to_font, to_align, to_fontsize, categorical_colors, resample_cmap
@@ -295,14 +294,17 @@ export PlotSpec
 export plot!, plot
 export abline! # until deprecation removal
 
-
 export Stepper, replay_events, record_events, RecordEvents, record, VideoStream
 export VideoStream, recordframe!, record, Record
 export save, colorbuffer
 
 # colormap stuff from PlotUtils, and showgradients
 export cgrad, available_gradients, showgradients
 
+# other "available" functions
+export available_plotting_methods, available_marker_symbols
+
+
 export Pattern
 export ReversibleScale
 

src/camera/camera3d.jl

@@ -168,7 +168,7 @@ function Camera3D(scene::Scene; kwargs...)
         fixed_axis = true,
         cad = false,
         center = true,
-        clipping_mode = :adaptive
+        clipping_mode = :adaptive # TODO: use bbox to adjust near/far automatically
     )
 
     replace!(settings, :Camera3D, scene, overwrites)
@@ -728,7 +728,7 @@ function update_cam!(scene::Scene, cam::Camera3D)
         far = far_dist * far
     elseif cam.settings.clipping_mode[] === :adaptive
         view_dist = norm(eyeposition - lookat)
-        near = view_dist * near; far = max(1f0, view_dist) * far
+        near = view_dist * near; far = max(radius(bounding_sphere) / tand(0.5f0 * cam.fov[]), view_dist) * far
     elseif cam.settings.clipping_mode[] !== :static
         @error "clipping_mode = $(cam.settings.clipping_mode[]) not recognized, using :static."
     end
@@ -774,8 +774,8 @@ function update_cam!(scene::Scene, cam::Camera3D, area3d::Rect, recenter::Bool =
         cam.near[] = 0.1f0 * dist
         cam.far[] = 2f0 * dist
     elseif cam.settings.clipping_mode[] === :adaptive
-        cam.near[] = 0.1f0 * dist / norm(cam.eyeposition[] - cam.lookat[])
-        cam.far[] = 2.2f0 * dist / norm(cam.eyeposition[] - cam.lookat[])
+        cam.near[] = 0.1f0
+        cam.far[] = 2f0
     end
 
     update_cam!(scene, cam)

src/utilities/utilities.jl

@@ -454,3 +454,19 @@ function corners(rect::Rect3{T}) where T
     T0 = zero(T)
     return Point{3,T}[o .+ Vec3{T}(x, y, z) for x in (T0, w[1]) for y in (T0, w[2]) for z in (T0, w[3])]
 end
+
+"""
+    available_plotting_methods()
+
+Returns an array of all available plotting functions.
+"""
+function available_plotting_methods()
+    meths = []
+    for m1 in methods(Makie.default_theme)
+        params = m1.sig.parameters
+        if length(params) == 3 && params[3] isa UnionAll
+            push!(meths, Makie.plotfunc(params[3].var.ub))
+        end
+    end
+    return meths
+end