[ViewVC] Diff of: Development/ray/src/rt/pmapmat.c

Comparing ray/src/rt/pmapmat.c (file contents):
Revision 2.2 by rschregle, Wed Apr 22 15:50:44 2015 UTC vs.
Revision 2.6 by greg, Fri May 22 10:27:40 2015 UTC

+   Roland Schregle (roland.schregle@{hslu.ch, gmail.com})
+   (c) Fraunhofer Institute for Solar Energy Systems,
-<
+       Lucerne University of Applied Sciences & Arts
->
+   (c) Lucerne University of Applied Sciences and Arts,
->
+   supported by the Swiss National Science Foundation (SNSF, #147053)
+   ==================================================================
+   $Id$
+   int      niter, i = 0;
+   /* Set up sample coordinates */
-<
+   do {
-<
+      v [0] = v [1] = v [2] = 0;
-<
+      v [i++] = 1;
-<
+      fcross(u, v, nd -> pnorm);
-<
+   } while (normalize(u) < FTINY);
-<
->
+   getperpendicular(u, nd -> pnorm, 1);
+   fcross(v, nd -> pnorm, u);
+   if (nd -> specfl & SP_REFL) {
+   int         i = 0;
+   /* Set up sample coordinates */
-<
+   do {
-<
+      v [0] = v [1] = v [2] = 0;
-<
+      v [i++] = 1;
-<
+      fcross(u, v, normal);
-<
+   } while (normalize(u) < FTINY);
-<
->
+   getperpendicular(u, normal, 1);
+   fcross(v, normal, u);
+   /* Convert theta & phi to cartesian */
+      nd.specfl |= SP_FLAT;
+   /* Perturb normal */
-<
+   if ((hastexture = DOT(rayIn -> pert, rayIn -> pert)) > sqr(FTINY))
->
+   if ((hastexture = (DOT(rayIn -> pert, rayIn -> pert) > sqr(FTINY)) ))
+      nd.pdot = raynormal(nd.pnorm, rayIn);
+   else {
+      VCOPY(nd.pnorm, rayIn -> ron);
+   /* get modifiers */
+   raytexture(rayIn, mat -> omod);
-<
+   if ((hastexture = DOT(rayIn -> pert, rayIn -> pert)) > FTINY * FTINY)
->
+   if ((hastexture = (DOT(rayIn -> pert, rayIn -> pert) > FTINY * FTINY)))
+      /* Perturb normal */
+      cos1 = raynormal(dnorm, rayIn);
+   else {
+   /* reorient if necessary */
+   if (rayIn -> rod < 0)
+      flipsurface(rayIn);
-<
+   if ((hastexture = DOT(rayIn -> pert, rayIn -> pert)) > FTINY * FTINY)
->
+   if ((hastexture = (DOT(rayIn -> pert, rayIn -> pert) > FTINY * FTINY) ))
+      pdot = raynormal(pnorm, rayIn);
+   else {
+      VCOPY(pnorm, rayIn -> ron);
+#else
-+
+/*
-+
+   The following code is
-+
+   (c) Lucerne University of Applied Sciences and Arts,
-+
+   supported by the Swiss National Science Foundation (SNSF, #147053)
-+
+*/
-+
+static int bsdfPhotonScatter (OBJREC *mat, RAY *rayIn)
+/* Generate new photon ray for BSDF modifier and recurse. */
+   BSDFDAT      nd;
+   RAY      rayOut;
+   COLOR    bsdfRGB;
-+
+   int      transmitted;
+   double   prDiff, ptDiff, prDiffSD, ptDiffSD, prSpecSD, ptSpecSD,
-<
+            albedo, xi, xi2;
-<
+   const double patAlb = colorAvg(rayIn -> pcol);
->
+            albedo, xi;
->
+   const double patAlb = bright(rayIn -> pcol);
+   /* Following code adapted from m_bsdf() */
+   /* Check arguments */
+        nd.thick = evalue(mf -> ep [0]);
+        if ((-FTINY <= nd.thick) & (nd.thick <= FTINY))
+                nd.thick = .0;
-<
->
+#if 0
+   if (nd.thick != .0 || (!hitFront && !backvis)) {
+      /* Proxy geometry present, so use it instead and transfer ray */
+      photonRay(rayIn, &rayOut, PMAP_XFER, NULL);
+      return 0;
-<
->
+#endif
+   /* Get BSDF data */
+   nd.sd = loadBSDF(mat -> oargs.sarg [1]);
+   if (prDiff + ptDiff + prDiffSD + ptDiffSD > FTINY)
+      addPhotons(rayIn);
-<
+   xi = xi2 = pmapRandom(rouletteState);
->
+   xi = pmapRandom(rouletteState);
+   if (xi > albedo)
+      /* Absorbtion */
+      return 0;
-+
+   transmitted = 0;
-+
+   if ((xi -= prDiff) <= 0) {
+      /* Diffuse reflection (extra component in material def) */
+      photonRay(rayIn, &rayOut, PMAP_DIFFREFL, nd.rdiff);
+   else if ((xi -= ptDiff) <= 0) {
+      /* Diffuse transmission (extra component in material def) */
+      flipsurface(rayIn);
-+
+      nd.thick = -nd.thick;
+      photonRay(rayIn, &rayOut, PMAP_DIFFTRANS, nd.tdiff);
-<
+      diffPhotonScatter(nd.pnorm, &rayOut);
->
+      diffPhotonScatter(nd.pnorm, &rayOut);
->
+      transmitted = 1;
-<
->
+   else {   /* Sample SDF */
+      if ((xi -= prDiffSD) <= 0) {
+         /* Diffuse SDF reflection (constant component) */
-<
+         if ((err = SDsampBSDF(&bsdfVal, nd.vray, xi2,
->
+         if ((err = SDsampBSDF(&bsdfVal, nd.vray, pmapRandom(scatterState),
+                               SDsampDf | SDsampR, nd.sd)))
+            objerror(mat, USER, transSDError(err));
+      else if ((xi -= ptDiffSD) <= 0) {
+         /* Diffuse SDF transmission (constant component) */
-<
+         if ((err = SDsampBSDF(&bsdfVal, nd.vray, xi2,
->
+         if ((err = SDsampBSDF(&bsdfVal, nd.vray, pmapRandom(scatterState),
+                               SDsampDf | SDsampT, nd.sd)))
+            objerror(mat, USER, transSDError(err));
+         multcolor(bsdfRGB, rayIn -> pcol);
+         addcolor(bsdfRGB, nd.tdiff);
+         flipsurface(rayIn);  /* Necessary? */
-<
+         photonRay(rayIn, &rayOut, PMAP_DIFFTRANS, bsdfRGB);
->
+         nd.thick = -nd.thick;
->
+         photonRay(rayIn, &rayOut, PMAP_DIFFTRANS, bsdfRGB);
->
+         transmitted = 1;
+      else if ((xi -= prSpecSD) <= 0) {
+         /* Non-diffuse ("specular") SDF reflection */
-<
+         if ((err = SDsampBSDF(&bsdfVal, nd.vray, xi2,
->
+         if ((err = SDsampBSDF(&bsdfVal, nd.vray, pmapRandom(scatterState),
+                               SDsampSp | SDsampR, nd.sd)))
+            objerror(mat, USER, transSDError(err));
+      else {
+         /* Non-diffuse ("specular") SDF transmission */
-<
+         if ((err = SDsampBSDF(&bsdfVal, nd.vray, xi2,
->
+         if ((err = SDsampBSDF(&bsdfVal, nd.vray, pmapRandom(scatterState),
+                               SDsampSp | SDsampT, nd.sd)))
+            objerror(mat, USER, transSDError(err));
+         ccy2rgb(&bsdfVal.spec, bsdfVal.cieY, bsdfRGB);
+         multcolor(bsdfRGB, rayIn -> pcol);
+         flipsurface(rayIn);  /* Necessary? */
-+
+         nd.thick = -nd.thick;
+         photonRay(rayIn, &rayOut, PMAP_SPECTRANS, bsdfRGB);
-+
+         transmitted = 1;
+      /* Xform outgoing dir to world coords */
+   /* Clean up */
+   SDfreeCache(nd.sd);
-+
-+
+   /* Need to offset ray origin to get past detail geometry? */
-+
+   if (transmitted && nd.thick != 0)
-+
+        VSUM(rayOut.rorg, rayOut.rorg, rayIn -> ron, -nd.thick);
+   tracePhoton(&rayOut);
+   return 0;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing ray/src/rt/pmapmat.c (file contents): Revision 2.2 by rschregle, Wed Apr 22 15:50:44 2015 UTC vs. Revision 2.6 by greg, Fri May 22 10:27:40 2015 UTC

Diff Legend

Comparing ray/src/rt/pmapmat.c (file contents):
Revision 2.2 by rschregle, Wed Apr 22 15:50:44 2015 UTC vs.
Revision 2.6 by greg, Fri May 22 10:27:40 2015 UTC