fixes

Author: SimonDanisch

src/GeometryBasics.jl

@@ -49,7 +49,7 @@ module GeometryBasics
     export HyperSphere, Circle, Sphere
     export Cylinder, Cylinder2, Cylinder3, Pyramid, extremity
     export Rect, Rect2D, Rect3D, IRect, IRect2D, IRect3D, FRect, FRect2D, FRect3D
-    export before, during, contains, isinside, isoutside, meets, overlaps, intersects, finishes
+    export before, during, isinside, isoutside, meets, overlaps, intersects, finishes
     export centered, direction, area, update
     export max_dist_dim, max_euclidean, max_euclideansq, min_dist_dim, min_euclidean
     export min_euclideansq, minmax_dist_dim, minmax_euclidean, minmax_euclideansq

src/basic_types.jl

@@ -20,18 +20,21 @@ abstract type AbstractNgonFace{N, T} <: AbstractFace{N, T} end
 
 abstract type AbstractSimplex{Dim, N, T} <: StaticVector{Dim, T} end
 
-
 """
     coordinates(geometry)
-Returns the edges/vertices/coordinates of a geometry
+Returns the edges/vertices/coordinates of a geometry. Is allowed to return lazy iterators!
+Use `decompose(ConcretePointType, geometry)` to get `Vector{ConcretePointType}` with
+`ConcretePointType` to be something like `Point{3, Float32}`.
 """
 function coordinates(points::AbstractVector{<:AbstractPoint})
     return points
 end
 
 """
     faces(geometry)
-Returns the face connections of a geometry
+Returns the face connections of a geometry. Is allowed to return lazy iterators!
+Use `decompose(ConcreteFaceType, geometry)` to get `Vector{ConcreteFaceType}` with
+`ConcreteFaceType` to be something like `TriangleFace{Int}`.
 """
 function faces(f::AbstractVector{<:AbstractFace})
     return f

src/meshes.jl

@@ -130,9 +130,15 @@ function gl_uv_triangle_mesh2d(primitive::GeometryPrimitive)
     return Mesh(meta(points; uv=uv), fs)
 end
 
-function gl_normal_mesh3d(primitive::GeometryPrimitive, nfaces=30)
-    points = decompose(Point3f0, primitive, nfaces)
-    fs = decompose(GLTriangleFace, primitive, nfaces)
+function gl_normal_mesh3d(primitive::GeometryPrimitive)
+    points = decompose(Point3f0, primitive)
+    fs = decompose(GLTriangleFace, primitive)
+    return Mesh(meta(points; normals=normals(points, fs)), fs)
+end
+
+function gl_normal_mesh3d(primitive::GeometryPrimitive, nvertices)
+    points = decompose(Point3f0, primitive, nvertices)
+    fs = decompose(GLTriangleFace, primitive, nvertices)
     return Mesh(meta(points; normals=normals(points, fs)), fs)
 end
 

src/rectangles.jl

@@ -461,7 +461,7 @@ Check if Rects are contained in each other. This does not use
 strict inequality, so Rects may share faces and this will still
 return true.
 """
-function contains(b1::Rect{N}, b2::Rect{N}) where N
+function Base.in(b2::Rect{N}, b1::Rect{N}) where N
     for i = 1:N
         maximum(b2)[i] <= maximum(b1)[i] &&
             minimum(b2)[i] >= minimum(b1)[i] ||
@@ -474,26 +474,13 @@ end
 Check if a point is contained in a Rect. This will return true if
 the point is on a face of the Rect.
 """
-function contains(b1::Rect{N, T}, pt::VecTypes) where {T, N}
+function Base.in(pt::VecTypes, b1::Rect{N, T}) where {T, N}
     for i = 1:N
         pt[i] <= maximum(b1)[i] && pt[i] >= minimum(b1)[i] || return false
     end
     return true
 end
 
-"""
-Check if Rects are contained in each other. This does not use
-strict inequality, so Rects may share faces and this will still
-return true.
-"""
-Base.in(b1::Rect, b2::Rect) = contains(b2, b1)
-
-"""
-Check if a point is contained in a Rect. This will return true if
-the point is on a face of the Rect.
-"""
-Base.in(pt::VecTypes, b1::Rect) = contains(b1, pt)
-
 #
 # Equality
 #