Merge pull request #31 from j-fu/stl

Stl

Author: j-fu

.github/workflows/ci.yml

@@ -15,9 +15,9 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.3' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
+          - '1.6' # Replace this with the minimum Julia version that your package supports. E.g. if your package requires Julia 1.5 or higher, change this to '1.5'.
           - '1'   # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
-          - '1.6' # usually nigthly, but error-catching fails on windows
+          - 'nightly' 
         os:
           - ubuntu-latest
           - macos-latest

Project.toml

@@ -1,7 +1,7 @@
 name = "TetGen"
 uuid = "c5d3f3f7-f850-59f6-8a2e-ffc6dc1317ea"
 authors = ["SimonDanisch <[email protected]>", "Juergen Fuhrmann <[email protected]"]
-version = "1.3"
+version = "1.4.0"
 
 [deps]
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
@@ -12,11 +12,11 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 TetGen_jll = "b47fdcd6-d2c1-58e9-bbba-c1cee8d8c179"
 
 [compat]
-DocStringExtensions = "^0.8"
+DocStringExtensions = "0.8,0.9"
 GeometryBasics = "0.2, 0.3, 0.4"
 StaticArrays = "1"
-TetGen_jll = "1.5.1"
-julia = "1.3"
+julia = "1.6"
+TetGen_jll = "1.5.3"
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

examples/examples.jl

@@ -80,7 +80,6 @@ end
 
    Tetrahedralization of cube with local refinement callback
 """
-
 function cube_localref()
 
     tetunsuitable() do pa,pb,pc,pd
@@ -109,8 +108,16 @@ function cube_localref()
 end
 
 
+"""
+   cube_stl()
 
-
+   Tetrahedralization of cube from an stl file
+"""
+function cube_stl()
+    modeldir=joinpath(dirname(pathof(TetGen)),"..","test","surfaceModels")
+    modelfile=joinpath(modeldir,"cube.stl")
+    tetrahedralize(modelfile, "pQa1.0")
+end
 """
    prism(;vol=1)
 

src/cpptetgenio.jl

@@ -81,6 +81,8 @@ function Base.show(io::IO, e::TetGenError)
         println(io,"TetGen error $(e.rc): two very close input facets were detected. Hint: use -Y option to avoid adding Steiner points in boundary.\n");
     elseif e.rc==10
         println(io,"TetGen error $(e.rc): an input error was detected.\n"); 
+    elseif e.rc==101
+        println(io,"TetGen error: unable to load stl file\n"); 
     else
         println(io,"TetGen error $(e.rc): unknown error.\n"); 
     end    
@@ -102,6 +104,7 @@ function tetrahedralize(input::CPPTetGenIO{Float64}, command::String)
 end
 
 
+
 """
    Trivial Julia tetunsuitable function
 """

src/rawtetgenio.jl

@@ -634,6 +634,21 @@ function tetrahedralize(input::RawTetGenIO{Float64}, flags::String)
     RawTetGenIO(coutput)
 end
 
+"""
+$(SIGNATURES)
+
+Tetrahedralize stl file.
+"""
+function tetrahedralize(stlfile::String, flags::String)
+    base=rsplit(stlfile,".",limit=2)[1]
+    rc=Cint[0]
+    coutput = ccall((:tetrahedralize2_stl_f64, libtet), CPPTetGenIO{Float64}, (Cstring, Cstring,  Ptr{Cint}), base, flags, rc)
+    if rc[1]!=0
+        throw(TetGenError(rc[1]))
+    end
+    RawTetGenIO(coutput)
+end
+
 
 """
 $(TYPEDSIGNATURES)
@@ -642,7 +657,7 @@ Create GeometryBasics.Mesh from the triface list
 (for quick visualization purposes using Makie's wireframe).
 """
 function surfacemesh(tgio::RawTetGenIO)
-    points=[ Point3f0(tgio.pointlist[:,i]...) for i=1:size(tgio.pointlist,2)]
+    points=[ Point3f(tgio.pointlist[:,i]...) for i=1:size(tgio.pointlist,2)]
     faces= [TriangleFace(tgio.trifacelist[:,i]...) for i=1:size(tgio.trifacelist,2)]
     mesh=GeometryBasics.Mesh(points,faces)
 end
@@ -654,7 +669,7 @@ Create GeometryBasics.Mesh of all tetrahedron faces
 (for quick visualization purposes using Makie's wireframe).
 """
 function volumemesh(tgio::RawTetGenIO)
-    points=[ Point3f0(tgio.pointlist[:,i]...) for i=1:size(tgio.pointlist,2)]
+    points=[ Point3f(tgio.pointlist[:,i]...) for i=1:size(tgio.pointlist,2)]
     faces=Array{NgonFace{3,Int32},1}(undef,0)
     tetlist=tgio.tetrahedronlist
     for itet=1:size(tetlist,2)