Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [Unreleased]

- Bring back interpolation attribute for surface [#4056](https://github.com/MakieOrg/Makie.jl/pull/4056).
- Improved accuracy of framerate settings in GLMakie [#3954](https://github.com/MakieOrg/Makie.jl/pull/3954)
- Fix label_formatter being called twice in barplot [#4046](https://github.com/MakieOrg/Makie.jl/pull/4046).
- Fix error with automatic `highclip` or `lowclip` and scalar colors [#4048](https://github.com/MakieOrg/Makie.jl/pull/4048).
Expand Down
8 changes: 5 additions & 3 deletions MakieCore/src/basic_plots.jl
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,8 @@ Plots a surface, where `(x, y)` define a grid whose heights are the entries in `
color = nothing
"Inverts the normals generated for the surface. This can be useful to illuminate the other side of the surface."
invert_normals = false
"[(W)GLMakie only] Specifies whether the surface matrix gets sampled with interpolation."
interpolate = true
mixin_generic_plot_attributes()...
mixin_shading_attributes()...
mixin_colormap_attributes()...
Expand All @@ -321,7 +323,7 @@ Creates a connected line plot for each element in `(x, y, z)`, `(x, y)` or `posi
Sets the dash pattern of the line. Options are `:solid` (equivalent to `nothing`), `:dot`, `:dash`, `:dashdot` and `:dashdotdot`.
These can also be given in a tuple with a gap style modifier, either `:normal`, `:dense` or `:loose`.
For example, `(:dot, :loose)` or `(:dashdot, :dense)`.

For custom patterns have a look at [`Makie.Linestyle`](@ref).
"""
linestyle = nothing
Expand Down Expand Up @@ -362,7 +364,7 @@ Plots a line for each pair of points in `(x, y, z)`, `(x, y)`, or `positions`.
Sets the dash pattern of the line. Options are `:solid` (equivalent to `nothing`), `:dot`, `:dash`, `:dashdot` and `:dashdotdot`.
These can also be given in a tuple with a gap style modifier, either `:normal`, `:dense` or `:loose`.
For example, `(:dot, :loose)` or `(:dashdot, :dense)`.

For custom patterns have a look at [`Makie.Linestyle`](@ref).
"""
linestyle = nothing
Expand Down Expand Up @@ -617,7 +619,7 @@ Plots polygons, which are defined by
Sets the dash pattern of the line. Options are `:solid` (equivalent to `nothing`), `:dot`, `:dash`, `:dashdot` and `:dashdotdot`.
These can also be given in a tuple with a gap style modifier, either `:normal`, `:dense` or `:loose`.
For example, `(:dot, :loose)` or `(:dashdot, :dense)`.

For custom patterns have a look at [`Makie.Linestyle`](@ref).
"""
linestyle = nothing
Expand Down
6 changes: 6 additions & 0 deletions ReferenceTests/src/tests/examples3d.jl
Original file line number Diff line number Diff line change
Expand Up @@ -623,3 +623,9 @@ end
@reference_test "Heatmap 3D" begin
heatmap(-2..2, -1..1, RNG.rand(100, 100); axis = (; type = LScene))
end

@reference_test "Surface interpolate attribute" begin
f, ls1, pl = surface(Makie.peaks(20); interpolate=true, axis=(; show_axis=false))
ls2, pl = surface(f[1, 2], Makie.peaks(20); interpolate=false, axis=(; show_axis=false))
f
end