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.

Sign up for GitHub

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

Jump to bottom

WGLMakie relocatability #4467

Merged
merged 8 commits into from
Oct 11, 2024
Merged

WGLMakie relocatability #4467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3bbafa
clean up shader loading
SimonDanisch Oct 9, 2024
3f0bb99
dont empty after precompile
SimonDanisch Oct 9, 2024
fac5a8b
try better relocatability test
SimonDanisch Oct 9, 2024
fe28352
1.11 doesn't work yet
SimonDanisch Oct 9, 2024
6be105c
add changelog entry
SimonDanisch Oct 9, 2024
1a7b0b9
use `@path` macro for relocatability
jkrumbiegel Oct 10, 2024
6293c1c
Merge branch 'master' into jk/relocatable-wglmakie
jkrumbiegel Oct 11, 2024
018cfb6
add changelog entry
jkrumbiegel Oct 11, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## [Unreleased]

- Fix relocatability of GLMakie [#4461](https://github.com/MakieOrg/Makie.jl/pull/4461).
- Fix relocatability of WGLMakie [#4467](https://github.com/MakieOrg/Makie.jl/pull/4467).

## [0.21.13] - 2024-10-07

Expand Down
2 changes: 1 addition & 1 deletion WGLMakie/src/picking.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ struct ToolTip
end
end

const POPUP_CSS = Bonito.Asset(joinpath(@__DIR__, "popup.css"))
const POPUP_CSS = Bonito.Asset(@path joinpath(@__DIR__, "popup.css"))

function Bonito.jsrender(session::Session, tt::ToolTip)
scene = tt.scene
Expand Down
3 changes: 2 additions & 1 deletion WGLMakie/src/serialization.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ function flatten_buffer(array::AbstractArray{T}) where {T}
return flatten_buffer(collect(reinterpret(eltype(T), array)))
end

lasset(paths...) = read(joinpath(@__DIR__, "..", "assets", paths...), String)
const ASSETS_DIR = @path joinpath(@__DIR__, "..", "assets")
lasset(paths...) = read(joinpath(ASSETS_DIR, paths...), String)

isscalar(x::StaticVector) = true
isscalar(x::Mat) = true
Expand Down
Loading