ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/bsdf.c

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.24 by greg, Sun Apr 24 19:39:21 2011 UTC vs.
Revision 2.29 by greg, Fri Jun 3 18:12:58 2011 UTC

#	Line 169 | Line 169 | SDloadFile(SDData *sd, const char *fname)
169		/* try loading variable resolution data */
170		lastErr = SDloadTre(sd, wtl);
171		/* check our result */
172	<	switch (lastErr) {
173	<	case SDEformat:
174	<	case SDEdata:
175	<	case SDEsupport:        /* possibly we just tried the wrong format */
172	>	if (lastErr == SDEsupport)      /* try matrix BSDF if not tree data */
173		lastErr = SDloadMtx(sd, wtl);
174	<	break;
178	<	default:                /* variable res. OK else serious error */
179	<	break;
180	<	}
174	>
175		/* done with XML file */
176		ezxml_free(fl);
177
#	Line 433 | Line 427 | SDsampComponent(SDValue *sv, FVECT ioVec, double randX
427		if (ec)
428		return ec;
429		/* get BSDF color */
430	<	n = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc->dist);
430	>	n = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc);
431		if (n <= 0) {
432		strcpy(SDerrorDetail, "BSDF sample value error");
433		return SDEinternal;
#	Line 496 | Line 490 | SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
490		SDError         ec;
491		int             i;
492		/* check arguments */
493	<	if ((projSA == NULL) | (v1 == NULL))
493	>	if ((projSA == NULL) | (v1 == NULL) | (sd == NULL))
494		return SDEargument;
495		/* initialize extrema */
496		switch (qflags) {
#	Line 516 | Line 510 | SDsizeBSDF(double *projSA, const FVECT v1, const RREAL
510		rdf = sd->rf;
511		else
512		rdf = sd->rb;
513	<	tdf = NULL;                     /* transmitted component? */
514	<	if (v2 != NULL && v1[2] > 0 ^ v2[2] > 0) {
515	<	rdf = NULL;
516	<	tdf = sd->tf;
517	<	}
513	>	tdf = sd->tf;
514	>	if (v2 != NULL)                 /* bidirectional? */
515	>	if (v1[2] > 0 ^ v2[2] > 0)
516	>	rdf = NULL;
517	>	else
518	>	tdf = NULL;
519		ec = SDEdata;                   /* run through components */
520		for (i = (rdf==NULL) ? 0 : rdf->ncomp; i--; ) {
521		ec = (*rdf->comp[i].func->queryProjSA)(projSA, v1, v2,
522	<	qflags, rdf->comp[i].dist);
522	>	qflags, &rdf->comp[i]);
523		if (ec)
524		return ec;
525		}
526		for (i = (tdf==NULL) ? 0 : tdf->ncomp; i--; ) {
527		ec = (*tdf->comp[i].func->queryProjSA)(projSA, v1, v2,
528	<	qflags, tdf->comp[i].dist);
528	>	qflags, &tdf->comp[i]);
529		if (ec)
530		return ec;
531		}
#	Line 572 | Line 567 | SDevalBSDF(SDValue *sv, const FVECT outVec, const FVEC
567		i = (sdf != NULL) ? sdf->ncomp : 0;
568		while (i-- > 0) {
569		nch = (*sdf->comp[i].func->getBSDFs)(coef, outVec, inVec,
570	<	sdf->comp[i].dist);
570	>	&sdf->comp[i]);
571		while (nch-- > 0) {
572		c_cmix(&sv->spec, sv->cieY, &sv->spec,
573		coef[nch], &sdf->comp[i].cspec[nch]);
#	Line 715 | Line 710 | SDsampBSDF(SDValue *sv, FVECT ioVec, double randX, int
710		if (ec)
711		return ec;
712		/* compute color */
713	<	j = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc->dist);
713	>	j = (*sdc->func->getBSDFs)(coef, ioVec, inVec, sdc);
714		if (j <= 0) {
715		sprintf(SDerrorDetail, "BSDF \"%s\" sampling value error",
716		sd->name);

Diff Legend

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