Merge pull request #25 from JuliaGeometry/sd/additional_funcs

add some convenience functions for rects

Author: SimonDanisch

src/rectangles.jl

@@ -268,13 +268,23 @@ function Base.:(*)(m::Mat{4,4,T}, h::Rect{3,T}) where T
     Rect{3,T}(_vmin, _vmax - _vmin)
 end
 
-function Base.:(-)(h::Rect{N, T}, move::Vec{N}) where {N,T}
+Base.:(-)(h::Rect{N, T}, move::Number) where {N,T} = h - Vec{N, T}(move)
+Base.:(+)(h::Rect{N, T}, move::Number) where {N,T} = h + Vec{N, T}(move)
+
+
+function Base.:(-)(h::Rect{N, T}, move::StaticVector{N}) where {N,T}
     Rect{N, T}(minimum(h) .- move, widths(h))
 end
-function Base.:(+)(h::Rect{N, T}, move::Vec{N}) where {N,T}
+
+function Base.:(+)(h::Rect{N, T}, move::StaticVector{N}) where {N,T}
     Rect{N, T}(minimum(h) .+ move, widths(h))
 end
 
+
+function Base.:(*)(rect::Rect, scaling::Union{Number, StaticVector})
+    return Rect(minimum(rect) .* scaling, widths(rect) .* scaling)
+end
+
 # Enables rectangular indexing into a matrix
 function Base.to_indices(A::AbstractMatrix{T}, I::Tuple{Rect2D{IT}}) where {T, IT<:Integer}
     rect = I[1]

test/geometrytypes.jl

@@ -202,10 +202,36 @@ end
     points = decompose(Point2f0, circle, 20)
     @test length(points) == 20
 
-    # TODO circle mesh cant be 1:1 assembled from vertices + faces,
-    # since middle point is missing...
-    # mesh = triangle_mesh(circle, nvertices=32)
-    # # end-1, since we add a middle point for the mesh!
-    # @test decompose(Point2f0, mesh)[1:end-1] ≈ decompose(Point2f0, circle, 32)
+    mesh = triangle_mesh(circle, nvertices=32)
+    @test decompose(Point2f0, mesh)[1:end] ≈ decompose(Point2f0, circle, 32)
+end
+
+
+@testset "Rectangles" begin
+    rect = FRect2D(0, 7, 20, 3)
+    @test (rect + 4) == FRect2D(4, 11, 20, 3)
+    @test (rect + Vec(2, -2)) == FRect2D(2, 5, 20, 3)
+
+    @test (rect - 4) == FRect2D(-4, 3, 20, 3)
+    @test (rect - Vec(2, -2)) == FRect2D(-2, 9, 20, 3)
+
+    base = Vec3f0(1, 2, 3)
+    wxyz = Vec3f0(-2, 4, 2)
+    rect = FRect3D(base, wxyz)
+    @test (rect + 4) == FRect3D(base .+ 4, wxyz)
+    @test (rect + Vec(2, -2, 3)) == FRect3D(base .+ Vec(2, -2, 3), wxyz)
+
+    @test (rect - 4) == FRect3D(base .- 4, wxyz)
+    @test (rect - Vec(2, -2, 7)) == FRect3D(base .- Vec(2, -2, 7), wxyz)
+
+
+    rect = FRect2D(0, 7, 20, 3)
+    @test (rect * 4) == FRect2D(0, 7*4, 20*4, 3*4)
+    @test (rect * Vec(2, -2)) == FRect2D(0, -7*2, 20*2, -3*2)
 
+    base = Vec3f0(1, 2, 3)
+    wxyz = Vec3f0(-2, 4, 2)
+    rect = FRect3D(base, wxyz)
+    @test (rect * 4) == FRect3D(base .* 4, wxyz .* 4)
+    @test (rect * Vec(2, -2, 3)) == FRect3D(base .* Vec(2, -2, 3), wxyz .* Vec(2, -2, 3))
 end