Further attempt to fix use of new orthogonal_vector

Author: Kevin-Mattheus-Moerman

src/geometry_primitives.jl

@@ -143,19 +143,22 @@ end
     orthogonal_vector(vertices)
 
 Calculates an orthogonal vector to a face or polygon defined by a set of 
-ordered points contained in the point vector `vertices`. 
+ordered points contained in the point vector `vertices`. Note that for 2D points
+a scalar is returned (the dot product of the orthogonal vector with the 
+positive Z-direction). 
 """
-function orthogonal_vector(vertices)
-    N = length(vertices)
-    c = zeros(eltype(vertices)) # Inherit vector type from input 
+function orthogonal_vector(::Type{VT},vertices) where VT     
+    c = zeros(VT) # Inherit vector type from input 
+    j = length(vertices)
     @inbounds for i in eachindex(vertices) # Use shoelace approach
-        c  += cross(vertices[i],vertices[mod1(i+1,N)]) # Add each edge contribution          
+        c += cross(vertices[j],vertices[i]) # Add each edge contribution          
+        j = i
     end
     return c
 end
 
-function orthogonal_vector(VT,vertices)
-    return orthogonal_vector(VT.(vertices))
+function orthogonal_vector(vertices)
+    return orthogonal_vector(eltype(vertices),vertices)
 end
 
 """
@@ -178,7 +181,7 @@ function normals(vertices::AbstractVector{<:Point{3}}, faces::AbstractVector{<:
 
     normals_result = zeros(NormalType, length(vertices))
     for face in faces
-        v = vertices[face]
+        v = coordinates(vertices[face])
         # we can get away with two edges since faces are planar.
         n = orthogonal_vector(NormalType, v)
         for i in 1:length(face)
@@ -215,7 +218,7 @@ end
         faces   = resize!(F[], length(fs))
 
         for (i, f) in enumerate(fs)
-            ps = positions[f]
+            ps = coordinates(positions[f])
             n = orthogonal_vector(NormalType, ps)
             normals[i] = normalize(n)
             faces[i] = $(FT)(i)

src/meshes.jl

@@ -213,9 +213,8 @@ end
 Calculate the signed volume of one tetrahedron. Be sure the orientation of your
 surface is right.
 """
-function volume(triangle::Triangle)
-    v1, v2, v3 = triangle
-    sig = sign(orthogonal_vector(v1, v2, v3) ⋅ v1)
+function volume(triangle::Triangle)    
+    sig = sign(orthogonal_vector(triangle.points) ⋅ v1)
     return sig * abs(v1 ⋅ (v2 × v3)) / 6
 end
 

src/triangulation.jl

@@ -13,54 +13,43 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =#
 """
-    area(vertices::AbstractVector{Point{3}}, face::TriangleFace)
+    area(vertices::AbstractVector{Point{3}}, face::NgonFace)
 
-Calculate the area of one triangle.
+Calculate the area of one face.
 """
-function area(vertices::AbstractVector{<:Point{3,VT}},
-              face::TriangleFace{FT}) where {VT,FT}
-    v1, v2, v3 = vertices[face]
-    return 0.5 * norm(orthogonal_vector(v1, v2, v3))
+function area(vertices::AbstractVector{<:Point},
+              face::NgonFace)
+    return 0.5 * norm(orthogonal_vector(vertices[face]))
 end
 
 """
-    area(vertices::AbstractVector{Point{3}}, faces::AbstractVector{TriangleFace})
+    area(vertices::AbstractVector{Point}, faces::AbstractVector{NgonFace})
 
-Calculate the area of all triangles.
+Calculate the area of all faces.
 """
-function area(vertices::AbstractVector{Point{3,VT}},
-              faces::AbstractVector{TriangleFace{FT}}) where {VT,FT}
+function area(vertices::AbstractVector{<:Point},
+              faces::AbstractVector{<:NgonFace})
     return sum(x -> area(vertices, x), faces)
 end
 
 """
-    area(contour::AbstractVector{Point}})
+    area(vertices::AbstractVector{Point}})
 
 Calculate the area of a polygon.
 
 For 2D points, the oriented area is returned (negative when the points are
 oriented clockwise).
 """
-function area(contour::AbstractVector{Point{2,T}}) where {T}
-    length(contour) < 3 && return zero(T)
-    A = zero(T)
-    p = lastindex(contour)
-    for q in eachindex(contour)
-        A += cross(contour[p], contour[q])
-        p = q
-    end
-    return A * T(0.5)
+function area(vertices::AbstractVector{Point{2,T}}) where {T}
+    length(vertices) < 3 && return zero(T)       
+    return T(0.5) * orthogonal_vector(vertices) 
 end
 
-function area(contour::AbstractVector{Point{3,T}}) where {T}
-    A = zero(eltype(contour))
-    o = first(contour)
-    for i in (firstindex(contour) + 1):(lastindex(contour) - 1)
-        A += cross(contour[i] - o, contour[i + 1] - o)
-    end
-    return norm(A) * T(0.5)
+function area(vertices::AbstractVector{Point{3,T}}) where {T}
+    return T(0.5) * norm(orthogonal_vector(vertices))
 end
 
+
 """
     in(point, triangle)