Skip to content

Commit a839631

Browse files
Updated Makie and GeometryBasics to latest, fixed related test
1 parent 14f1b10 commit a839631

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ BSplineKit = "0.18"
2323
DataStructures = "0.18.16"
2424
DelaunayTriangulation = "1.6.3"
2525
Distances = "0.10"
26-
GLMakie = "0.11.3"
27-
GeometryBasics = "0.5.6"
26+
GLMakie = "0.13.4"
27+
GeometryBasics = "0.5.10"
2828
LinearAlgebra = "1.10.7, 1.11.0"
2929
MarchingCubes = "0.1.11"
3030
QuadGK = "2.9"

test/runtests.jl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3491,7 +3491,6 @@ end
34913491

34923492

34933493
@testset "dirplot" verbose = true begin
3494-
34953494
F,V = cube(1.0)
34963495
U = vertexnormal(F,V)
34973496

@@ -3502,7 +3501,7 @@ end
35023501
hp2 = dirplot(ax,V,U; color=:black,linewidth=3,scaleval=1.0,style=:to)
35033502
hp3 = dirplot(ax,V,U; color=:black,linewidth=3,scaleval=1.0,style=:through)
35043503

3505-
Mp = hp1[1].val
3504+
Mp = hp1[1][]
35063505

35073506
@testset "Errors" begin
35083507
@test_throws ArgumentError dirplot(ax,V,U; color=:black,linewidth=3,scaleval=1.0,style=:wrong)
@@ -3549,17 +3548,17 @@ end
35493548

35503549
@testset "type_flag options" begin
35513550
hp1 = normalplot(ax,F,V; type_flag=:face, color=:black,linewidth=3,scaleval=nothing)
3552-
Mp = hp1[1].val
3551+
Mp = hp1[1][]
35533552
@test typeof(hp1) == Wireframe{Tuple{GeometryBasics.Mesh{3, Float64, LineFace{Int64}, (:position,), Tuple{Vector{Point{3, Float64}}}, Vector{LineFace{Int64}}}}}
35543553
@test length(faces(Mp)) == length(F)
35553554

35563555
hp1 = normalplot(ax,F,V; type_flag=:vertex, color=:black,linewidth=3,scaleval=nothing)
3557-
Mp = hp1[1].val
3556+
Mp = hp1[1][]
35583557
@test typeof(hp1) == Wireframe{Tuple{GeometryBasics.Mesh{3, Float64, LineFace{Int64}, (:position,), Tuple{Vector{Point{3, Float64}}}, Vector{LineFace{Int64}}}}}
35593558
@test length(faces(Mp)) == length(V)
35603559

35613560
hp1 = normalplot(ax,F,V; type_flag=:vertex, color=:black,linewidth=3,scaleval=nothing)
3562-
Mp = hp1[1].val
3561+
Mp = hp1[1][]
35633562
@test typeof(hp1) == Wireframe{Tuple{GeometryBasics.Mesh{3, Float64, LineFace{Int64}, (:position,), Tuple{Vector{Point{3, Float64}}}, Vector{LineFace{Int64}}}}}
35643563
@test length(faces(Mp)) == length(V)
35653564

@@ -3569,12 +3568,12 @@ end
35693568
V = [Point{3,Float64}(v) for v in coordinates(Mn)]
35703569

35713570
hp1 = normalplot(ax,F,V; type_flag=:vertex, color=:black,linewidth=3,scaleval=nothing)
3572-
Mp = hp1[1].val
3571+
Mp = hp1[1][]
35733572
@test typeof(hp1) == Wireframe{Tuple{GeometryBasics.Mesh{3, Float64, LineFace{Int64}, (:position,), Tuple{Vector{Point{3, Float64}}}, Vector{LineFace{Int64}}}}}
35743573
@test length(faces(Mp)) == length(V)
35753574

35763575
hp1 = normalplot(ax,Mn; type_flag=:face)
3577-
Mp = hp1[1].val
3576+
Mp = hp1[1][]
35783577
@test typeof(hp1) == Wireframe{Tuple{GeometryBasics.Mesh{3, Float32, LineFace{Int64}, (:position,), Tuple{Vector{Point{3, Float32}}}, Vector{LineFace{Int64}}}}}
35793578
@test length(faces(Mp)) == length(F)
35803579
end
@@ -7775,7 +7774,6 @@ end
77757774
end
77767775

77777776
@testset "meshdual" verbose = true begin
7778-
77797777
@testset "single face n-gon" verbose = true begin
77807778
for n = 3:6
77817779
V = circlepoints(1.0,n; dir=:acw)

0 commit comments

Comments
 (0)