Skip to content

Commit f86b0b3

Browse files
authored
Merge pull request #2 from JuliaGeometry/master
update branch
2 parents 1edb9e7 + 053ada8 commit f86b0b3

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "GeometryBasics"
22
uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
33
authors = ["SimonDanisch <[email protected]>"]
4-
version = "0.2.13"
4+
version = "0.2.14"
55

66
[deps]
77
IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"

src/interfaces.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function faces(f::AbstractVector{<:AbstractFace})
1818
return f
1919
end
2020

21-
function normals(primitive, nvertices=nothing)
21+
function normals(primitive, nvertices=nothing; kw...)
2222
# doesn't have any specific algorithm to generate normals
2323
# so will be generated from faces + positions
2424
# which we indicate by returning nothing!
@@ -27,7 +27,7 @@ function normals(primitive, nvertices=nothing)
2727
return nothing
2828
end
2929

30-
function faces(primitive, nvertices=nothing)
30+
function faces(primitive, nvertices=nothing; kw...)
3131
# doesn't have any specific algorithm to generate faces
3232
# so will try to triangulate the coordinates!
3333
return nothing

test/runtests.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,11 @@ end
374374
@test coordinates(m) === points
375375
end
376376

377-
377+
@testset "convert mesh + meta" begin
378+
m = uv_normal_mesh(Circle(Point2f0(0), 1f0))
379+
# for 2D primitives we dont actually calculate normals
380+
@test !hasproperty(m, :normals)
381+
end
378382

379383
@testset "convert mesh + meta" begin
380384
m = uv_normal_mesh(FRect3D(Vec3f0(-1), Vec3f0(1, 2, 3)))

0 commit comments

Comments
 (0)