changes for new GeometryBasics

Author: SimonDanisch

Project.toml

@@ -18,12 +18,12 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 StructArrays = "09ab397b-f2b6-538f-b94a-2f83cf4a842a"
 
 [compat]
-Atomix = "0.1.0"
+#Atomix = "0.1.0"
 FileIO = "1.16"
-GeometryBasics = "0.4"
+GeometryBasics = "0.4, 0.5"
 ImageCore = "0.10"
 ImageIO = "0.6"
-KernelAbstractions = "0.9.24"
+#KernelAbstractions = "0.9.24"
 ProgressMeter = "1.10"
 RandomNumbers = "1.6.0"
 StaticArrays = "1.9.7"

docs/code/basic-scene.jl

@@ -48,7 +48,7 @@ begin
     l = tmesh(Rect3f(Vec3f(-2, -5, 0), Vec3f(0.01, 10, 10)), material_red)
     r = tmesh(Rect3f(Vec3f(2, -5, 0), Vec3f(0.01, 10, 10)), material_blue)
 
-    bvh = Trace.BVHAccel([s1, s2, s3, s4, ground, back, l, r], 1);
+    bvh = Trace.BVHAccel([s1, s2, s3, s4, #=ground, back, l, r=#], 1);
 
     lights = (
         # Trace.PointLight(Vec3f(0, -1, 2), Trace.RGBSpectrum(22.0f0)),
@@ -58,17 +58,19 @@ begin
     scene = Trace.Scene([lights...], bvh);
     resolution = Point2f(1024)
     f = Trace.LanczosSincFilter(Point2f(1.0f0), 3.0f0)
+
     film = Trace.Film(resolution,
         Trace.Bounds2(Point2f(0.0f0), Point2f(1.0f0)),
         f, 1.0f0, 1.0f0,
-        "shadows_sppm_res.png",
     )
     screen_window = Trace.Bounds2(Point2f(-1), Point2f(1))
     cam = Trace.PerspectiveCamera(
         Trace.look_at(Point3f(0, 4, 2), Point3f(0, -4, -1), Vec3f(0, 0, 1)),
         screen_window, 0.0f0, 1.0f0, 0.0f0, 1.0f6, 45.0f0, film,
     )
 end
+using GeometryBasics
+
 
 # begin
 #     Trace.clear!(film)

src/shapes/triangle_mesh.jl

@@ -91,14 +91,18 @@ function create_triangle_mesh(
 end
 
 function create_triangle_mesh(mesh::GeometryBasics.Mesh, core::ShapeCore=ShapeCore())
-    fs = decompose(TriangleFace{UInt32}, mesh)
-    vertices = decompose(Point3f, mesh)
-    normals = Normal3f.(decompose_normals(mesh))
-    uvs = Point2f.(GeometryBasics.decompose_uv(mesh))
+    nmesh = GeometryBasics.expand_faceviews(mesh)
+    fs = decompose(TriangleFace{UInt32}, nmesh)
+    vertices = decompose(Point3f, nmesh)
+    normals = Normal3f.(decompose_normals(nmesh))
+    uvs = GeometryBasics.decompose_uv(nmesh)
+    if isnothing(uvs)
+        uvs = Point2f[]
+    end
     indices = collect(reinterpret(UInt32, fs))
     return TriangleMesh(
         core.object_to_world, indices, vertices,
-        normals, Vec3f[], uvs,
+        normals, Vec3f[], Point2f.(uvs),
     )
 end