solstice-solver

commit 7dcb470663b0052fc03212a8a146d08a83af446b
parent 998abd07d9867e6cfeb298c644bc2bd2d2d0e67f
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 19 Apr 2017 10:39:12 +0200

Use the quadric position in the path-tracer

Diffstat:
M
src/ssol_draw_draft.c
 | 
10
+++++-----
M
src/ssol_draw_pt.c
 | 
18
+++++++++++-------

2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/ssol_draw_draft.c b/src/ssol_draw_draft.c
@@ -59,7 +59,7 @@ Li
     size_t isshape;
     double o[3], wi[3];
     double N[3]={0};
-    double cos_Ns_wi;
+    double cos_N_wi;
 
     /* Retrieve the hit shaded shape */
     inst = *htable_instance_find(&scn->instances_rt, &hit.prim.inst_id);
@@ -86,11 +86,11 @@ Li
     }
 
     surface_fragment_setup(&frag, o, wi, N, &hit.prim, hit.uv);
-    material_shade_normal(mtl, &frag, 1/*TODO wavelength*/, frag.Ns);
+    material_shade_normal(mtl, &frag, 1/*TODO wavelength*/, N);
 
-    ASSERT(d3_is_normalized(frag.Ns));
-    cos_Ns_wi = d3_dot(frag.Ns, d3_minus(wi, wi));
-    d3_splat(val, MMAX(cos_Ns_wi, 0));
+    ASSERT(d3_is_normalized(N));
+    cos_N_wi = d3_dot(N, d3_minus(wi, wi));
+    d3_splat(val, MMAX(cos_N_wi, 0));
   }
 }
 
diff --git a/src/ssol_draw_pt.c b/src/ssol_draw_pt.c
@@ -203,10 +203,10 @@ Li(struct ssol_scene* scn,
     }
 
     surface_fragment_setup(&frag, o, wo, N, &hit.prim, hit.uv);
-    material_shade_normal(mtl, &frag, 1/*TODO wlen*/, frag.Ns);
+    material_shade_normal(mtl, &frag, 1/*TODO wlen*/, N);
 
     /* Shaded normal may look backward the outgoing direction */
-    if(d3_dot(frag.Ns, wo) > 0) break;
+    if(d3_dot(N, wo) > 0) break;
 
     SSF(bsdf_clear(ctx->bsdf));
     res = material_setup_bsdf
@@ -217,17 +217,21 @@ Li(struct ssol_scene* scn,
     ray_data.prim_from = hit.prim;
     ray_data.inst_from = inst;
     ray_data.side_from = side;
-    f3_mulf(ray_dir, ray_dir, hit.distance);
+    switch(sshape->shape->type) {
+      case SHAPE_MESH: f3_mulf(ray_dir, ray_dir, hit.distance); break;
+      case SHAPE_PUNCHED: f3_mulf(ray_dir, ray_dir, (float)ray_data.dst); break;
+      default: FATAL("Unreachable code"); break;
+    }
     f3_add(ray_org, ray_org, ray_dir);
 
     d3_minus(wo, wo);
     if(scn->sun) {
       L += throughput * sun_lighting
-        (scn->sun, view, &ray_data, ctx->bsdf, wo, frag.Ns, ray_org);
+        (scn->sun, view, &ray_data, ctx->bsdf, wo, N, ray_org);
     }
 
     /* Sampling a bounce direction */
-    R = ssf_bsdf_sample(ctx->bsdf, ctx->rng, wo, frag.Ns, wi, &type, &pdf);
+    R = ssf_bsdf_sample(ctx->bsdf, ctx->rng, wo, N, wi, &type, &pdf);
     ASSERT(0 <= R && R <= 1);
 
     /* Due to the shading normal, the sampled direction may point in the wrong
@@ -242,10 +246,10 @@ Li(struct ssol_scene* scn,
     if(type & SSF_TRANSMISSION) material_get_next_medium(mtl, &medium, &medium);
 
     if(!russian_roulette) {
-      throughput *= fabs(d3_dot(wi, frag.Ns)) * R;
+      throughput *= fabs(d3_dot(wi, N)) * R;
     } else {
       if(ssp_rng_canonical(ctx->rng) >= R) break;
-      throughput *= fabs(d3_dot(wi, frag.Ns));
+      throughput *= fabs(d3_dot(wi, N));
     }
 
     if(throughput <= 0) break;