Merge pull request #166 from JuliaGeometry/sd-refactor

add Polygons + do long standing refactors

Author: SimonDanisch

src/GeometryTypes.jl

@@ -4,7 +4,8 @@ using StaticArrays
 using ColorTypes
 using LinearAlgebra
 
-import FixedPointNumbers # U8
+import FixedPointNumbers
+using FixedPointNumbers: N0f8
 
 import Base: ==,
              *,
@@ -25,43 +26,34 @@ import Base: ==,
              size,
              split,
              union,
-             unique
+             unique,
+             iterate,
+             eltype
 
 include("FixedSizeArrays.jl")
 using .FixedSizeArrays
 
 include("types.jl")
-include("typeutils.jl")
+include("utils.jl")
 include("typealias.jl")
-include("baseutils.jl")
-include("linalgutils.jl")
 include("simplices.jl")
-include("algorithms.jl")
 include("faces.jl")
 include("hyperrectangles.jl")
 include("hypersphere.jl")
 include("hypercube.jl")
-include("relations.jl")
-include("operations.jl")
 include("meshes.jl")
-include("primitives.jl")
 include("distancefields.jl")
-include("setops.jl")
-include("display.jl")
-include("slice.jl")
 include("decompose.jl")
-include("deprecated.jl")
-include("center.jl")
 include("convexhulls.jl")
 include("gjk.jl")
-include("polygons.jl")
+include("polygon.jl")
+include("polygon_triangulations.jl")
 include("lines.jl")
 include("cylinder.jl")
 
 export AABB,
        AbstractFlexibleGeometry,
        AbstractGeometry,
-       AbsoluteRectangle,
        AbstractMesh,
        AbstractSimplex,
        AbstractDistanceField,
@@ -100,6 +92,7 @@ export AABB,
        HyperCube,
        HyperSphere,
        intersects,
+       isinside,
        LineSegment,
        Mat,
        Mesh2D,
@@ -190,6 +183,15 @@ export AABB,
        OffsetInteger,
        ZeroIndex,
        OneIndex,
-       GLIndex
+       GLIndex,
+       Rect,
+       Rect2D,
+       Rect3D,
+       IRect,
+       IRect2D,
+       IRect3D,
+       FRect,
+       FRect2D,
+       FRect3D
 
 end # module

src/algorithms.jl

@@ -71,3 +71,16 @@ Base.convert(::Type{F}, c::HyperCube) where {F <: AFG} = F(c)
 function Base.isapprox(s1::AbstractConvexHull, s2::AbstractConvexHull;kw...)
     isapprox(vertexmat(s1), vertexmat(s2); kw...)
 end
+
+
+# could add an @symmetric macro, which defines min_euclidean(pt, s) from
+# min_euclidean(s, pt) automatically etc.
+@inline min_euclidean(pt1::Vec, pt2::Vec) = norm(pt1-pt2)
+min_euclidean(pt::Vec, s::Simplex) = √(sqdist(pt, s))
+min_euclidean(s::Simplex, pt::Vec) = min_euclidean(pt, s)
+min_euclidean(r1::HyperRectangle, r2::Vec) = sqrt(min_euclideansq(r1, r2))
+min_euclidean(r1::Vec, r2::HyperRectangle) = sqrt(min_euclideansq(r1, r2))
+min_euclidean(r1::HyperRectangle, r2::HyperRectangle) = sqrt(min_euclideansq(r1, r2))
+min_euclidean(c1::AbstractConvexHull, pt::Vec) = gjk(c1,pt)
+min_euclidean(pt::Vec, c2::AbstractConvexHull) = gjk(pt,c2)
+min_euclidean(c1::AbstractConvexHull, c2::AbstractConvexHull) = gjk(c1,c2)

src/center.jl

@@ -428,6 +428,7 @@ function decompose(::Type{FT}, c::Cylinder{2}, resolution = (2, 2)) where FT <:
     r = SimpleRectangle(c.origin[1] - c.r/2, c.origin[2], c.r, height(c))
     return decompose(FT, r, resolution)
 end
+
 function decompose(::Type{FT}, c::Cylinder{3}, facets = 30) where FT <: Face
     isodd(facets) ? facets = 2 * div(facets, 2) : nothing
     facets < 8 ? facets = 8 : nothing; nbv = Int(facets / 2)

src/convexhulls.jl

@@ -3,3 +3,7 @@ width(prim::HyperCube)  = prim.width
 widths(prim::HyperCube{N,T}) where {N,T} = Vec{N,T}(prim.width)
 maximum(prim::HyperCube{N,T}) where {N,T} = origin(prim)+widths(prim)
 minimum(prim::HyperCube{N,T}) where {N,T} = origin(prim)
+centered(C::Type{HyperCube{N,T}}) where {N,T} = C(Vec{N,T}(-0.5), T(1))
+function centered(::Type{T}) where T <: HyperCube
+    centered(HyperCube{ndims_or(T, 3), eltype_or(T, Float32)})
+end