Skip to content

Commit 47e8fef

Browse files
authored
Merge pull request #62 from JuliaGeometry/sd/quads
fix quad element type conversion
2 parents 11b3572 + b1872b9 commit 47e8fef

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

src/geometry_primitives.jl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ end
99
##
1010
# conversion & decompose
1111
convert_simplex(::Type{T}, x::T) where T = (x,)
12+
13+
function convert_simplex(NFT::Type{NgonFace{N, T1}}, f::Union{NgonFace{N, T2}}) where {T1, T2, N}
14+
return (convert(NFT, f),)
15+
end
16+
17+
convert_simplex(NFT::Type{NgonFace{3,T}}, f::NgonFace{3,T2}) where {T, T2} = (convert(NFT, f),)
18+
1219
"""
1320
convert_simplex(::Type{Face{3}}, f::Face{N})
1421

test/runtests.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,12 @@ end
274274
@test meshuv isa GLUVMesh3D
275275
@test meshuvnormal isa GLNormalUVMesh3D
276276

277+
t = Tesselation(FRect2D(0, 0, 2, 2), (30, 30))
278+
m = GeometryBasics.mesh(t, pointtype=Point3f0, facetype=QuadFace{Int})
279+
m2 = GeometryBasics.mesh(m, facetype=QuadFace{GLIndex})
280+
@test GeometryBasics.faces(m2) isa Vector{QuadFace{GLIndex}}
281+
@test GeometryBasics.coordinates(m2) isa Vector{Point3f0}
282+
277283
end
278284

279285
@testset "Multi geometries" begin

0 commit comments

Comments
 (0)