diff --git a/CHANGELOG.md b/CHANGELOG.md index 05384f15cd0..a3e4de0309d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -169,7 +169,7 @@ - `boundingbox` overwrites must now include a secondary space argument to work `boundingbox(plot, space::Symbol = :data)` [#3723](https://github.com/MakieOrg/Makie.jl/pull/3723) - `boundingbox` now always consider `transform_func` and `model` - `data_limits(::Scatter)` and `boundingbox(::Scatter)` now consider marker transformations [#3716](https://github.com/MakieOrg/Makie.jl/pull/3716) -- **Breaking** Improved Float64 compatability of Axis [#3681](https://github.com/MakieOrg/Makie.jl/pull/3681) +- **Breaking** Improved Float64 compatibility of Axis [#3681](https://github.com/MakieOrg/Makie.jl/pull/3681) - This added an extra conversion step which only takes effect when Float32 precision becomes relevant. In those cases code using `project()` functions will be wrong as the transformation is not applied. Use `project(plot_or_scene, ...)` or apply the conversion yourself beforehand with `Makie.f32_convert(plot_or_scene, transformed_point)` and use `patched_model = Makie.patch_model(plot_or_scene, model)`. - `Makie.to_world(point, matrix, resolution)` has been deprecated in favor of `Makie.to_world(scene_or_plot, point)` to include float32 conversions. - **Breaking** Reworked line shaders in GLMakie and WGLMakie [#3558](https://github.com/MakieOrg/Makie.jl/pull/3558) @@ -230,7 +230,7 @@ ## [0.20.7] - 2024-02-04 - Equalized alignment point of mirrored ticks to that of normal ticks [#3598](https://github.com/MakieOrg/Makie.jl/pull/3598). -- Fixed stack overflow error on conversion of gridlike data with missings [#3597](https://github.com/MakieOrg/Makie.jl/pull/3597). +- Fixed stack overflow error on conversion of gridlike data with `missing`s [#3597](https://github.com/MakieOrg/Makie.jl/pull/3597). - Fixed mutation of CairoMakie src dir when displaying png files [#3588](https://github.com/MakieOrg/Makie.jl/pull/3588). - Added better error messages for plotting into `FigureAxisPlot` and `AxisPlot` as Plots.jl users are likely to do [#3596](https://github.com/MakieOrg/Makie.jl/pull/3596). - Added compat bounds for IntervalArithmetic.jl due to bug with DelaunayTriangulation.jl [#3595](https://github.com/MakieOrg/Makie.jl/pull/3595). @@ -246,7 +246,7 @@ - Use plot plot instead of scene transform functions in CairoMakie, fixing missplaced h/vspan. [#3552](https://github.com/MakieOrg/Makie.jl/pull/3552) - Fix error printing on shader error [#3530](https://github.com/MakieOrg/Makie.jl/pull/3530). - Update pagefind to 1.0.4 for better headline search [#3534](https://github.com/MakieOrg/Makie.jl/pull/3534). -- Remove unecessary deps, e.g. Setfield [3546](https://github.com/MakieOrg/Makie.jl/pull/3546). +- Remove unnecessary deps, e.g. Setfield [3546](https://github.com/MakieOrg/Makie.jl/pull/3546). - Don't clear args, rely on delete deregister_callbacks [#3543](https://github.com/MakieOrg/Makie.jl/pull/3543). - Add interpolate keyword for Surface [#3541](https://github.com/MakieOrg/Makie.jl/pull/3541). - Fix a DataInspector bug if inspector_label is used with RGB images [#3468](https://github.com/MakieOrg/Makie.jl/pull/3468). @@ -591,7 +591,7 @@ role as `datalimits` in `violin` [#2137](https://github.com/MakieOrg/Makie.jl/pu - **Breaking** Cleaned up `Scene` type [#1192](https://github.com/MakieOrg/Makie.jl/pull/1192), [#1393](https://github.com/MakieOrg/Makie.jl/pull/1393). The `Scene()` constructor doesn't create any axes or limits anymore. All keywords like `raw`, `show_axis` have been removed. A scene now always works like it did when using the deprecated `raw=true`. All the high level functionality like showing an axis and adding a 3d camera has been moved to `LScene`. See the new `Scene` tutorial for more info: https://docs.makie.org/dev/tutorials/scenes/. - **Breaking** Lights got moved to `Scene`, see the [lighting docs](https://docs.makie.org/stable/documentation/lighting) and [RPRMakie examples](https://docs.makie.org/stable/documentation/backends/rprmakie/). - Added ECDF plot [#1310](https://github.com/MakieOrg/Makie.jl/pull/1310). -- Added Order Independent Transparency to GLMakie [#1418](https://github.com/MakieOrg/Makie.jl/pull/1418), [#1506](https://github.com/MakieOrg/Makie.jl/pull/1506). This type of transparency is now used with `transpareny = true`. The old transparency handling is available with `transparency = false`. +- Added Order Independent Transparency to GLMakie [#1418](https://github.com/MakieOrg/Makie.jl/pull/1418), [#1506](https://github.com/MakieOrg/Makie.jl/pull/1506). This type of transparency is now used with `transparency = true`. The old transparency handling is available with `transparency = false`. - Fixed blurry text in GLMakie and WGLMakie [#1494](https://github.com/MakieOrg/Makie.jl/pull/1494). - Introduced a new experimental backend for ray tracing: [RPRMakie](https://docs.makie.org/stable/documentation/backends/rprmakie/). - Added the `Cycled` type, which can be used to select the i-th value from the current cycler for a specific attribute [#1248](https://github.com/MakieOrg/Makie.jl/pull/1248). diff --git a/CairoMakie/src/infrastructure.jl b/CairoMakie/src/infrastructure.jl index 0f70934682b..4dc5d4deba9 100644 --- a/CairoMakie/src/infrastructure.jl +++ b/CairoMakie/src/infrastructure.jl @@ -154,7 +154,7 @@ end function draw_plot_as_image(scene::Scene, screen::Screen{RT}, primitive::Plot, scale::Number = 1) where RT # you can provide `p.rasterize = scale::Int` or `p.rasterize = true`, both of which are numbers - # Extract scene width in device indepentent units + # Extract scene width in device independent units w, h = size(scene) # Create a new Screen which renders directly to an image surface, # specifically for the plot's parent scene. diff --git a/CairoMakie/src/primitives.jl b/CairoMakie/src/primitives.jl index 795359670ca..4cf37ea8b7c 100644 --- a/CairoMakie/src/primitives.jl +++ b/CairoMakie/src/primitives.jl @@ -928,7 +928,7 @@ end function draw_mesh2D(screen, per_face_cols, vs::Vector{<: Point2}, fs::Vector{GLTriangleFace}) ctx = screen.context - # Priorize colors of the mesh if present + # Prioritize colors of the mesh if present # This is a hack, which needs cleaning up in the Mesh plot type! for (f, (c1, c2, c3)) in zip(fs, per_face_cols) @@ -984,7 +984,7 @@ function draw_mesh3D( meshuvs = map(uv -> uv_transform * to_ndim(Vec3f, uv, 1), meshuvs) end - # Priorize colors of the mesh if present + # Prioritize colors of the mesh if present color = hasproperty(mesh, :color) ? mesh.color : to_value(attributes.calculated_colors) per_face_col = per_face_colors(color, matcap, meshfaces, meshnormals, meshuvs) diff --git a/CairoMakie/test/svg_tests.jl b/CairoMakie/test/svg_tests.jl index da30bba0948..8d7f4239437 100644 --- a/CairoMakie/test/svg_tests.jl +++ b/CairoMakie/test/svg_tests.jl @@ -61,7 +61,7 @@ end @test svg_isnt_rasterized(poly(MultiPolyWrapper([poly1, poly1]); color=[:red, :blue])) end -@testset "reproducable svg ids" begin +@testset "reproducible svg ids" begin # https://github.com/MakieOrg/Makie.jl/issues/2406 f, ax, sc = scatter(1:10) save("test1.svg", f) diff --git a/GLMakie/src/GLAbstraction/AbstractGPUArray.jl b/GLMakie/src/GLAbstraction/AbstractGPUArray.jl index 2241931b7f4..edfba611746 100644 --- a/GLMakie/src/GLAbstraction/AbstractGPUArray.jl +++ b/GLMakie/src/GLAbstraction/AbstractGPUArray.jl @@ -192,7 +192,7 @@ max_dim(t) = error("max_dim not implemented for: $(typeof(t)). This happen function (::Type{GPUArrayType})(data::Observable; kw...) where GPUArrayType <: GPUArray gpu_mem = GPUArrayType(data[]; kw...) - # TODO merge these and handle update tracking during contruction + # TODO merge these and handle update tracking during construction obs2 = on(new_data -> update!(gpu_mem, new_data), data) if GPUArrayType <: TextureBuffer push!(gpu_mem.buffer.observers, obs2) diff --git a/GLMakie/src/GLAbstraction/GLAbstraction.jl b/GLMakie/src/GLAbstraction/GLAbstraction.jl index e8c36de91c7..67c6843ed10 100644 --- a/GLMakie/src/GLAbstraction/GLAbstraction.jl +++ b/GLMakie/src/GLAbstraction/GLAbstraction.jl @@ -53,7 +53,7 @@ export update! # updates a gpu array with a Julia array export gpu_data # gets the data of a gpu array as a Julia Array export RenderObject # An object which holds all GPU handles and datastructes to ready for rendering by calling render(obj) -export prerender! # adds a function to a RenderObject, which gets executed befor setting the OpenGL render state +export prerender! # adds a function to a RenderObject, which gets executed before setting the OpenGL render state export postrender! # adds a function to a RenderObject, which gets executed after setting the OpenGL render states export extract_renderable export set_arg! diff --git a/GLMakie/src/GLAbstraction/GLRender.jl b/GLMakie/src/GLAbstraction/GLRender.jl index 146eeb6dd44..357ce23781b 100644 --- a/GLMakie/src/GLAbstraction/GLRender.jl +++ b/GLMakie/src/GLAbstraction/GLRender.jl @@ -160,7 +160,7 @@ function renderinstanced(vao::GLVertexArray{GLBuffer{T}}, amount::Integer, primi end """ -Renders `amount` instances of an not indexed geoemtry geometry +Renders `amount` instances of an not indexed geometry geometry """ function renderinstanced(vao::GLVertexArray, amount::Integer, primitive=GL_TRIANGLES) glDrawElementsInstanced(primitive, length(vao), GL_UNSIGNED_INT, C_NULL, amount) diff --git a/GLMakie/src/GLAbstraction/GLRenderObject.jl b/GLMakie/src/GLAbstraction/GLRenderObject.jl index fe644f5c586..c47b2479849 100644 --- a/GLMakie/src/GLAbstraction/GLRenderObject.jl +++ b/GLMakie/src/GLAbstraction/GLRenderObject.jl @@ -30,7 +30,7 @@ function (sp::StandardPrerender)() glDepthFunc(GL_LEQUAL) end - # Disable cullface for now, untill all rendering code is corrected! + # Disable cullface for now, until all rendering code is corrected! glDisable(GL_CULL_FACE) # glCullFace(GL_BACK) diff --git a/GLMakie/src/GLAbstraction/GLTexture.jl b/GLMakie/src/GLAbstraction/GLTexture.jl index 39d3cf3bb60..e0334e490f7 100644 --- a/GLMakie/src/GLAbstraction/GLTexture.jl +++ b/GLMakie/src/GLAbstraction/GLTexture.jl @@ -430,7 +430,7 @@ default_colorformat_sym(::Type{T}) where {T <: Colorant} = default_colorformat_s @generated function default_colorformat(::Type{T}) where T sym = default_colorformat_sym(T) if !isdefined(ModernGL, sym) - error("$T doesn't have a propper mapping to an OpenGL format") + error("$T doesn't have a proper mapping to an OpenGL format") end :($sym) end @@ -462,7 +462,7 @@ end @generated function default_internalcolorformat(::Type{T}) where T sym = default_internalcolorformat_sym(T) if !isdefined(ModernGL, sym) - error("$T doesn't have a propper mapping to an OpenGL format") + error("$T doesn't have a proper mapping to an OpenGL format") end :($sym) end diff --git a/GLMakie/src/GLAbstraction/GLTypes.jl b/GLMakie/src/GLAbstraction/GLTypes.jl index b9ce99f0167..b580152fcb9 100644 --- a/GLMakie/src/GLAbstraction/GLTypes.jl +++ b/GLMakie/src/GLAbstraction/GLTypes.jl @@ -401,7 +401,7 @@ function RenderObject( program = gl_convert(to_value(program), data) # "compile" lazyshader vertexarray = GLVertexArray(Dict(buffers), program) - # remove all uniforms not occuring in shader + # remove all uniforms not occurring in shader # ssao, instances transparency are special for rendering passes. TODO do this more cleanly special = Set([:ssao, :transparency, :instances, :fxaa, :num_clip_planes]) for k in setdiff(keys(data), keys(program.nametype)) diff --git a/GLMakie/src/GLAbstraction/GLUtils.jl b/GLMakie/src/GLAbstraction/GLUtils.jl index 4176bdc97b9..5fe35eda5c7 100644 --- a/GLMakie/src/GLAbstraction/GLUtils.jl +++ b/GLMakie/src/GLAbstraction/GLUtils.jl @@ -28,7 +28,7 @@ gen_defaults! dict begin a = 55 b = a * 2 # variables, like a, will get made visible in local scope c::JuliaType = X # `c` needs to be of type JuliaType. `c` will be made available with it's original type and then converted to JuliaType when inserted into `dict` - d = x => GLType # OpenGL convert target. Get's only applied if `x` is convertible to GLType. Will only be converted when passed to RenderObject + d = x => GLType # OpenGL convert target. Gets only applied if `x` is convertible to GLType. Will only be converted when passed to RenderObject d = x => \"doc string\" d = x => (GLType, \"doc string and gl target\") end @@ -39,12 +39,12 @@ macro gen_defaults!(dict, args) a = 55 b = a * 2 # variables, like a, will get made visible in local scope c::JuliaType = X # c needs to be of type JuliaType. c will be made available with it's original type and then converted to JuliaType when inserted into data - d = x => GLType # OpenGL convert target. Get's only applied if x is convertible to GLType. Will only be converted when passed to RenderObject + d = x => GLType # OpenGL convert target. Gets only applied if x is convertible to GLType. Will only be converted when passed to RenderObject end") tuple_list = args.args dictsym = gensym() return_expression = Expr(:block) - push!(return_expression.args, :($dictsym = $dict)) # dict could also be an expression, so we need to asign it to a variable at the beginning + push!(return_expression.args, :($dictsym = $dict)) # dict could also be an expression, so we need to assign it to a variable at the beginning push!(return_expression.args, :(gl_convert_targets = get!($dictsym, :gl_convert_targets, Dict{Symbol, Any}()))) # exceptions for glconvert. push!(return_expression.args, :(doc_strings = get!($dictsym, :doc_string, Dict{Symbol, Any}()))) # exceptions for glconvert. # @gen_defaults can be used multiple times, so we need to reuse gl_convert_targets if already in here diff --git a/GLMakie/src/glshaders/lines.jl b/GLMakie/src/glshaders/lines.jl index c4fa81d8cf8..9f29d47d8b7 100644 --- a/GLMakie/src/glshaders/lines.jl +++ b/GLMakie/src/glshaders/lines.jl @@ -1,5 +1,5 @@ function sumlengths(points, resolution) - # normalize w component if availabke + # normalize w component if available f(p::VecTypes{4}) = p[Vec(1, 2)] / p[4] f(p::VecTypes) = p[Vec(1, 2)] @@ -45,10 +45,10 @@ function generate_indices(positions) # if A != F (no loop): 0 A B C D E F 0 # where 0 is NaN # It marks vertices as invalid (0) if they are NaN, valid (1) if they - # are part of a continous line section, or as ghost edges (2) used to + # are part of a continuous line section, or as ghost edges (2) used to # cleanly close a loop. The shader detects successive vertices with # 1-2-0 and 0-2-1 validity to avoid drawing ghost segments (E-A from - # 0-E-A-B and F-B from E-F-B-0 which would dublicate E-F and A-B) + # 0-E-A-B and F-B from E-F-B-0 which would duplicate E-F and A-B) last_start_pos = eltype(ps)(NaN) last_start_idx = -1 @@ -60,7 +60,7 @@ function generate_indices(positions) if not_nan if last_start_idx == -1 # place nan before section of line vertices - # (or dublicate ps[1]) + # (or duplicate ps[1]) push!(indices, i-1) last_start_idx = length(indices) + 1 last_start_pos = p diff --git a/GLMakie/src/screen.jl b/GLMakie/src/screen.jl index 6188b400bd3..31bd584a089 100644 --- a/GLMakie/src/screen.jl +++ b/GLMakie/src/screen.jl @@ -571,7 +571,7 @@ function destroy!(rob::RenderObject) # but we do share the texture atlas, so we check v !== tex, since we can't just free shared resources # TODO, refcounting, or leaving freeing to GC... - # GC is a bit tricky with active contexts, so immediate free is prefered. + # GC is a bit tricky with active contexts, so immediate free is preferred. # I guess as long as we make it hard for users to share buffers directly, this should be fine! GLAbstraction.free(v) end @@ -978,7 +978,7 @@ function renderloop(screen) end if screen.close_after_renderloop try - @debug("Closing screen after quiting renderloop!") + @debug("Closing screen after quitting renderloop!") close(screen) catch e @warn "error closing screen" exception=(e, Base.catch_backtrace()) diff --git a/GLMakie/test/glmakie_refimages.jl b/GLMakie/test/glmakie_refimages.jl index d4e911474db..afc81dd8c17 100644 --- a/GLMakie/test/glmakie_refimages.jl +++ b/GLMakie/test/glmakie_refimages.jl @@ -10,7 +10,7 @@ using ReferenceTests.RNG # Directly access texture parameters: x = Sampler(fill(to_color(:yellow), 100, 100), minfilter=:nearest) scene = image(x) - # indexing will go straight to the GPU, while only transfering the changes + # indexing will go straight to the GPU, while only transferring the changes st = Stepper(scene) x[1:10, 1:50] .= to_color(:red) Makie.step!(st) diff --git a/GLMakie/test/unit_tests.jl b/GLMakie/test/unit_tests.jl index 6e08a85aba3..d62843af195 100644 --- a/GLMakie/test/unit_tests.jl +++ b/GLMakie/test/unit_tests.jl @@ -133,7 +133,7 @@ end end end -@testset "emtpy!(fig)" begin +@testset "empty!(fig)" begin GLMakie.closeall() fig = Figure() ax = Axis(fig[1,1]) diff --git a/MakieCore/src/conversion.jl b/MakieCore/src/conversion.jl index 16c450ffc17..09d91fd9f9b 100644 --- a/MakieCore/src/conversion.jl +++ b/MakieCore/src/conversion.jl @@ -139,7 +139,7 @@ to be overloaded for DimConversions, e.g. for CategoricalConversion: `has_typed_convert(plot_or_trait)` and `should_dim_convert(get_element_type(args))` are true. The former is defined as true by `@convert_target`, i.e. when `convert_arguments_typed` is defined for the given plot type or conversion trait. -The latter marks specific types as convertable. +The latter marks specific types as convertible. If a recipe wants to use dim conversions, it should overload this function: ```julia diff --git a/RPRMakie/src/meshes.jl b/RPRMakie/src/meshes.jl index d635d58a8f7..b77138d10f2 100644 --- a/RPRMakie/src/meshes.jl +++ b/RPRMakie/src/meshes.jl @@ -167,7 +167,7 @@ function to_rpr_object(context, matsys, scene, plot::Makie.Surface) positions = lift(grid, x, y, z, Makie.transform_func_obs(plot)) r = Tesselation(Rect2f((0, 0), (1, 1)), size(z[])) # decomposing a rectangle into uv and triangles is what we need to map the z coordinates on - # since the xyz data assumes the coordinates to have the same neighouring relations + # since the xyz data assumes the coordinates to have the same neighbouring relations # like a grid faces = decompose(GLTriangleFace, r) uv = decompose_uv(r) diff --git a/ReferenceTests/src/tests/categorical.jl b/ReferenceTests/src/tests/categorical.jl index bd2bd4865cb..4740ac2a4a4 100644 --- a/ReferenceTests/src/tests/categorical.jl +++ b/ReferenceTests/src/tests/categorical.jl @@ -11,7 +11,7 @@ using Makie: Categorical end @reference_test "different types without sorting function" begin - # If we set the ticks explicitely, with sortby defaulting to nothing, + # If we set the ticks explicitly, with sortby defaulting to nothing, # we can combine all objects: f = Figure() ax = Axis(f[1, 1]; @@ -42,7 +42,7 @@ end f end -@reference_test "new categories, inbetween old values" begin +@reference_test "new categories, in between old values" begin obs = Observable(Categorical(["a", "c", "e", "g"])) f, ax, p = scatter(1:4, obs, markersize=20, color=1:4, colormap=:viridis) obs[] = Categorical(["b", "d", "f", "h"]) diff --git a/ReferenceTests/src/tests/primitives.jl b/ReferenceTests/src/tests/primitives.jl index f13448dd51d..919e74e903b 100644 --- a/ReferenceTests/src/tests/primitives.jl +++ b/ReferenceTests/src/tests/primitives.jl @@ -573,7 +573,7 @@ end campixel!(scene) # marker is in front, so it should not be smaller than the background rectangle plot_row!(scene, 0, false) - # marker is in the background, so one shouldnt see a single pixel of the marker + # marker is in the background, so one shouldn't see a single pixel of the marker plot_row!(scene, 300, true) center = Point2f(size(scene) ./ 2) diff --git a/ReferenceUpdater/src/local_server.jl b/ReferenceUpdater/src/local_server.jl index 4496911129d..668af3fd6d9 100644 --- a/ReferenceUpdater/src/local_server.jl +++ b/ReferenceUpdater/src/local_server.jl @@ -276,7 +276,7 @@ function group_files(path, input_filename, output_filename) end end - # generate new structed file + # generate new structured file open(joinpath(path, output_filename), "w") do file for (filename, valid) in data println(file, diff --git a/ReferenceUpdater/src/reference_images.html b/ReferenceUpdater/src/reference_images.html index 29f4f69e309..61af9f3e80f 100644 --- a/ReferenceUpdater/src/reference_images.html +++ b/ReferenceUpdater/src/reference_images.html @@ -57,7 +57,7 @@