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

Comparing ray/src/rt/pmapmat.c (file contents):
Revision 2.15 by rschregle, Tue Mar 20 19:55:33 2018 UTC vs.
Revision 2.20 by rschregle, Thu Dec 6 12:21:38 2018 UTC

#	Line 34 \| Line 34 \| static const char RCSid[] = "$Id$";
34		#define SP_FLAT 010
35		#define SP_BADU 040
36		#define MLAMBDA 500
37	<	#define RINDEX 1.52
37	>	#define RINDEX 1.52
38		#define FRESNE(ci) (exp(-5.85*(ci)) - 0.00287989916)
39
40
#	Line 46 \| Line 46 \| typedef struct {
46		COLOR mcolor, scolor;
47		FVECT vrefl, prdir, pnorm;
48		double alpha2, rdiff, rspec, trans, tdiff, tspec, pdot;
49	<	} NORMDAT;
49	>	} NORMDAT;
50
51		typedef struct {
52		OBJREC *mp;
#	Line 55 \| Line 55 \| typedef struct {
55		COLOR mcolor, scolor;
56		FVECT vrefl, prdir, u, v, pnorm;
57		double u_alpha, v_alpha, rdiff, rspec, trans, tdiff, tspec, pdot;
58	<	} ANISODAT;
58	>	} ANISODAT;
59
60		typedef struct {
61		OBJREC *mp;
62	<	RAY *pr;
63	<	FVECT pnorm;
64	<	FVECT vray;
65	<	double sr_vpsa [2];
66	<	RREAL toloc [3][3];
67	<	RREAL fromloc [3][3];
68	<	double thick;
62	>	RAY *pr;
63	>	DATARRAY *dp;
64	>	COLOR mcolor;
65	>	COLOR rdiff;
66	>	COLOR tdiff;
67	>	double rspec;
68	>	double trans;
69	>	double tspec;
70	>	FVECT pnorm;
71	>	double pdot;
72	>	} BRDFDAT;
73	>
74	>	typedef struct {
75	>	OBJREC *mp;
76	>	RAY *pr;
77	>	FVECT pnorm;
78	>	FVECT vray;
79	>	double sr_vpsa [2];
80	>	RREAL toloc [3][3];
81	>	RREAL fromloc [3][3];
82	>	double thick;
83		SDData *sd;
84		COLOR runsamp;
85		COLOR rdiff;
#	Line 206 \| Line 220 \| *static int isoSpecPhotonScatter (NORMDAT nd, RAY ray*
220		int niter, i = 0;
221
222		/* Set up sample coordinates */
223	<	getperpendicular(u, nd -> pnorm, 1);
223	>	getperpendicular(u, nd -> pnorm, 1);
224		fcross(v, nd -> pnorm, u);
225
226		if (nd -> specfl & SP_REFL) {
#	Line 240 \| Line 254 \| *static int isoSpecPhotonScatter (NORMDAT nd, RAY ray*
254		cosp = cos(d);
255		sinp = sin(d);
256		d2 = pmapRandom(scatterState);
257	<	d = d2 <= FTINY ? 1 : sqrt(-log(d2) * nd -> alpha2);
257	>	d = d2 <= FTINY ? 1 : sqrt(-log(d2) * nd -> alpha2);
258
259		for (i = 0; i < 3; i++)
260		rayOut -> rdir [i] = nd -> prdir [i] +
#	Line 261 \| Line 275 \| *static int isoSpecPhotonScatter (NORMDAT nd, RAY ray*
275		static void diffPhotonScatter (FVECT normal, RAY* rayOut)
276		/* Generate cosine-weighted direction for diffuse ray */
277		{
278	<	const RREAL cosThetaSqr = pmapRandom(scatterState),
278	>	const RREAL cosThetaSqr = pmapRandom(scatterState),
279		cosTheta = sqrt(cosThetaSqr),
280	<	sinTheta = sqrt(1 - cosThetaSqr),
281	<	phi = 2 * PI * pmapRandom(scatterState),
280	>	sinTheta = sqrt(1 - cosThetaSqr),
281	>	phi = 2 * PI * pmapRandom(scatterState),
282		du = cos(phi) * sinTheta, dv = sin(phi) * sinTheta;
283		FVECT u, v;
284		int i = 0;
#	Line 421 \| Line 435 \| *static int normalPhotonScatter (OBJREC mat, RAY rayI*
435
436		if (hastexture) {
437		/* Perturb */
438	<	for (i = 0; i < 3; i++)
438	>	for (i = 0; i < 3; i++)
439		nd.prdir [i] = rayIn -> rdir [i] - rayIn -> pert [i];
440
441	<	if (DOT(nd.prdir, rayIn -> ron) < -FTINY)
441	>	if (DOT(nd.prdir, rayIn -> ron) < -FTINY)
442		normalize(nd.prdir);
443		else VCOPY(nd.prdir, rayIn -> rdir);
444		}
445		else VCOPY(nd.prdir, rayIn -> rdir);
446
447		if ((nd.specfl & (SP_TRAN \| SP_PURE)) == (SP_TRAN \| SP_PURE))
448	<	/* Perfect specular transmission */
448	>	/* Perfect specular transmission */
449		VCOPY(rayOut.rdir, nd.prdir);
450	<	else if (!isoSpecPhotonScatter(&nd, &rayOut))
450	>	else if (!isoSpecPhotonScatter(&nd, &rayOut))
451		return 0;
452
453	<	photonRay(rayIn, &rayOut, PMAP_SPECTRANS, nd.mcolor);
453	>	photonRay(rayIn, &rayOut, PMAP_SPECTRANS, nd.mcolor);
454		}
455
456		else if (xi > (albedo -= prdiff)) {
#	Line 469 \| Line 483 \| *static int normalPhotonScatter (OBJREC mat, RAY rayI*
483		static void getacoords (ANISODAT *np)
484		/* Set up coordinate system for anisotropic sampling; cloned from aniso.c */
485		{
486	<	MFUNC *mf;
487	<	int i;
486	>	MFUNC *mf;
487	>	int i;
488
489	<	mf = getfunc(np->mp, 3, 0x7, 1);
490	<	setfunc(np->mp, np->rp);
491	<	errno = 0;
492	<
493	<	for (i = 0; i < 3; i++)
494	<	np->u[i] = evalue(mf->ep[i]);
495	<
489	>	mf = getfunc(np->mp, 3, 0x7, 1);
490	>	setfunc(np->mp, np->rp);
491	>	errno = 0;
492	>
493	>	for (i = 0; i < 3; i++)
494	>	np->u[i] = evalue(mf->ep[i]);
495	>
496		if ((errno == EDOM) \| (errno == ERANGE)) {
497		objerror(np->mp, WARNING, "compute error");
498		np->specfl \|= SP_BADU;
#	Line 488 \| Line 502 \| *static void getacoords (ANISODAT np)**
502		if (mf->fxp != &unitxf)
503		multv3(np->u, np->u, mf->fxp->xfm);
504
505	<	fcross(np->v, np->pnorm, np->u);
506	<
507	<	if (normalize(np->v) == 0.0) {
508	<	objerror(np->mp, WARNING, "illegal orientation vector");
509	<	np->specfl \|= SP_BADU;
510	<	return;
505	>	fcross(np->v, np->pnorm, np->u);
506	>
507	>	if (normalize(np->v) == 0.0) {
508	>	objerror(np->mp, WARNING, "illegal orientation vector");
509	>	np->specfl \|= SP_BADU;
510	>	return;
511		}
512
513		fcross(np->u, np->v, np->pnorm);
#	Line 519 \| Line 533 \| static int anisoSpecPhotonScatter (ANISODAT nd, RAY
533		if (rayOut -> rtype & TRANS) {
534		/* Specular transmission */
535
536	<	if (DOT(rayIn -> pert, rayIn -> pert) <= FTINY * FTINY)
536	>	if (DOT(rayIn -> pert, rayIn -> pert) <= sqr(FTINY))
537		VCOPY(nd -> prdir, rayIn -> rdir);
538		else {
539		/* perturb */
#	Line 555 \| Line 569 \| static int anisoSpecPhotonScatter (ANISODAT nd, RAY
569		}
570		}
571
572	<	return 0;
572	>	return 0;
573		}
574
575		else {
#	Line 573 \| Line 587 \| static int anisoSpecPhotonScatter (ANISODAT nd, RAY
587		d = d2 <= FTINY ? 1
588		: sqrt(-log(d2) /
589		(sqr(cosp) / sqr(nd -> u_alpha) +
590	<	sqr(sinp) / (nd -> v_alpha * nd -> v_alpha)));
590	>	sqr(sinp) / (nd->v_alpha * nd->v_alpha)));
591
592		for (i = 0; i < 3; i++)
593		h [i] = nd -> pnorm [i] +
#	Line 750 \| Line 764 \| static int dielectricPhotonScatter (OBJREC mat, RAY
764		/* get modifiers */
765		raytexture(rayIn, mat -> omod);
766
767	<	if ((hastexture = (DOT(rayIn -> pert, rayIn -> pert) > FTINY * FTINY)))
767	>	if ((hastexture = (DOT(rayIn -> pert, rayIn -> pert) > sqr(FTINY))))
768		/* Perturb normal */
769		cos1 = raynormal(dnorm, rayIn);
770		else {
#	Line 760 \| Line 774 \| static int dielectricPhotonScatter (OBJREC mat, RAY
774
775		/* index of refraction */
776		nratio = mat -> otype ==
777	<	MAT_DIELECTRIC ? mat -> oargs.farg [3] + mat -> oargs.farg [4] / MLAMBDA
778	<	: mat -> oargs.farg [3] / mat -> oargs.farg [7];
777	>	MAT_DIELECTRIC ? mat->oargs.farg[3] + mat->oargs.farg[4] / MLAMBDA
778	>	: mat->oargs.farg[3] / mat->oargs.farg[7];
779
780		if (cos1 < 0) {
781		/* inside */
#	Line 838 \| Line 852 \| static int dielectricPhotonScatter (OBJREC mat, RAY
852		for (i = 0; i < 3; i++)
853		rayOut.rdir [i] = nratio * rayIn -> rdir [i] + d1 * dnorm [i];
854
855	<	if (hastexture && DOT(rayOut.rdir, rayIn -> ron) * hastexture >= -FTINY) {
855	>	if (hastexture && DOT(rayOut.rdir, rayIn->ron)*hastexture >= -FTINY) {
856		d1 *= hastexture;
857
858		for (i = 0; i < 3; i++)
#	Line 857 \| Line 871 \| static int dielectricPhotonScatter (OBJREC mat, RAY
871		photonRay(rayIn, &rayOut, PMAP_SPECREFL, NULL);
872		VSUM(rayOut.rdir, rayIn -> rdir, dnorm, 2 * cos1);
873
874	<	if (hastexture && DOT(rayOut.rdir, rayIn -> ron) * hastexture <= FTINY)
874	>	if (hastexture && DOT(rayOut.rdir, rayIn->ron) * hastexture <= FTINY)
875		for (i = 0; i < 3; i++)
876		rayOut.rdir [i] = rayIn -> rdir [i] +
877		2 * rayIn -> rod * rayIn -> ron [i];
#	Line 897 \| Line 911 \| *static int glassPhotonScatter (OBJREC mat, RAY rayIn*
911		/* reorient if necessary */
912		if (rayIn -> rod < 0)
913		flipsurface(rayIn);
914	<	if ((hastexture = (DOT(rayIn -> pert, rayIn -> pert) > FTINY * FTINY) ))
914	>	if ((hastexture = (DOT(rayIn -> pert, rayIn -> pert) > sqr(FTINY))))
915		pdot = raynormal(pnorm, rayIn);
916		else {
917		VCOPY(pnorm, rayIn -> ron);
#	Line 979 \| Line 993 \| *static int aliasPhotonScatter (OBJREC mat, RAY rayIn*
993		/* Transfer photon scattering to alias target */
994		{
995		OBJECT aliasObj;
996	<	OBJREC aliasRec;
996	>	OBJREC aliasRec, *aliasPtr;
997
998		/* Straight replacement? */
999		if (!mat -> oargs.nsargs) {
#	Line 996 \| Line 1010 \| *static int aliasPhotonScatter (OBJREC mat, RAY rayIn*
1010		if (mat -> oargs.nsargs != 1)
1011		objerror(mat, INTERNAL, "bad # string arguments");
1012
1013	<	aliasObj = lastmod(objndx(mat), mat -> oargs.sarg [0]);
1014	<
1001	<	if (aliasObj < 0)
1002	<	objerror(mat, USER, "bad reference");
1003	<
1004	<	memcpy(&aliasRec, objptr(aliasObj), sizeof(OBJREC));
1013	>	aliasPtr = mat;
1014	>	aliasObj = objndx(aliasPtr);
1015
1016	+	/* Follow alias trail */
1017	+	do {
1018	+	aliasObj = aliasPtr -> oargs.nsargs == 1
1019	+	? lastmod(aliasObj, aliasPtr -> oargs.sarg [0])
1020	+	: aliasPtr -> omod;
1021	+	if (aliasObj < 0)
1022	+	objerror(aliasPtr, USER, "bad reference");
1023	+
1024	+	aliasPtr = objptr(aliasObj);
1025	+	} while (aliasPtr -> otype == MOD_ALIAS);
1026	+
1027	+	/* Copy alias object */
1028	+	aliasRec = *aliasPtr;
1029	+
1030		/* Substitute modifier */
1031		aliasRec.omod = mat -> omod;
1032
1033		/* Replacement scattering routine */
1034		photonScatter [aliasRec.otype] (&aliasRec, rayIn);
1035	+
1036	+	#if 0
1037	+	/* Avoid potential memory leak? */
1038	+	if (aliasRec.os != aliasPtr -> os) {
1039	+	if (aliasObj -> os)
1040	+	free_os(aliasObj);
1041	+	aliasPtr -> os = aliasRec.os;
1042	+	}
1043	+	#endif
1044	+
1045		return 0;
1046		}
1047
#	Line 1036 \| Line 1070 \| *static int clipPhotonScatter (OBJREC mat, RAY rayIn)*
1070		continue;
1071
1072		if ((mod = lastmod(obj, mat -> oargs.sarg [i])) == OVOID) {
1073	<	sprintf(errmsg, "unknown modifier \"%s\"", mat -> oargs.sarg [i]);
1073	>	sprintf(errmsg, "unknown modifier \"%s\"", mat->oargs.sarg[i]);
1074		objerror(mat, WARNING, errmsg);
1075		continue;
1076		}
#	Line 1232 \| Line 1266 \| *static int mx_dataPhotonScatter (OBJREC mat, RAY ray*
1266		if (!strcmp(mat -> oargs.sarg [i], VOIDID))
1267		mod [i] = OVOID;
1268		else if ((mod [i] = lastmod(obj, mat -> oargs.sarg [i])) == OVOID) {
1269	<	sprintf(errmsg, "undefined modifier \"%s\"", mat -> oargs.sarg [i]);
1269	>	sprintf(errmsg, "undefined modifier \"%s\"", mat->oargs.sarg[i]);
1270		objerror(mat, USER, errmsg);
1271		}
1272
#	Line 1297 \| Line 1331 \| *static int mx_pdataPhotonScatter (OBJREC mat, RAY ra*
1331		if (!strcmp(mat -> oargs.sarg [i], VOIDID))
1332		mod [i] = OVOID;
1333		else if ((mod [i] = lastmod(obj, mat -> oargs.sarg [i])) == OVOID) {
1334	<	sprintf(errmsg, "undefined modifier \"%s\"", mat -> oargs.sarg [i]);
1334	>	sprintf(errmsg, "undefined modifier \"%s\"", mat->oargs.sarg[i]);
1335		objerror(mat, USER, errmsg);
1336		}
1337
#	Line 1359 \| Line 1393 \| *static int mx_funcPhotonScatter (OBJREC mat, RAY ray*
1393		if (!strcmp(mat -> oargs.sarg [i], VOIDID))
1394		mod [i] = OVOID;
1395		else if ((mod [i] = lastmod(obj, mat -> oargs.sarg [i])) == OVOID) {
1396	<	sprintf(errmsg, "undefined modifier \"%s\"", mat -> oargs.sarg [i]);
1396	>	sprintf(errmsg, "undefined modifier \"%s\"", mat->oargs.sarg[i]);
1397		objerror(mat, USER, errmsg);
1398		}
1399
#	Line 1417 \| Line 1451 \| *static int pattexPhotonScatter (OBJREC mat, RAY rayI*
1451
1452
1453
1454	+	static int setbrdfunc(BRDFDAT *bd)
1455	+	/* Set up brdf function and variables; ripped off from m_brdf.c */
1456	+	{
1457	+	FVECT v;
1458	+
1459	+	if (setfunc(bd -> mp, bd -> pr) == 0)
1460	+	return 0;
1461	+
1462	+	/* (Re)Assign func variables */
1463	+	multv3(v, bd -> pnorm, funcxf.xfm);
1464	+	varset("NxP", '=', v [0] / funcxf.sca);
1465	+	varset("NyP", '=', v [1] / funcxf.sca);
1466	+	varset("NzP", '=', v [2] / funcxf.sca);
1467	+	varset("RdotP", '=',
1468	+	bd -> pdot <= -1. ? -1. : bd -> pdot >= 1. ? 1. : bd -> pdot);
1469	+	varset("CrP", '=', colval(bd -> mcolor, RED));
1470	+	varset("CgP", '=', colval(bd -> mcolor, GRN));
1471	+	varset("CbP", '=', colval(bd -> mcolor, BLU));
1472	+
1473	+	return 1;
1474	+	}
1475	+
1476	+
1477	+
1478	+	static int brdfPhotonScatter (OBJREC mat, RAY rayIn)
1479	+	/* Generate new photon ray for BRTDfunc material and recurse. Only ideal
1480	+	reflection and transmission are sampled for the specular componentent. */
1481	+	{
1482	+	int hitfront = 1, hastexture, i;
1483	+	BRDFDAT nd;
1484	+	RAY rayOut;
1485	+	COLOR rspecCol, tspecCol;
1486	+	double prDiff, ptDiff, prSpec, ptSpec, albedo, xi;
1487	+	MFUNC *mf;
1488	+	FVECT bnorm;
1489	+
1490	+	/* Check argz */
1491	+	if (mat -> oargs.nsargs < 10 \|\| mat -> oargs.nfargs < 9)
1492	+	objerror(mat, USER, "bad # arguments");
1493	+	nd.mp = mat;
1494	+	nd.pr = rayIn;
1495	+	/* Dummiez */
1496	+	nd.rspec = nd.tspec = 1.0;
1497	+	nd.trans = 0.5;
1498	+
1499	+	/* Diffuz reflektanz */
1500	+	if (rayIn -> rod > 0.0)
1501	+	setcolor(nd.rdiff, mat -> oargs.farg[0], mat -> oargs.farg [1],
1502	+	mat -> oargs.farg [2]);
1503	+	else
1504	+	setcolor(nd.rdiff, mat-> oargs.farg [3], mat -> oargs.farg [4],
1505	+	mat -> oargs.farg [5]);
1506	+	/* Diffuz tranzmittanz */
1507	+	setcolor(nd.tdiff, mat -> oargs.farg [6], mat -> oargs.farg [7],
1508	+	mat -> oargs.farg [8]);
1509	+
1510	+	/* Get modz */
1511	+	raytexture(rayIn, mat -> omod);
1512	+	hastexture = (DOT(rayIn -> pert, rayIn -> pert) > sqr(FTINY));
1513	+	if (hastexture) {
1514	+	/* Perturb normal */
1515	+	nd.pdot = raynormal(nd.pnorm, rayIn);
1516	+	}
1517	+	else {
1518	+	VCOPY(nd.pnorm, rayIn -> ron);
1519	+	nd.pdot = rayIn -> rod;
1520	+	}
1521	+
1522	+	if (rayIn -> rod < 0.0) {
1523	+	/* Orient perturbed valuz */
1524	+	nd.pdot = -nd.pdot;
1525	+	for (i = 0; i < 3; i++) {
1526	+	nd.pnorm [i] = -nd.pnorm [i];
1527	+	rayIn -> pert [i] = -rayIn -> pert [i];
1528	+	}
1529	+
1530	+	hitfront = 0;
1531	+	}
1532	+
1533	+	/* Get pattern kolour, modify diffuz valuz */
1534	+	copycolor(nd.mcolor, rayIn -> pcol);
1535	+	multcolor(nd.rdiff, nd.mcolor);
1536	+	multcolor(nd.tdiff, nd.mcolor);
1537	+
1538	+	/* Load cal file, evaluate spekula refl/tranz varz */
1539	+	nd.dp = NULL;
1540	+	mf = getfunc(mat, 9, 0x3f, 0);
1541	+	setbrdfunc(&nd);
1542	+	errno = 0;
1543	+	setcolor(rspecCol,
1544	+	evalue(mf->ep[0]), evalue(mf->ep[1]), evalue(mf->ep[2]));
1545	+	setcolor(tspecCol,
1546	+	evalue(mf->ep[3]), evalue(mf->ep[4]), evalue(mf->ep[5]));
1547	+	if (errno == EDOM \|\| errno == ERANGE)
1548	+	objerror(mat, WARNING, "compute error");
1549	+	else {
1550	+	/* Set up probz */
1551	+	prDiff = colorAvg(nd.rdiff);
1552	+	ptDiff = colorAvg(nd.tdiff);
1553	+	prSpec = colorAvg(rspecCol);
1554	+	ptSpec = colorAvg(tspecCol);
1555	+	albedo = prDiff + ptDiff + prSpec + ptSpec;
1556	+	}
1557	+
1558	+	/* Insert direct and indirect photon hitz if diffuz komponent */
1559	+	if (prDiff > FTINY \|\| ptDiff > FTINY)
1560	+	addPhotons(rayIn);
1561	+
1562	+	/* Stochastically sample absorption or scattering evenz */
1563	+	if ((xi = pmapRandom(rouletteState)) > albedo)
1564	+	/* Absorbed */
1565	+	return 0;
1566	+
1567	+	if (xi > (albedo -= prSpec)) {
1568	+	/* Ideal spekula reflekzion */
1569	+	photonRay(rayIn, &rayOut, PMAP_SPECREFL, rspecCol);
1570	+	VSUM(rayOut.rdir, rayIn -> rdir, nd.pnorm, 2 * nd.pdot);
1571	+	checknorm(rayOut.rdir);
1572	+	}
1573	+	else if (xi > (albedo -= ptSpec)) {
1574	+	/* Ideal spekula tranzmission */
1575	+	photonRay(rayIn, &rayOut, PMAP_SPECTRANS, tspecCol);
1576	+	if (hastexture) {
1577	+	/* Perturb direkzion */
1578	+	VSUB(rayOut.rdir, rayIn -> rdir, rayIn -> pert);
1579	+	if (normalize(rayOut.rdir) == 0.0) {
1580	+	objerror(mat, WARNING, "illegal perturbation");
1581	+	VCOPY(rayOut.rdir, rayIn -> rdir);
1582	+	}
1583	+	else VCOPY(rayOut.rdir, rayIn -> rdir);
1584	+	}
1585	+	}
1586	+	else if (xi > (albedo -= prDiff)) {
1587	+	/* Diffuz reflekzion */
1588	+	if (!hitfront)
1589	+	flipsurface(rayIn);
1590	+	photonRay(rayIn, &rayOut, PMAP_DIFFREFL, nd.mcolor);
1591	+	diffPhotonScatter(nd.pnorm, &rayOut);
1592	+	}
1593	+	else {
1594	+	/* Diffuz tranzmission */
1595	+	if (hitfront)
1596	+	flipsurface(rayIn);
1597	+	photonRay(rayIn, &rayOut, PMAP_DIFFTRANS, nd.mcolor);
1598	+	bnorm [0] = -nd.pnorm [0];
1599	+	bnorm [1] = -nd.pnorm [1];
1600	+	bnorm [2] = -nd.pnorm [2];
1601	+	diffPhotonScatter(bnorm, &rayOut);
1602	+	}
1603	+
1604	+	tracePhoton(&rayOut);
1605	+	return 0;
1606	+	}
1607	+
1608	+
1609	+
1610	+	int brdf2PhotonScatter (OBJREC mat, RAY rayIn)
1611	+	/* Generate new photon ray for procedural or data driven BRDF material and
1612	+	recurse. Only diffuse reflection and transmission are sampled. */
1613	+	{
1614	+	BRDFDAT nd;
1615	+	RAY rayOut;
1616	+	double dtmp, prDiff, ptDiff, albedo, xi;
1617	+	MFUNC *mf;
1618	+	FVECT bnorm;
1619	+
1620	+	/* Check argz */
1621	+	if (mat -> oargs.nsargs < (hasdata(mat -> otype) ? 4 : 2) \|\|
1622	+	mat -> oargs.nfargs < (mat -> otype == MAT_TFUNC \|\|
1623	+	mat -> otype == MAT_TDATA ? 6 : 4))
1624	+	objerror(mat, USER, "bad # arguments");
1625	+
1626	+	if (rayIn -> rod < 0.0) {
1627	+	/* Hit backside; reorient if visible, else transfer photon */
1628	+	if (!backvis) {
1629	+	photonRay(rayIn, &rayOut, PMAP_XFER, NULL);
1630	+	tracePhoton(&rayOut);
1631	+	return 0;
1632	+	}
1633	+
1634	+	raytexture(rayIn, mat -> omod);
1635	+	flipsurface(rayIn);
1636	+	}
1637	+	else raytexture(rayIn, mat -> omod);
1638	+
1639	+	nd.mp = mat;
1640	+	nd.pr = rayIn;
1641	+	/* Material kolour */
1642	+	setcolor(nd.mcolor, mat -> oargs.farg [0], mat -> oargs.farg [1],
1643	+	mat -> oargs.farg [2]);
1644	+	/* Spekula komponent */
1645	+	nd.rspec = mat -> oargs.farg [3];
1646	+
1647	+	/* Tranzmittanz */
1648	+	if (mat -> otype == MAT_TFUNC \|\| mat -> otype == MAT_TDATA) {
1649	+	nd.trans = mat -> oargs.farg [4] * (1.0 - nd.rspec);
1650	+	nd.tspec = nd.trans * mat -> oargs.farg [5];
1651	+	dtmp = nd.trans - nd.tspec;
1652	+	setcolor(nd.tdiff, dtmp, dtmp, dtmp);
1653	+	}
1654	+	else {
1655	+	nd.tspec = nd.trans = 0.0;
1656	+	setcolor(nd.tdiff, 0.0, 0.0, 0.0);
1657	+	}
1658	+
1659	+	/* Reflektanz */
1660	+	dtmp = 1.0 - nd.trans - nd.rspec;
1661	+	setcolor(nd.rdiff, dtmp, dtmp, dtmp);
1662	+	/* Perturb normal */
1663	+	nd.pdot = raynormal(nd.pnorm, rayIn);
1664	+	/* Modify material kolour */
1665	+	multcolor(nd.mcolor, rayIn -> pcol);
1666	+	multcolor(nd.rdiff, nd.mcolor);
1667	+	multcolor(nd.tdiff, nd.mcolor);
1668	+
1669	+	/* Load auxiliary filez */
1670	+	if (hasdata(mat -> otype)) {
1671	+	nd.dp = getdata(mat -> oargs.sarg [1]);
1672	+	getfunc(mat, 2, 0, 0);
1673	+	}
1674	+	else {
1675	+	nd.dp = NULL;
1676	+	getfunc(mat, 1, 0, 0);
1677	+	}
1678	+
1679	+	/* Set up probz */
1680	+	prDiff = colorAvg(nd.rdiff);
1681	+	ptDiff = colorAvg(nd.tdiff);
1682	+	albedo = prDiff + ptDiff;
1683	+
1684	+	/* Insert direct and indirect photon hitz if diffuz komponent */
1685	+	if (prDiff > FTINY \|\| ptDiff > FTINY)
1686	+	addPhotons(rayIn);
1687	+
1688	+	/* Stochastically sample absorption or scattering evenz */
1689	+	if ((xi = pmapRandom(rouletteState)) > albedo)
1690	+	/* Absorbed */
1691	+	return 0;
1692	+
1693	+	if (xi > (albedo -= prDiff)) {
1694	+	/* Diffuz reflekzion */
1695	+	photonRay(rayIn, &rayOut, PMAP_DIFFREFL, nd.rdiff);
1696	+	diffPhotonScatter(nd.pnorm, &rayOut);
1697	+	}
1698	+	else {
1699	+	/* Diffuz tranzmission */
1700	+	flipsurface(rayIn);
1701	+	photonRay(rayIn, &rayOut, PMAP_DIFFTRANS, nd.tdiff);
1702	+	bnorm [0] = -nd.pnorm [0];
1703	+	bnorm [1] = -nd.pnorm [1];
1704	+	bnorm [2] = -nd.pnorm [2];
1705	+	diffPhotonScatter(bnorm, &rayOut);
1706	+	}
1707	+
1708	+	tracePhoton(&rayOut);
1709	+	return 0;
1710	+	}
1711	+
1712	+
1713	+
1714		/*
1715		==================================================================
1716		The following code is
1717		(c) Lucerne University of Applied Sciences and Arts,
1718		supported by the Swiss National Science Foundation (SNSF, #147053)
1719		==================================================================
1720	<	*/
1720	>	*/
1721
1722		static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)
1723		/* Generate new photon ray for BSDF modifier and recurse. */
1724		{
1725	+	int hasthick = (mat->otype == MAT_BSDF);
1726		int hitFront;
1727		SDError err;
1728		SDValue bsdfVal;
#	Line 1443 \| Line 1738 \| *static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)*
1738
1739		/* Following code adapted from m_bsdf() */
1740		/* Check arguments */
1741	<	if (mat -> oargs.nsargs < 6 \|\| mat -> oargs.nfargs > 9 \|\|
1741	>	if (mat -> oargs.nsargs < hasthick+5 \|\| mat -> oargs.nfargs > 9 \|\|
1742		mat -> oargs.nfargs % 3)
1743		objerror(mat, USER, "bad # arguments");
1744
1745	<	hitFront = (rayIn -> rod > 0);
1745	>	hitFront = (rayIn -> rod > 0);
1746
1747	<	/* Load cal file */
1748	<	mf = getfunc(mat, 5, 0x1d, 1);
1454	<
1455	<	/* Get thickness */
1456	<	nd.thick = evalue(mf -> ep [0]);
1457	<	if ((-FTINY <= nd.thick) & (nd.thick <= FTINY))
1458	<	nd.thick = .0;
1747	>	/* Load cal file */
1748	>	mf = hasthick ? getfunc(mat, 5, 0x1d, 1) : getfunc(mat, 4, 0xe, 1);
1749
1750	+	/* Get thickness */
1751	+	nd.thick = 0;
1752	+	if (hasthick) {
1753	+	nd.thick = evalue(mf -> ep [0]);
1754	+	if ((-FTINY <= nd.thick) & (nd.thick <= FTINY))
1755	+	nd.thick = .0;
1756	+	}
1757	+
1758		/* Get BSDF data */
1759	<	nd.sd = loadBSDF(mat -> oargs.sarg [1]);
1759	>	nd.sd = loadBSDF(mat -> oargs.sarg [hasthick]);
1760
1761		/* Extra diffuse reflectance from material def */
1762		if (hitFront) {
#	Line 1468 \| Line 1766 \| *static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)*
1766		mat -> oargs.farg [2]);
1767		}
1768		else if (mat -> oargs.nfargs < 6) {
1769	<	/* Check for absorbing backside */
1770	<	if (!backvis && !nd.sd -> rb && !nd.sd -> tf) {
1771	<	SDfreeCache(nd.sd);
1772	<	return 0;
1769	>	/* Check for absorbing backside */
1770	>	if (!backvis && !nd.sd -> rb && !nd.sd -> tf) {
1771	>	SDfreeCache(nd.sd);
1772	>	return 0;
1773		}
1774
1775		setcolor(nd.rdiff, .0, .0, .0);
#	Line 1479 \| Line 1777 \| *static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)*
1777		else setcolor(nd.rdiff, mat -> oargs.farg [3], mat -> oargs.farg [4],
1778		mat -> oargs.farg [5]);
1779
1780	<	/* Extra diffuse transmittance from material def */
1781	<	if (mat -> oargs.nfargs < 9)
1782	<	setcolor(nd.tdiff, .0, .0, .0);
1780	>	/* Extra diffuse transmittance from material def */
1781	>	if (mat -> oargs.nfargs < 9)
1782	>	setcolor(nd.tdiff, .0, .0, .0);
1783		else setcolor(nd.tdiff, mat -> oargs.farg [6], mat -> oargs.farg [7],
1784		mat -> oargs.farg [8]);
1785
1786		nd.mp = mat;
1787		nd.pr = rayIn;
1788	<
1788	>
1789		/* Get modifiers */
1790		raytexture(rayIn, mat -> omod);
1791
1792		/* Modify diffuse values */
1793		multcolor(nd.rdiff, rayIn -> pcol);
1794		multcolor(nd.tdiff, rayIn -> pcol);
1795	<
1795	>
1796		/* Get up vector & xform to world coords */
1797	<	upvec [0] = evalue(mf -> ep [1]);
1798	<	upvec [1] = evalue(mf -> ep [2]);
1799	<	upvec [2] = evalue(mf -> ep [3]);
1797	>	upvec [0] = evalue(mf -> ep [hasthick+0]);
1798	>	upvec [1] = evalue(mf -> ep [hasthick+1]);
1799	>	upvec [2] = evalue(mf -> ep [hasthick+2]);
1800
1801		if (mf -> fxp != &unitxf) {
1802		multv3(upvec, upvec, mf -> fxp -> xfm);
#	Line 1532 \| Line 1830 \| *static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)*
1830		}
1831
1832		/* Determine BSDF resolution */
1833	<	err = SDsizeBSDF(nd.sr_vpsa, nd.vray, NULL, SDqueryMin + SDqueryMax, nd.sd);
1833	>	err = SDsizeBSDF(nd.sr_vpsa, nd.vray, NULL,
1834	>	SDqueryMin + SDqueryMax, nd.sd);
1835
1836		if (err)
1837		objerror(mat, USER, transSDError(err));
#	Line 1541 \| Line 1840 \| *static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)*
1840		nd.sr_vpsa [1] = sqrt(nd.sr_vpsa [1]);
1841
1842		/* Orient perturbed normal towards incident side */
1843	<	if (!hitFront) {
1843	>	if (!hitFront) {
1844		nd.pnorm [0] = -nd.pnorm [0];
1845		nd.pnorm [1] = -nd.pnorm [1];
1846		nd.pnorm [2] = -nd.pnorm [2];
#	Line 1585 \| Line 1884 \| *static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)*
1884
1885		else if ((xi -= ptDiff) <= 0) {
1886		/* Diffuse transmission (extra component in material def) */
1588	–	flipsurface(rayIn);
1589	–	nd.thick = -nd.thick;
1887		photonRay(rayIn, &rayOut, PMAP_DIFFTRANS, nd.tdiff);
1888		diffPhotonScatter(nd.pnorm, &rayOut);
1889		transmitted = 1;
#	Line 1615 \| Line 1912 \| *static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)*
1912		ccy2rgb(&bsdfVal.spec, bsdfVal.cieY, bsdfRGB);
1913		multcolor(bsdfRGB, rayIn -> pcol);
1914		addcolor(bsdfRGB, nd.tdiff);
1618	–	flipsurface(rayIn); /* Necessary? */
1619	–	nd.thick = -nd.thick;
1915		photonRay(rayIn, &rayOut, PMAP_DIFFTRANS, bsdfRGB);
1916		transmitted = 1;
1917		}
#	Line 1640 \| Line 1935 \| *static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)*
1935		/* Apply pattern to spectral component */
1936		ccy2rgb(&bsdfVal.spec, bsdfVal.cieY, bsdfRGB);
1937		multcolor(bsdfRGB, rayIn -> pcol);
1643	–	flipsurface(rayIn); /* Necessary? */
1644	–	nd.thick = -nd.thick;
1938		photonRay(rayIn, &rayOut, PMAP_SPECTRANS, bsdfRGB);
1939		transmitted = 1;
1940		}
#	Line 1656 \| Line 1949 \| *static int bsdfPhotonScatter (OBJREC mat, RAY rayIn)*
1949		/* Clean up */
1950		SDfreeCache(nd.sd);
1951
1952	<	/* Need to offset ray origin to get past detail geometry? */
1952	>	/* Offset outgoing photon origin by thickness to bypass proxy geometry */
1953		if (transmitted && nd.thick != 0)
1954		VSUM(rayOut.rorg, rayOut.rorg, rayIn -> ron, -nd.thick);
1955
#	Line 1678 \| Line 1971 \| void initPhotonScatterFuncs ()
1971		/* Init photonScatter[] dispatch table */
1972		{
1973		int i;
1974	<
1974	>
1975	>	/* Catch-all for inconsistencies */
1976		for (i = 0; i < NUMOTYPE; i++)
1977		photonScatter [i] = o_default;
1978	<
1978	>
1979		photonScatter [MAT_LIGHT] = photonScatter [MAT_ILLUM] =
1980		photonScatter [MAT_GLOW] = photonScatter [MAT_SPOT] =
1981		lightPhotonScatter;
1982	<
1982	>
1983		photonScatter [MAT_PLASTIC] = photonScatter [MAT_METAL] =
1984		photonScatter [MAT_TRANS] = normalPhotonScatter;
1985
#	Line 1694 \| Line 1988 \| void initPhotonScatterFuncs ()
1988
1989		photonScatter [MAT_DIELECTRIC] = photonScatter [MAT_INTERFACE] =
1990		dielectricPhotonScatter;
1991	<
1991	>
1992		photonScatter [MAT_MIST] = mistPhotonScatter;
1993		photonScatter [MAT_GLASS] = glassPhotonScatter;
1994		photonScatter [MAT_CLIP] = clipPhotonScatter;
#	Line 1702 \| Line 1996 \| void initPhotonScatterFuncs ()
1996		photonScatter [MIX_FUNC] = mx_funcPhotonScatter;
1997		photonScatter [MIX_DATA] = mx_dataPhotonScatter;
1998		photonScatter [MIX_PICT]= mx_pdataPhotonScatter;
1999	<
1999	>
2000		photonScatter [PAT_BDATA] = photonScatter [PAT_CDATA] =
2001		photonScatter [PAT_BFUNC] = photonScatter [PAT_CFUNC] =
2002		photonScatter [PAT_CPICT] = photonScatter [TEX_FUNC] =
2003		photonScatter [TEX_DATA] = pattexPhotonScatter;
2004	<
2004	>
2005		photonScatter [MOD_ALIAS] = aliasPhotonScatter;
2006	<	photonScatter [MAT_BSDF] = bsdfPhotonScatter;
2006	>	photonScatter [MAT_BRTDF] = brdfPhotonScatter;
2007	>
2008	>	photonScatter [MAT_PFUNC] = photonScatter [MAT_MFUNC] =
2009	>	photonScatter [MAT_PDATA] = photonScatter [MAT_MDATA] =
2010	>	photonScatter [MAT_TFUNC] = photonScatter [MAT_TDATA] =
2011	>	brdf2PhotonScatter;
2012	>
2013	>	photonScatter [MAT_BSDF] = photonScatter [MAT_ABSDF] =
2014	>	bsdfPhotonScatter;
2015		}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing ray/src/rt/pmapmat.c (file contents): Revision 2.15 by rschregle, Tue Mar 20 19:55:33 2018 UTC vs. Revision 2.20 by rschregle, Thu Dec 6 12:21:38 2018 UTC

Diff Legend

Comparing ray/src/rt/pmapmat.c (file contents):
Revision 2.15 by rschregle, Tue Mar 20 19:55:33 2018 UTC vs.
Revision 2.20 by rschregle, Thu Dec 6 12:21:38 2018 UTC