improve Sphere test coverage

Author: ffreyer

src/primitives/spheres.jl

@@ -36,10 +36,9 @@ function Base.in(x::Point, c::HyperSphere)
     return norm(origin(c) - x) ≤ radius(c)
 end
 
-centered(S::Type{HyperSphere{N,T}}) where {N,T} = S(Vec{N,T}(0), T(0.5))
-function centered(::Type{T}) where {T<:HyperSphere}
-    return centered(HyperSphere{ndims_or(T, 3),eltype_or(T, Float32)})
-end
+centered(S::Type{HyperSphere{N,T}}) where {N,T} = S(Point{N,T}(0), T(0.5))
+centered(S::Type{<: HyperSphere{N}}) where {N} = S(Point{N,Float32}(0), 0.5f0)
+centered(S::Type{<: HyperSphere}) = S(Point3f(0), 0.5f0)
 
 function coordinates(s::Circle, nvertices=64)
     r = radius(s); o = origin(s)
@@ -52,7 +51,7 @@ function texturecoordinates(::Circle, nvertices=64)
     return coordinates(Circle(Point2f(0.5), 0.5f0), nvertices)
 end
 
-# TODO: Consider generating meshes for circles with a point in the center so 
+# TODO: Consider generating meshes for circles with a point in the center so
 #       that the triangles are more regular
 # function faces(::Circle, nvertices=64)
 #     return [GLTriangleFace(nvertices+1, i, mod1(i+1, nvertices)) for i in 1:nvertices]

test/geometrytypes.jl

@@ -317,12 +317,39 @@ end
     face_target = TriangleFace{Int}[[1, 2, 5], [1, 5, 4], [2, 3, 6], [2, 6, 5], [4, 5, 8],
                                     [4, 8, 7], [5, 6, 9], [5, 9, 8]]
     @test f == face_target
+
+    uv = decompose_uv(Tesselation(sphere, 3))
+    uv_target = Vec{2, Float32}[[0.0, 1.0], [0.0, 0.5], [0.0, 0.0], [0.5, 1.0], [0.5, 0.5],
+                                [0.5, 0.0], [1.0, 1.0], [1.0, 0.5], [1.0, 0.0]]
+    @test uv == uv_target
+
+    @test minimum(sphere) == Point3f(-1)
+    @test maximum(sphere) == Point3f(1)
+    @test origin(sphere) == Point3f(0)
+    @test widths(sphere) == Vec3f(2)
+    @test radius(sphere) == 1f0
+    @test !(Point3f(1) in sphere)
+    @test Point3f(0.5) in sphere
+    @test centered(HyperSphere) == Sphere(Point3f(0), 0.5f0)
+    @test centered(Sphere) == Sphere(Point3f(0), 0.5f0)
+    @test centered(Sphere{Float64}) == Sphere(Point3(0.0), 0.5)
+
     circle = Circle(Point2f(0), 1.0f0)
     points = decompose(Point2f, Tessellation(circle, 20))
     @test length(points) == 20
     tess_circle = Tessellation(circle, 32)
     mesh = triangle_mesh(tess_circle)
     @test decompose(Point2f, mesh) ≈ decompose(Point2f, tess_circle)
+
+    @test minimum(circle) == Point2f(-1)
+    @test maximum(circle) == Point2f(1)
+    @test origin(circle) == Point2f(0)
+    @test widths(circle) == Vec2f(2)
+    @test radius(circle) == 1f0
+    @test !(Point2f(-1) in circle)
+    @test Point2f(-0.5) in circle
+    @test centered(Circle) == Circle(Point2f(0), 0.5f0)
+    @test centered(Circle{Float64}) == Circle(Point2(0.0), 0.5)
 end
 
 @testset "Rectangles" begin