Merge branch 'master' into sd/simple-mesh

Author: SimonDanisch

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [SimonDanisch]
+patreon: # Replace with a single Patreon username
+open_collective: simon-danisch
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/RegisterAction.yml

@@ -5,7 +5,6 @@ on:
       version:
         description: Version to register or component to bump
         required: true
-        
 jobs:
   register:
     runs-on: ubuntu-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "GeometryBasics"
 uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 authors = ["SimonDanisch <[email protected]>"]
-version = "0.4.9"
+version = "0.4.11"
 
 [deps]
 EarCut_jll = "5ae413db-bbd1-5e63-b57d-d24a61df00f5"
@@ -12,10 +12,15 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 
 [compat]
+Aqua = "0.8"
 EarCut_jll = "2"
 Extents = "0.1"
 GeoInterface = "1.0.1"
+GeoJSON = "0.7, 0.8"
 IterTools = "1.3.0"
+LinearAlgebra = "<0.0.1,1"
+OffsetArrays = "1"
+Random = "<0.0.1,1"
 julia = "1.6"
 
 [extras]

docs/src/index.md

@@ -106,3 +106,40 @@ Use `GeometryBasics.mesh` to get a mesh directly from a geometry:
 ```@repl quickstart
 mesh = GeometryBasics.mesh(rect)
 ```
+
+
+## Aliases
+
+GeometryBasics exports common aliases for Point, Vec, Mat and Rect:
+
+### Vec
+
+|        |`T`(eltype) |`Float64` |`Float32` |`Int`     |`UInt`    |
+|--------|------------|----------|----------|----------|----------|
+|`N`(dim)|`Vec{N,T}`  |`Vecd{N}` |`Vecf{N}` |`Veci{N}` |`Vecui{N}`|
+|`2`     |`Vec2{T}`   |`Vec2d`   |`Vec2f`   |`Vec2i`   |`Vec2ui`  |
+|`3`     |`Vec3{T}`   |`Vec3d`   |`Vec3f`   |`Vec3i`   |`Vec3ui`  |
+
+### Point
+
+|        |`T`(eltype) |`Float64` |`Float32` |`Int`     |`UInt`    |
+|--------|------------|----------|----------|----------|----------|
+|`N`(dim)|`Point{N,T}`|`Pointd{N}`|`Pointf{N}`|`Pointi{N}`|`Pointui{N}`|
+|`2`     |`Point2{T}` |`Point2d` |`Point2f` |`Point2i` |`Point2ui`|
+|`3`     |`Point3{T}` |`Point3d` |`Point3f` |`Point3i` |`Point3ui`|
+
+### Mat
+
+|        |`T`(eltype) |`Float64` |`Float32` |`Int`     |`UInt`    |
+|--------|------------|----------|----------|----------|----------|
+|`N`(dim)|`Mat{N,T}`  |`Matd{N}` |`Matf{N}` |`Mati{N}` |`Matui{N}`|
+|`2`     |`Mat2{T}`   |`Mat2d`   |`Mat2f`   |`Mat2i`   |`Mat2ui`  |
+|`3`     |`Mat3{T}`   |`Mat3d`   |`Mat3f`   |`Mat3i`   |`Mat3ui`  |
+
+### Rect
+
+|        |`T`(eltype) |`Float64` |`Float32` |`Int`     |`UInt`    |
+|--------|------------|----------|----------|----------|----------|
+|`N`(dim)|`Rect{N,T}` |`Rectd{N}`|`Rectf{N}`|`Recti{N}`|`Rectui{N}`|
+|`2`     |`Rect2{T}`  |`Rect2d`  |`Rect2f`  |`Rect2i`  |`Rect2ui` |
+|`3`     |`Rect3{T}`  |`Rect3d`  |`Rect3f`  |`Rect3i`  |`Rect3ui` |

docs/src/meshes.md

@@ -19,6 +19,6 @@ The following functions can be called on an [`AbstractMesh`](@ref) to access its
 
 * [`faces`](@ref)
 * [`coordinates`](@ref)
-* [`texturecoordinates`](@ref)
+* `texturecoordinates`
 * [`normals`](@ref)
 

src/GeometryBasics.jl

@@ -57,7 +57,7 @@ export uv_mesh, normal_mesh, uv_normal_mesh
 export height, origin, radius, width, widths
 export HyperSphere, Circle, Sphere
 export Cylinder, Cylinder2, Cylinder3, Pyramid, extremity
-export HyperRectangle, Rect, Rect2, Rect3, Recti, Rect2i, Rect3i, Rectf, Rect2f, Rect3f
+export HyperRectangle, Rect, Rect2, Rect3, Recti, Rect2i, Rect3i, Rectf, Rect2f, Rect3f, Rectd, Rect2d, Rect3d
 export before, during, meets, overlaps, intersects, finishes
 export centered, direction, area, volume, update
 export max_dist_dim, max_euclidean, max_euclideansq, min_dist_dim, min_euclidean

src/basic_types.jl

@@ -27,12 +27,17 @@ end
     return map(i-> elements[i], face.data)
 end
 
-@fixed_vector SimplexFace AbstractSimplexFace
+@fixed_vector SimplexFace = AbstractSimplexFace
 
 const TetrahedronFace{T} = SimplexFace{4,T}
 Face(::Type{<:SimplexFace{N}}, ::Type{T}) where {N,T} = SimplexFace{N,T}
 
-@fixed_vector NgonFace AbstractNgonFace
+"""
+Face index, connecting points to form an Ngon
+"""
+
+@fixed_vector NgonFace = AbstractNgonFace
+
 
 const LineFace{T} = NgonFace{2,T}
 const TriangleFace{T} = NgonFace{3,T}

src/fixed_arrays.jl

@@ -6,7 +6,10 @@ import Base: setindex
 abstract type StaticVector{N, T} end
 function similar_type end
 
-macro fixed_vector(VecT, SuperT)
+macro fixed_vector(name_parent)
+    @assert name_parent.head == :(=)
+    name, parent = name_parent.args
+
     expr = quote
         struct $(VecT){N, T} <: $(SuperT){N, T}
             data::NTuple{N,T}
@@ -186,8 +189,9 @@ Base.reverse(x::P) where P <: StaticVector = P(reverse(x.data))
 # Since we don't inherit from AbstractArray, some extra functions need to be overloaded
 LinearAlgebra.promote_leaf_eltypes(x::StaticVector{N, T}) where {N,T} = T
 
-@fixed_vector Point StaticVector
-@fixed_vector Vec StaticVector
+@fixed_vector Point = StaticVector
+@fixed_vector Vec = StaticVector
+
 
 Base.lastindex(::StaticVector{N}) where N = N
 
@@ -199,31 +203,36 @@ const VecTypes{N,T} = Union{StaticVector{N,T}, NTuple{N,T}}
 const Vecf{N} = Vec{N, Float32}
 const PointT{T} = Point{N,T} where N
 const Pointf{N} = Point{N,Float32}
-Base.isnan(p::Union{Point,Vec}) = any(x -> isnan(x), p)
-
-include("mat.jl")
-
-for i in 1:4
-    for T in [:Point, :Vec]
-        name = Symbol("$T$i")
-        namef = Symbol("$T$(i)f")
-        @eval begin
-            const $name = $T{$i}
-            const $namef = $T{$i,Float32}
-            export $name
-            export $namef
+    
+Base.isnan(p::Union{AbstractPoint,Vec}) = any(isnan, p)
+Base.isinf(p::Union{AbstractPoint,Vec}) = any(isinf, p)
+Base.isfinite(p::Union{AbstractPoint,Vec}) = all(isfinite, p)
+
+## Generate aliases
+## As a text file instead of eval/macro, to not confuse code linter
+
+#=
+open(joinpath(@__DIR__, "generated-aliases.jl"), "w") do io
+    for i in 1:4
+        for T in [:Point, :Vec, :Mat]
+            namei = "$T$i"
+            res = T == :Mat ? "Mat{$i,$i,T,$(i * i)}" : "$T{$i,T}"
+            println(io, "const $(namei){T} = $res")
+            println(io, "export $namei")
+            for (postfix, t) in ["d" => Float64, "f" => Float32, "i" => Int, "ui" => UInt]
+                namep = "$T$i$postfix"
+                println(io, "const $(namep) = $(namei){$t}")
+                println(io, "export $namep")
+                # mnamep = "$(mname)$postfix"
+                # println(io, "const $mnamep = $mname{$t}")
+                # println(io, "export $mnamep")
+            end
         end
     end
-    name = Symbol("Mat$i")
-    namef = Symbol("Mat$(i)f")
-    namef = Symbol("Mat$(i)f")
-    @eval begin
-        const $name{T} = $Mat{$i,$i,T, $(i*i)}
-        const $namef = $name{Float32}
-        export $name
-        export $namef
-    end
 end
+=#
+
+include("generated-aliases.jl")
 
 export Mat, Vec, Point, unit
 export Vecf, Pointf

src/generated-aliases.jl

@@ -0,0 +1,120 @@
+const Point1{T} = Point{1,T}
+export Point1
+const Point1d = Point1{Float64}
+export Point1d
+const Point1f = Point1{Float32}
+export Point1f
+const Point1i = Point1{Int64}
+export Point1i
+const Point1ui = Point1{UInt64}
+export Point1ui
+const Vec1{T} = Vec{1,T}
+export Vec1
+const Vec1d = Vec1{Float64}
+export Vec1d
+const Vec1f = Vec1{Float32}
+export Vec1f
+const Vec1i = Vec1{Int64}
+export Vec1i
+const Vec1ui = Vec1{UInt64}
+export Vec1ui
+const Mat1{T} = Mat{1,1,T,1}
+export Mat1
+const Mat1d = Mat1{Float64}
+export Mat1d
+const Mat1f = Mat1{Float32}
+export Mat1f
+const Mat1i = Mat1{Int64}
+export Mat1i
+const Mat1ui = Mat1{UInt64}
+export Mat1ui
+const Point2{T} = Point{2,T}
+export Point2
+const Point2d = Point2{Float64}
+export Point2d
+const Point2f = Point2{Float32}
+export Point2f
+const Point2i = Point2{Int64}
+export Point2i
+const Point2ui = Point2{UInt64}
+export Point2ui
+const Vec2{T} = Vec{2,T}
+export Vec2
+const Vec2d = Vec2{Float64}
+export Vec2d
+const Vec2f = Vec2{Float32}
+export Vec2f
+const Vec2i = Vec2{Int64}
+export Vec2i
+const Vec2ui = Vec2{UInt64}
+export Vec2ui
+const Mat2{T} = Mat{2,2,T,4}
+export Mat2
+const Mat2d = Mat2{Float64}
+export Mat2d
+const Mat2f = Mat2{Float32}
+export Mat2f
+const Mat2i = Mat2{Int64}
+export Mat2i
+const Mat2ui = Mat2{UInt64}
+export Mat2ui
+const Point3{T} = Point{3,T}
+export Point3
+const Point3d = Point3{Float64}
+export Point3d
+const Point3f = Point3{Float32}
+export Point3f
+const Point3i = Point3{Int64}
+export Point3i
+const Point3ui = Point3{UInt64}
+export Point3ui
+const Vec3{T} = Vec{3,T}
+export Vec3
+const Vec3d = Vec3{Float64}
+export Vec3d
+const Vec3f = Vec3{Float32}
+export Vec3f
+const Vec3i = Vec3{Int64}
+export Vec3i
+const Vec3ui = Vec3{UInt64}
+export Vec3ui
+const Mat3{T} = Mat{3,3,T,9}
+export Mat3
+const Mat3d = Mat3{Float64}
+export Mat3d
+const Mat3f = Mat3{Float32}
+export Mat3f
+const Mat3i = Mat3{Int64}
+export Mat3i
+const Mat3ui = Mat3{UInt64}
+export Mat3ui
+const Point4{T} = Point{4,T}
+export Point4
+const Point4d = Point4{Float64}
+export Point4d
+const Point4f = Point4{Float32}
+export Point4f
+const Point4i = Point4{Int64}
+export Point4i
+const Point4ui = Point4{UInt64}
+export Point4ui
+const Vec4{T} = Vec{4,T}
+export Vec4
+const Vec4d = Vec4{Float64}
+export Vec4d
+const Vec4f = Vec4{Float32}
+export Vec4f
+const Vec4i = Vec4{Int64}
+export Vec4i
+const Vec4ui = Vec4{UInt64}
+export Vec4ui
+const Mat4{T} = Mat{4,4,T,16}
+export Mat4
+const Mat4d = Mat4{Float64}
+export Mat4d
+const Mat4f = Mat4{Float32}
+export Mat4f
+const Mat4i = Mat4{Int64}
+export Mat4i
+const Mat4ui = Mat4{UInt64}
+export Mat4ui