Skip to content

fix quad element type conversion #62

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

Merged
SimonDanisch merged 3 commits into from
Jun 11, 2020
Merged

fix quad element type conversion #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
388034d
fix quadconversion
SimonDanisch Jun 11, 2020
135c7e9
add tests
SimonDanisch Jun 11, 2020
b1872b9
qualify
SimonDanisch Jun 11, 2020
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
7 changes: 7 additions & 0 deletions src/geometry_primitives.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ end
##
# conversion & decompose
convert_simplex(::Type{T}, x::T) where T = (x,)

function convert_simplex(NFT::Type{NgonFace{N, T1}}, f::Union{NgonFace{N, T2}}) where {T1, T2, N}
return (convert(NFT, f),)
end

convert_simplex(NFT::Type{NgonFace{3,T}}, f::NgonFace{3,T2}) where {T, T2} = (convert(NFT, f),)

"""
convert_simplex(::Type{Face{3}}, f::Face{N})

Expand Down
6 changes: 6 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,12 @@ end
@test meshuv isa GLUVMesh3D
@test meshuvnormal isa GLNormalUVMesh3D

t = Tesselation(FRect2D(0, 0, 2, 2), (30, 30))
m = GeometryBasics.mesh(t, pointtype=Point3f0, facetype=QuadFace{Int})
m2 = GeometryBasics.mesh(m, facetype=QuadFace{GLIndex})
@test GeometryBasics.faces(m2) isa Vector{QuadFace{GLIndex}}
@test GeometryBasics.coordinates(m2) isa Vector{Point3f0}

end

@testset "Multi geometries" begin
Expand Down