fix tests + tutorials

Author: SimonDanisch

docs/src/gpu_raytracing_tutorial.md

@@ -277,4 +277,3 @@ DOM.img(src=Asset(data"gpu-benchmarks.png"), width="700px")
   * Add **adaptive sampling** (more samples only where needed)
   * Explore **shared memory** optimizations for BVH traversal
   * Implement **streaming multisampling** across frames
-

docs/src/raytracing-core.jl

@@ -130,7 +130,7 @@ end
 function reflective_kernel(bvh, ctx, tri, dist, bary, ray, sky_color, shadow_samples=8)
     hit_point = ray.o + ray.d * dist
     normal = compute_normal(tri, bary)
-    mat = ctx.materials[tri.material_idx]
+    mat = ctx.materials[tri.metadata]
 
     # Direct lighting with soft shadows
     direct_color = compute_multi_light(bvh, ctx, hit_point, normal, mat, shadow_samples=shadow_samples)
@@ -153,7 +153,7 @@ function reflective_kernel(bvh, ctx, tri, dist, bary, ray, sky_color, shadow_sam
         reflection_color = if refl_hit
             refl_point = reflect_ray.o + reflect_ray.d * refl_dist
             refl_normal = compute_normal(refl_tri, refl_bary)
-            refl_mat = ctx.materials[refl_tri.material_idx]
+            refl_mat = ctx.materials[refl_tri.metadata]
             compute_multi_light(bvh, ctx, refl_point, refl_normal, refl_mat, shadow_samples=shadow_samples)
         else
             to_vec3f(sky_color)
@@ -207,7 +207,9 @@ function example_scene(; glass_cat=false)
         (sphere2,    Material(RGB(0.3f0, 0.6f0, 0.9f0), 0.5f0, 0.3f0, 1.0f0, 0.0f0)),
     ]
 
-    bvh, materials = MaterialScene(scene)
+    geometries = [g for (g, _) in scene]
+    materials = [m for (_, m) in scene]
+    bvh = Raycore.BVH(geometries, (mesh_idx, tri_idx) -> UInt32(mesh_idx))
     lights = default_lights()
     ctx = RenderContext(lights, materials, 0.1f0)
     return bvh, ctx

docs/src/raytracing_tutorial_content.md

@@ -47,9 +47,9 @@ left_wall = normal_mesh(Rect3f(Vec3f(-5, -1.5, -2), Vec3f(0.01, 5, 10)))
 sphere1 = Tesselation(Sphere(Point3f(-2, -1.5 + 0.8, 2), 0.8f0), 64)
 sphere2 = Tesselation(Sphere(Point3f(2, -1.5 + 0.6, 1), 0.6f0), 64)
 
-# Build our BVH acceleration structure
+# Build our BVH acceleration structure with material indices
 scene_geometry = [cat_mesh, floor, back_wall, left_wall, sphere1, sphere2]
-bvh = Raycore.BVH(scene_geometry)
+bvh = Raycore.BVH(scene_geometry, (mesh_idx, tri_idx) -> UInt32(mesh_idx))
 f, ax, pl = plot(bvh; axis=(; show_axis=false))
 ```
 Set the camera to something better:
@@ -269,7 +269,7 @@ end
 function material_kernel(bvh, ctx, tri, dist, bary, ray)
     hit_point = ray.o + ray.d * dist
     normal = compute_normal(tri, bary)
-    mat = ctx.materials[tri.material_idx]
+    mat = ctx.materials[tri.metadata]
 
     color = compute_multi_light(bvh, ctx, hit_point, normal, mat, shadow_samples=2)
     return to_rgb(color)
@@ -287,7 +287,7 @@ Add simple reflections for metallic surfaces:
 function reflective_kernel(bvh, ctx, tri, dist, bary, ray, sky_color)
     hit_point = ray.o + ray.d * dist
     normal = compute_normal(tri, bary)
-    mat = ctx.materials[tri.material_idx]
+    mat = ctx.materials[tri.metadata]
 
     # Direct lighting with soft shadows
     direct_color = compute_multi_light(bvh, ctx, hit_point, normal, mat, shadow_samples=8)
@@ -310,7 +310,7 @@ function reflective_kernel(bvh, ctx, tri, dist, bary, ray, sky_color)
         reflection_color = if refl_hit
             refl_point = reflect_ray.o + reflect_ray.d * refl_dist
             refl_normal = compute_normal(refl_tri, refl_bary)
-            refl_mat = ctx.materials[refl_tri.material_idx]
+            refl_mat = ctx.materials[refl_tri.metadata]
             compute_multi_light(bvh, ctx, refl_point, refl_normal, refl_mat, shadow_samples=1)
         else
             to_vec3f(sky_color)

ext/RaycoreMakieExt.jl

@@ -184,12 +184,12 @@ end
 Helper function to draw BVH geometry
 """
 function draw_bvh!(plot, bvh::Raycore.BVH, colors, alpha)
-    # Group primitives by their material_idx
-    primitive_groups = Dict{UInt32, Vector{Raycore.Triangle}}()
+    # Group primitives by their metadata
+    primitive_groups = Dict{Any, Vector{eltype(bvh.primitives)}}()
     for prim in bvh.primitives
-        mat_idx = prim.material_idx
+        mat_idx = prim.metadata
         if !haskey(primitive_groups, mat_idx)
-            primitive_groups[mat_idx] = Raycore.Triangle[]
+            primitive_groups[mat_idx] = eltype(bvh.primitives)[]
         end
         push!(primitive_groups[mat_idx], prim)
     end
@@ -240,7 +240,7 @@ function Makie.convert_arguments(::Type{Makie.Mesh}, bvh::Raycore.BVH)
         start_idx = length(vertices)
         for (v, n) in zip(prim.vertices, prim.normals)
             push!(vertices, v)
-            push!(colors, prim.material_idx)
+            push!(colors, Float32(prim.metadata))
             push!(normals, Vec3f(n))
         end
         push!(faces, GeometryBasics.TriangleFace(start_idx + 1, start_idx + 2, start_idx + 3))

src/kernels.jl

@@ -62,12 +62,14 @@ end
 function get_illumination(bvh, viewdir; grid_size=1000)
     # Calculate grid bounds
     hits = hits_from_grid(bvh, viewdir; grid_size=grid_size)
-    result = Dict{UInt32, Float32}()
+    # Use primitive metadata as keys - requires metadata to be the primitive index
+    result = Dict{Int, Float32}()
     for hit in hits
         if hit.hit
-            count = get!(result, hit.prim_idx, 0f0)
-            result[hit.prim_idx] = count + 1f0
+            idx = Int(hit.metadata)
+            count = get!(result, idx, 0f0)
+            result[idx] = count + 1f0
         end
     end
-    return [get(result, UInt32(idx), 0.0f0) for idx in 1:length(bvh.primitives)]
+    return [get(result, idx, 0.0f0) for idx in 1:length(bvh.primitives)]
 end

test/test_intersection.jl

@@ -109,5 +109,5 @@ end
     intersects, triangle = Raycore.closest_hit(bvh, ray)
     @test intersects
     # BVH closest_hit returns Triangle object, not SurfaceInteraction
-    @test typeof(triangle) == Raycore.Triangle
+    @test triangle isa Raycore.Triangle
 end

test/test_type_stability.jl

@@ -36,8 +36,7 @@ function gen_triangle()
         SVector(n1, n1, n1),
         SVector(Vec3f(NaN), Vec3f(NaN), Vec3f(NaN)),
         SVector(uv1, uv2, uv3),
-        UInt32(1),
-        UInt32(1)
+        UInt32(1)  # metadata (single field replaces mesh_idx and material_idx)
     )
 end