initial sketch of 2d

src/Descartes.jl

@@ -31,9 +31,13 @@ include("opencl.jl")
 # GeometryTypes
 export Point
 
-# primitives
+# 3d primitives
 export Cuboid, Cylinder, Sphere, Piping
 
+# 2d primitives
+
+export Square, Circle
+
 # transforms
 export Transform, Translation, translate, rotate
 

src/constructors.jl

@@ -1,3 +1,11 @@
+function Square(dims;center=false)
+    @assert length(dims) == 2
+    lb = SVector(0.,0.)
+    center && (lb = -SVector{2,Float64}(dims)/2)
+    Square(SVector{2,Float64}(dims), lb, SMatrix{3,3}(1.0*I), SMatrix{3,3}(1.0*I))
+end
+
+
 function Cuboid(dims;center=false)
     @assert length(dims) == 3
     lb = SVector(0.,0.,0.)

src/frep.jl

@@ -82,3 +82,8 @@ function FRep(p::Piping{T}, x, y, z) where {T}
     end
     val - p.radius
 end
+
+function FRep(p::LinearExtrude, _x, _y, _z)
+    r = FRep(s.primitive, x, y, z)
+    max(max(-z,z-p.height), r)
+end

src/hyperrectangles.jl

@@ -1,3 +1,8 @@
+function HyperRectangle(square::Square{T}) where {T}
+    orig = HyperRectangle{2,T}(square.lowercorner, square.dimensions)
+    transform(square.transform, orig)
+end
+
 function HyperRectangle(cube::Cuboid{T}) where {T}
     orig = HyperRectangle{3,T}(cube.lowercorner, cube.dimensions)
     transform(cube.transform, orig)

src/operations.jl

@@ -83,7 +83,7 @@ function transform(it::SMatrix, x::AbstractVector) where {T}
     transform(it, x...)
 end
 
-function transform(t::SMatrix, h::HyperRectangle)
+function transform(t::SMatrix, h::HyperRectangle{3,T}) where {T}
     p_1 = t*SVector(h.origin... , 1)
     p_2 = t*SVector(h.widths... , 1)
     p_3 = t*SVector(h.origin[1]+h.widths[1],h.origin[2],h.origin[3], 1)
@@ -101,6 +101,17 @@ function transform(t::SMatrix, h::HyperRectangle)
     HyperRectangle(x_o, y_o, z_o, x_w-x_o, y_w-y_o, z_w-z_o)
 end
 
+function transform(t::SMatrix, h::HyperRectangle{2,T}) where {T}
+    p_1 = t*SVector(h.origin... , 1)
+    p_2 = t*SVector(h.widths... , 1)
+    p_3 = t*SVector(h.origin[1]+h.widths[1],h.origin[2], 1)
+    p_4 = t*SVector(h.origin[1],h.origin[2]+h.widths[2], 1)
+    x_o = min(p_1[1],p_2[1],p_3[1],p_4[1])
+    y_o = min(p_1[2],p_2[2],p_3[2],p_4[2])
+    x_w = max(p_1[1],p_2[1],p_3[1],p_4[1])
+    y_w = max(p_1[2],p_2[2],p_3[2],p_4[2])
+    HyperRectangle(x_o, y_o, x_w-x_o, y_w-y_o)
+end
 
 #function clarkcatmull!(n::Integer, pipe::Pipe{Float64})
 #    length(pipe.points) < 3 && return

src/types.jl

@@ -3,7 +3,22 @@ abstract type AbstractCSGTree{N,T} <: AbstractPrimitive{N, T} end
 abstract type AbstractOperation{N,T} <: AbstractPrimitive{N,T} end
 abstract type AbstractTransform{N,T} end
 
-# Geometric Primitives
+# 2D Geometric Primitives
+
+struct Square{T} <: AbstractPrimitive{2, T}
+    dimensions::SVector{2,T}
+    lowercorner::SVector{2,T}
+    transform::SMatrix{3,3,T,9}
+    inv_transform::SMatrix{3,3,T,9}
+end
+
+struct Circle{T} <: AbstractPrimitive{2, T}
+    radius::T
+    transform::SMatrix{3,3,T,9}
+    inv_transform::SMatrix{3,3,T,9}
+end
+
+# 3D Geometric Primitives
 
 struct Cuboid{T} <: AbstractPrimitive{3, T}
     dimensions::SVector{3,T}
@@ -70,3 +85,8 @@ struct Shell{T} <: AbstractPrimitive{3,T}
     primitive::T
     distance
 end
+
+struct LinearExtrude{T} <: AbstractPrimitive{3,T}
+    primitive::T
+    distance
+end

test/2d.jl

@@ -0,0 +1,6 @@
+@testset "2D Geometry" begin
+
+    c = Square([1,2])
+    HyperRectangle(c)
+
+end

test/runtests.jl

@@ -6,6 +6,7 @@ import GeometryTypes
 include("tranforms.jl")
 include("opencl.jl")
 include("primitives.jl")
+include("2d.jl")
 include("hyperrectangles.jl")
 include("distancefield.jl")
 include("meshes.jl")