Merge pull request #6 from SimonDanisch/sd-noabstractplotting

just remove AbstractPlotting

Author: SimonDanisch

Project.toml

@@ -5,7 +5,6 @@ version = "0.1.0"
 
 [deps]
 GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
-Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"

src/GeometryBasics.jl

@@ -1,20 +1,12 @@
 module GeometryBasics
 
 using StaticArrays, Tables, StructArrays
-using Requires
 
 using Base: @propagate_inbounds
 
-include("FixedSizeArrays.jl")
-using .FixedSizeArrays
-
+include("fixed_arrays.jl")
 include("basic_types.jl")
 include("metadata.jl")
 include("viewtypes.jl")
 
-
-function __init__()
-    @require AbstractPlotting = "537997a7-5e4e-5d89-9595-2241ea00577e" include("abstractplotting.jl")
-end
-
 end # module

src/abstractplotting.jl

@@ -33,7 +33,6 @@ const TetrahedronFace{T} = SimplexFace{4, T}
 Face(::Type{<: SimplexFace{N}}, ::Type{T}) where {N, T} = SimplexFace{N, T}
 
 
-
 """
 Face index, connecting points to form an Ngon
 """
@@ -295,6 +294,9 @@ struct Mesh{
 
     simplices::V
 end
+
+Tables.schema(fw::Mesh) = Tables.schema(getfield(fw, :simplices))
+
 column_names(fw::Mesh) = column_names(getfield(fw, :simplices))
 column_types(fw::Mesh) = column_types(getfield(fw, :simplices))
 

src/basic_types.jl

@@ -1,36 +1,16 @@
-"""
-Compatibility layer for transferring from FixedSizeArrays. This provides
-alternative definitions of `Vec`, `Mat`, `Point`, `FixedVectorNoTuple`, `@fsa`,
-etc, using StaticArrays as a backend.
-The type definitions are not "perfect" matches because the type parameters are
-different. However, it should cover common method signatures and constructors.
-"""
-module FixedSizeArrays
-
-using StaticArrays
-
-export FixedArray
-export FixedVector
-export FixedMatrix
 export Mat
 export Vec
 export Point
-export FixedVectorNoTuple
+export unit
 
-const FixedArray = StaticArray
-const FixedVector = StaticVector
-const FixedMatrix = StaticMatrix
 const Mat = SMatrix
-const FixedVectorNoTuple = FieldVector
 
 function unit(::Type{T}, i::Integer) where T <: StaticVector
     T(ntuple(Val(length(T))) do j
         ifelse(i == j, 1, 0)
     end)
 end
 
-export unit
-
 macro fixed_vector(name, parent)
     esc(quote
         struct $(name){S, T} <: $(parent){S, T}
@@ -126,7 +106,3 @@ macro fixed_vector(name, parent)
 
     end)
 end
-
-export @fixed_vector
-
-end