clean up

Author: SimonDanisch

docs/code/TraceMakie.jl

@@ -138,7 +138,11 @@ function to_trace_camera(scene::Makie.Scene, film)
     )
 end
 
-function render_scene(mscene::Makie.Scene)
+function render_scene(scene::Makie.Scene)
+    return render_scene(c -> Trace.WhittedIntegrator(c, Trace.UniformSampler(8), 5), scene)
+end
+
+function render_scene(integrator_f, mscene::Makie.Scene)
     # Only set background image if it isn't set by env light, since
     # background image takes precedence
     resolution = Point2f(size(mscene))
@@ -164,7 +168,7 @@ function render_scene(mscene::Makie.Scene)
         error("Must have at least one light")
     end
     bvh = Trace.BVHAccel(map(identity, primitives), 1)
-    integrator = Trace.WhittedIntegrator(camera, Trace.UniformSampler(8), 5)
+    integrator = integrator_f(camera)
     scene = Trace.Scene([lights...], bvh)
     integrator(scene)
     return reverse(film.framebuffer, dims=1)
@@ -187,10 +191,9 @@ begin
         Trace.ConstantTexture(0.010408001f0),
         true,
     )
-    scene = Scene(size=(1024, 1024); lights=[AmbientLight(RGBf(0.5, 0.5, 0.5)), PointLight(Vec3f(0, 1, 0.5), RGBf(1, 1, 1))])
+    scene = Scene(size=(1024, 1024); lights=[AmbientLight(RGBf(0.7, 0.6, 0.6)), PointLight(Vec3f(0, 1, 0.5), RGBf(1.3, 1.3, 1.3))])
     cam3d!(scene)
-    mesh!(scene, catmesh, color=load(Makie.assetpath("diffusemap.png")), material=plastic)
-    mesh!(scene, Sphere(Point3f(0, 0, 2), 1f0), material=glass)
+    mesh!(scene, catmesh, color=load(Makie.assetpath("diffusemap.png")))
     center!(scene)
     render_scene(scene)
 end
@@ -205,5 +208,7 @@ begin
     zs = [cos(x) * sin(y) for x in xs, y in ys]
     surface!(scene, xs, ys, zs)
     center!(scene)
-    render_scene(scene)
+    render_scene(scene) do cam
+
+    end
 end

docs/code/caustic_glass.jl

@@ -1,6 +1,7 @@
-using GeometryBasics
-using LinearAlgebra
+using GeometryBasics, ImageShow
+using LinearAlgebra, Makie
 using Trace, FileIO, MeshIO
+
 begin
     glass = Trace.GlassMaterial(
         Trace.ConstantTexture(Trace.RGBSpectrum(1f0)),
@@ -16,84 +17,21 @@ begin
         Trace.ConstantTexture(0.010408001f0),
         true,
     )
-
-    model = load(joinpath(@__DIR__, "..", "src", "assets",  "models", "caustic-glass.ply"))
-
-
-    triangles = Trace.create_triangle_mesh(
-        model, Trace.ShapeCore(Trace.translate(Vec3f(5, -1.49, -100)), false),
-    )
-
-    floor_triangles = Trace.create_triangle_mesh(
-        Trace.ShapeCore(Trace.translate(Vec3f(-10, 0, -87)), false),
-        UInt32[1, 2, 3, 1, 4, 3],
-        [
-            Point3f(0, 0, 0), Point3f(0, 0, -30),
-            Point3f(30, 0, -30), Point3f(30, 0, 0),
-        ],
-        [
-            Trace.Normal3f(0, 1, 0), Trace.Normal3f(0, 1, 0),
-            Trace.Normal3f(0, 1, 0), Trace.Normal3f(0, 1, 0),
-        ],
-    )
-
-    primitives = Trace.GeometricPrimitive[]
-    for t in triangles
-        push!(primitives, Trace.GeometricPrimitive(t, glass))
+    scene = Scene(size=(1024, 1024); lights=[
+        AmbientLight(RGBf(1, 1, 1)),
+        PointLight(Vec3f(4, 4, 10), RGBf(150, 150, 150)),
+        PointLight(Vec3f(-3, 10, 2.5), RGBf(60, 60, 60)),
+        PointLight(Vec3f(0, 3, 0.5), RGBf(40, 40, 40))
+    ])
+    cam3d!(scene)
+    cm = scene.camera_controls
+    mesh!(scene, model, material=glass)
+    mini, maxi = extrema(Rect3f(decompose(Point, model)))
+    floorrect = Rect3f(Vec3f(-10, mini[2], -10), Vec3f(20, -1, 20))
+    mesh!(scene, floorrect, material=plastic)
+    center!(scene)
+    update_cam!(scene, Vec3f(-1.6, 6.2, 0.2), Vec3f(-3.6, 2.5, 2.4), Vec3f(0, 1, 0))
+    render_scene(scene) do camera
+        Trace.SPPMIntegrator(camera, 0.075f0, 5, 100)
     end
-    for t in floor_triangles
-        push!(primitives, Trace.GeometricPrimitive(t, plastic))
-    end
-
-    bvh = Trace.BVHAccel(map(identity, primitives), 1);
-
-    from, to = Point3f(0, 2, 0), Point3f(-5, 0, 5)
-    cone_angle, cone_δ_angle = 30f0, 10f0
-    dir = normalize(Vec3f(to - from))
-    dir, du, dv = Trace.coordinate_system(dir)
-
-    dir_to_z = Trace.Transformation(transpose(Mat4f(
-        du[1], du[2], du[3], 0f0,
-        dv[1], dv[2], dv[3], 0f0,
-        dir[1], dir[2], dir[3], 0f0,
-        0f0, 0f0, 0f0, 1f0,
-    )))
-    light_to_world = (
-        Trace.translate(Vec3f(4.5, 0, -101))
-        * Trace.translate(Vec3f(from))
-        * inv(dir_to_z)
-    )
-
-    lights = [
-            Trace.SpotLight(
-                light_to_world, Trace.RGBSpectrum(100f0),
-                cone_angle, cone_angle - cone_δ_angle,
-        ),
-        Trace.AmbientLight(Trace.RGBSpectrum(0.5f0)),
-    ]
-
-    scene = Trace.Scene(lights, bvh)
-
-    n_samples = 8
-    ray_depth = 5
-
-    look_point = Point3f(-3, 0, 0)
-    screen = Trace.Bounds2(Point2f(-1f0), Point2f(1f0))
-    filter = Trace.LanczosSincFilter(Point2f(1f0), 3f0)
-    resolution = Point2f(1024)
-    ir = Int64.(resolution)
-    film = Trace.Film(
-        resolution, Trace.Bounds2(Point2f(0), Point2f(1)),
-        filter, 1f0, 1f0,
-        "./scenes/caustics-sppm-$(ir[1])x$(ir[2]).png",
-    )
-    camera = Trace.PerspectiveCamera(
-        Trace.look_at(Point3f(0, 4, 4), look_point, Vec3f(0, 1, 0)),
-        screen, 0f0, 1f0, 0f0, 1f6, 90f0, film,
-    )
-    integrator = Trace.SPPMIntegrator(camera, 0.075f0, ray_depth, 1)
-    @time integrator(scene)
-    reverse(film.framebuffer, dims=1)
 end
-mean(decompose(Point, Rect3f(model)))
-Rect3f(model)

src/lights/point.jl

@@ -24,6 +24,10 @@ struct PointLight{S<:Spectrum} <: Light
     end
 end
 
+function PointLight(position, i::S) where S<:Spectrum
+    PointLight(translate(Vec3f(position)), i)
+end
+
 """
 Compute radiance arriving at `ref.p` interaction point at `ref.time` time
 due to that light, assuming there are no occluding objects between them.

src/materials/bsdf.jl

@@ -136,7 +136,7 @@ function sample_f(
         Vec3f(0f0), RGBSpectrum(0f0), 0f0, BSDF_NONE,
     )
     component = min(
-        max(1, Int64(ceil(u[1] * matching_components))),
+        max(1, ceil(Int64, u[1] * matching_components)),
         matching_components,
     )
     # Get BxDF for chosen component.
@@ -155,7 +155,7 @@ function sample_f(
             end
         end
     end
-    @real_assert bxdf ≢ nothing "n bxdfs $(b.n_bxdfs), component $component, count $count"
+    @real_assert !isnothing(bxdf) "n bxdfs $(b.n_bxdfs), component $component, count $count"
     # Remap BxDF sample u to [0, 1)^2.
     u_remapped = Point2f(
         min(u[1] * matching_components - component, 1f0), u[2],
@@ -208,7 +208,7 @@ end
 function compute_pdf(
         b::BSDF, wo_world::Vec3f, wi_world::Vec3f, flags::UInt8,
     )::Float32
-    b.n_bxdfs == 0 && return 0f0
+    b.bxdfs.last == 0 && return 0f0
     wo = world_to_local(b, wo_world)
     wo[3] ≈ 0f0 && return 0f0
     wi = world_to_local(b, wi_world)

src/materials/material.jl

@@ -14,7 +14,7 @@ Base.Base.@propagate_inbounds  function matte_material(m::UberMaterial, si::Surf
     # TODO perform bump mapping
     # Evaluate textures and create BSDF.
     r = clamp(m.Kd(si))
-    is_black(r) && return BSDF()
+    is_black(r) && return BSDF(si)
     σ = clamp(m.σ(si), 0f0, 90f0)
     lambertian = (σ ≈ 0.0f0)
     return BSDF(si, LambertianReflection(lambertian, r), OrenNayar(!lambertian, r, σ))
@@ -28,7 +28,6 @@ end
 
 Base.Base.@propagate_inbounds function mirror_material(m::UberMaterial, si::SurfaceInteraction, ::Bool, transport)
     r = clamp(m.Kr(si))
-    is_black(r) && return BSDF()
     return BSDF(si, SpecularReflection(!is_black(r), r, FresnelNoOp()))
 end
 

src/shapes/Shape.jl

@@ -5,15 +5,18 @@ struct ShapeCore
     transform_swaps_handedness::Bool
 
     function ShapeCore(
-        object_to_world::Transformation, reverse_orientation::Bool,
-    )
+            object_to_world::Transformation, reverse_orientation::Bool = false,
+        )
         new(
             object_to_world, inv(object_to_world), reverse_orientation,
             swaps_handedness(object_to_world),
         )
     end
 end
 
+ShapeCore(reverse::Bool=false) = ShapeCore(Transformation(), reverse)
+ShapeCore(offset::Vec3, reverse::Bool=false) = ShapeCore(translate(Vec3f(offset)), reverse)
+
 function world_bound(s::AbstractShape)::Bounds3
     s.core.object_to_world(object_bound(s))
 end