Get rid of GeometryBasics, use StaticArraysCore only

Author: j-fu

Project.toml

@@ -1,19 +1,16 @@
 name = "GridVisualizeTools"
 uuid = "5573ae12-3b76-41d9-b48c-81d0b6e61cc5"
 authors = ["Jürgen Fuhrmann <juergen-fuhrmann@web.de>"]
-version = "0.1.0"
+version = "0.2.0"
 
 [deps]
 ColorSchemes = "35d6a980-a343-548e-a6ea-1d62b119f2f4"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
-GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
-StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
 
 [compat]
 ColorSchemes = "3"
 Colors = "0.12"
 DocStringExtensions = "0.8, 0.9"
-GeometryBasics = "0.4"
-StaticArrays = "1"
 julia = "1.6"

src/GridVisualizeTools.jl

@@ -1,8 +1,7 @@
 module GridVisualizeTools
 using Colors
-using StaticArrays
+using StaticArraysCore
 using ColorSchemes
-using GeometryBasics
 using DocStringExtensions
 
 include("colors.jl")

src/extraction.jl

@@ -9,11 +9,13 @@ or trisurf (pyplot)
 """
 function extract_visible_cells3D(coord,cellnodes,cellregions,nregions,xyzcut;
                                  primepoints=zeros(0,0),Tp=SVector{3,Float32},Tf=SVector{3,Int32})
-    
-    function take(coord,simplex,xyzcut)
-        all_lt=@MVector ones(Bool,3)
-        all_gt=@MVector ones(Bool,3)
+    all_lt=ones(Bool,3)
+    all_gt=ones(Bool,3)
+
+    function take(coord,simplex,xyzcut,all_lt,all_gt)
         for idim=1:3
+            all_lt[idim]=true
+            all_gt[idim]=true
             for inode=1:4
                 c=coord[idim,simplex[inode]]-xyzcut[idim]
                 all_lt[idim]=all_lt[idim] && (c<0.0)
@@ -42,7 +44,7 @@ function extract_visible_cells3D(coord,cellnodes,cellregions,nregions,xyzcut;
         for i=1:4
             tet[i]=cellnodes[i,itet]
         end
-        if take(coord,tet,xyzcut)
+        if take(coord,tet,xyzcut,all_lt,all_gt)
             npts=size(points[iregion],1)
             @views begin
                 push!(points[iregion],coord[:,cellnodes[1,itet]])

src/marching.jl

@@ -200,8 +200,8 @@ end
 
 Collect isoline snippets on triangles ready for linesegments!
 """
-function marching_triangles(coord,cellnodes,func,levels)
-    points=Vector{Point2f}(undef,0)
+function marching_triangles(coord,cellnodes,func,levels; Tp=SVector{2,Float32})
+    points=Vector{Tp}(undef,0)
     function isect(nodes)
         (i1,i2,i3)=(1,2,3)
 
@@ -240,15 +240,14 @@ function marching_triangles(coord,cellnodes,func,levels)
 	            x2=coord[1,n2]+α*dx32
 	            y2=coord[2,n2]+α*dy32
                 end
-                push!(points,Point2f(x1,y1))
-                push!(points,Point2f(x2,y2))
+                push!(points,(x1,y1))
+                push!(points,(x2,y2))
             end
         end
     end
 
     for itri=1:size(cellnodes,2)
         @views isect(cellnodes[:,itri])
     end
-
     points
 end