Update G4Vis to breaking changes in GeometryBasics@0.5 (#27)

* Update `G4Vis` to breaking changes in `GeometryBasics@0.5`

* Bump compat for GeometryBasics to 0.5

* Disable drawing boolean solids

Author: fhagemann

Project.toml

@@ -31,7 +31,7 @@ G4Vis = ["Makie", "Colors", "StaticArrays", "Rotations", "LinearAlgebra", "IGLWr
 CSV = "0.10"
 CxxWrap = "0.16"
 Geant4_julia_jll = "0.2"
-GeometryBasics = "0.4,0.5"
+GeometryBasics = "0.5"
 IGLWrap_jll = "2.4.0"
 julia = "1.9"
 FHist = "0.11"

ext/G4Vis/Boolean.jl

@@ -44,7 +44,7 @@ function boolean(op, m1::GeometryBasics.Mesh, m2::GeometryBasics.Mesh, t::Transf
     if ret == 0
         c = unsafe_array(Point3{Float64}, cm.vertices, cm.nv)
         f = unsafe_array(TriangleFace{Int32}, cm.faces, cm.nf)
-        return GeometryBasics.Mesh(c,f)
+        return GeometryBasics.mesh(c,f)
     else
         return
     end
@@ -62,13 +62,15 @@ const operation = Dict("G4UnionSolid" => 0, "G4IntersectionSolid" => 1, "G4Subtr
 
 function GeometryBasics.mesh(s::G4BooleanSolid)
     if  isdefined(IGLWrap_jll, :libiglwrap)
-        op = operation[GetEntityType(s)]
-        left = GetConstituentSolid(s, 0)
-        right = GetConstituentSolid(s, 1)
-        boolean(op, GeometryBasics.mesh(left), GeometryBasics.mesh(right))
+        println("IGLWrap_jll is available but interface needs to be fixed for drawing boolean solids (TODO)")
+        GeometryBasics.mesh(Point3{Float64}[], QuadFace{Int32}[])
+        # op = operation[GetEntityType(s)]
+        # left = GetConstituentSolid(s, 0)
+        # right = GetConstituentSolid(s, 1)
+        # boolean(op, GeometryBasics.mesh(left), GeometryBasics.mesh(right))
     else
-        println("IGLWrap_jll is not available for currrent platform $(Sys.MACHINE) and is needed for drawing boolean solids")
-        GeometryBasics.Mesh(Point3{Float64}[], QuadFace{Int32}[])
+        println("IGLWrap_jll is not available for current platform $(Sys.MACHINE) and is needed for drawing boolean solids")
+        GeometryBasics.mesh(Point3{Float64}[], QuadFace{Int32}[])
     end
 end
 
@@ -80,7 +82,7 @@ function GeometryBasics.mesh(s::G4DisplacedSolid)
     points = GeometryBasics.coordinates(m)
     faces  = GeometryBasics.faces(m)
     map!(c -> c * t, points, points)
-    GeometryBasics.Mesh(points, faces)
+    GeometryBasics.mesh(points, faces)
 end
 
 function Geant4.draw(solid::G4BooleanSolid; wireframe::Bool=false, kwargs...)

ext/G4Vis/G4Vis.jl

@@ -26,10 +26,10 @@ module G4Vis
         return (RGB(GetRed(c),GetGreen(c), GetBlue(c)),GetAlpha(c))
     end
 
-    function GeometryBasics.Tesselation(s::G4VSolid, nvertices::NTuple{N,<:Integer}) where N
-        return Tesselation{3,Float64,typeof(s),N}(s, Int.(nvertices))
+    function GeometryBasics.Tessellation(s::G4VSolid, nvertices::NTuple{N,<:Integer}) where N
+        return Tessellation{3,Float64,typeof(s),N}(s, Int.(nvertices))
     end
-    GeometryBasics.mesh(s::G4VSolid) = GeometryBasics.mesh(Tesselation(s, 36), facetype=QuadFace{Int})
+    GeometryBasics.mesh(s::G4VSolid) = GeometryBasics.mesh(Tessellation(s, 36), facetype=QuadFace{Int})
 
 
     colors = colormap("Grays", 8)
@@ -94,7 +94,7 @@ module G4Vis
                 points = GeometryBasics.coordinates(m)
                 faces  = GeometryBasics.faces(m)
                 map!(c -> c * t, points, points)
-                m = GeometryBasics.Mesh(meta(points; normals=normals(points, faces)), faces)
+                m = GeometryBasics.mesh(points, faces, normal=GeometryBasics.normals(points, faces, Vec3f))
             end
             color = g4vis != C_NULL ? convert(Tuple{RGB, Float64}, GetColour(g4vis)) : (colors[level], GetDensity(GetMaterial(lv))/(12g/cm3))
             visible = g4vis != C_NULL ? IsVisible(g4vis) : true