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.31 by greg, Fri Jun 10 01:11:26 2011 UTC vs.
Revision 2.38 by greg, Sun Mar 4 23:28:34 2012 UTC

#	Line 15 | Line 15 | static const char RCSid[] = "$Id$";
15		#include <stdlib.h>
16		#include <string.h>
17		#include <math.h>
18	+	#include <ctype.h>
19		#include "ezxml.h"
20		#include "hilbert.h"
21		#include "bsdf.h"
#	Line 92 | Line 93 | SDloadGeometry(SDData *sd, ezxml_t wdb)
93		if (wdb == NULL)                /* no geometry section? */
94		return SDEnone;
95		sd->dim[0] = sd->dim[1] = sd->dim[2] = .0;
96	+	SDerrorDetail[0] = '\0';
97		if ((geom = ezxml_child(wdb, "Width")) != NULL)
98		sd->dim[0] = atof(ezxml_txt(geom)) *
99		to_meters(ezxml_attr(geom, "unit"));
#	Line 102 | Line 104 | SDloadGeometry(SDData *sd, ezxml_t wdb)
104		sd->dim[2] = atof(ezxml_txt(geom)) *
105		to_meters(ezxml_attr(geom, "unit"));
106		if ((sd->dim[0] < 0) | (sd->dim[1] < 0) | (sd->dim[2] < 0)) {
107	<	sprintf(SDerrorDetail, "Negative size in \"%s\"", sd->name);
107	>	if (!SDerrorDetail[0])
108	>	sprintf(SDerrorDetail, "Negative dimension in \"%s\"",
109	>	sd->name);
110		return SDEdata;
111		}
112		if ((geom = ezxml_child(wdb, "Geometry")) == NULL ||
113		(mgfstr = ezxml_txt(geom)) == NULL)
114		return SDEnone;
115	+	while (isspace(*mgfstr))
116	+	++mgfstr;
117	+	if (!*mgfstr)
118	+	return SDEnone;
119		if ((fmt = ezxml_attr(geom, "format")) != NULL &&
120		strcasecmp(fmt, "MGF")) {
121		sprintf(SDerrorDetail,
#	Line 116 | Line 124 | SDloadGeometry(SDData *sd, ezxml_t wdb)
124		return SDEsupport;
125		}
126		cfact = to_meters(ezxml_attr(geom, "unit"));
127	+	if (cfact <= 0)
128	+	return SDEformat;
129		sd->mgf = (char *)malloc(strlen(mgfstr)+32);
130		if (sd->mgf == NULL) {
131		strcpy(SDerrorDetail, "Out of memory in SDloadGeometry");
#	Line 159 | Line 169 | SDloadFile(SDData *sd, const char *fname)
169		}
170		wtl = ezxml_child(ezxml_child(fl, "Optical"), "Layer");
171		if (wtl == NULL) {
172	<	sprintf(SDerrorDetail, "BSDF \"%s\": no optical layer'",
172	>	sprintf(SDerrorDetail, "BSDF \"%s\": no optical layers'",
173		sd->name);
174		ezxml_free(fl);
175		return SDEformat;
176		}
177		/* load geometry if present */
178		lastErr = SDloadGeometry(sd, ezxml_child(wtl, "Material"));
179	<	if (lastErr)
179	>	if (lastErr) {
180	>	ezxml_free(fl);
181		return lastErr;
182	+	}
183		/* try loading variable resolution data */
184		lastErr = SDloadTre(sd, wtl);
185		/* check our result */
#	Line 219 | Line 231 | SDnewSpectralDF(int nc)
231		return df;
232		}
233
234	+	/* Add component(s) to spectral distribution function */
235	+	SDSpectralDF *
236	+	SDaddComponent(SDSpectralDF *odf, int nadd)
237	+	{
238	+	SDSpectralDF    *df;
239	+
240	+	if (odf == NULL)
241	+	return SDnewSpectralDF(nadd);
242	+	if (nadd <= 0)
243	+	return odf;
244	+	df = (SDSpectralDF *)realloc(odf, sizeof(SDSpectralDF) +
245	+	(odf->ncomp+nadd-1)*sizeof(SDComponent));
246	+	if (df == NULL) {
247	+	sprintf(SDerrorDetail,
248	+	"Cannot add %d component(s) to spectral DF", nadd);
249	+	SDfreeSpectralDF(odf);
250	+	return NULL;
251	+	}
252	+	memset(df->comp+df->ncomp, 0, nadd*sizeof(SDComponent));
253	+	df->ncomp += nadd;
254	+	return df;
255	+	}
256	+
257		/* Free cached cumulative distributions for BSDF component */
258		void
259		SDfreeCumulativeCache(SDSpectralDF *df)
#	Line 245 | Line 280 | SDfreeSpectralDF(SDSpectralDF *df)
280		return;
281		SDfreeCumulativeCache(df);
282		for (n = df->ncomp; n-- > 0; )
283	<	(*df->comp[n].func->freeSC)(df->comp[n].dist);
283	>	if (df->comp[n].dist != NULL)
284	>	(*df->comp[n].func->freeSC)(df->comp[n].dist);
285		free(df);
286		}
287
#	Line 417 | Line 453 | SDsampComponent(SDValue *sv, FVECT ioVec, double randX
453		cd = (*sdc->func->getCDist)(inVec, sdc);
454		if (cd == NULL)
455		return SDEmemory;
456	<	if (cd->cTotal <= 1e-7) {       /* anything to sample? */
456	>	if (cd->cTotal <= 1e-6) {       /* anything to sample? */
457		sv->spec = c_dfcolor;
458		sv->cieY = .0;
459		memset(ioVec, 0, 3*sizeof(double));
#	Line 679 | Line 715 | SDsampBSDF(SDValue *sv, FVECT ioVec, double randX, int
715		}
716		sv->cieY += cdarr[i]->cTotal;
717		}
718	<	if (sv->cieY <= 1e-7) {         /* anything to sample? */
718	>	if (sv->cieY <= 1e-6) {         /* anything to sample? */
719		sv->cieY = .0;
720		memset(ioVec, 0, 3*sizeof(double));
721		return SDEnone;
#	Line 809 | Line 845 | SDmapDir(FVECT resVec, RREAL vMtx[3][3], const FVECT i
845
846		#include "standard.h"
847		#include "paths.h"
812	–	#include <ctype.h>
848
849		#define MAXLATS         46              /* maximum number of latitudes */
850
#	Line 929 | Line 964 | ab_getndx(             /* get index corresponding to the given ve
964		{
965		ANGLE_BASIS  *ab = (ANGLE_BASIS *)p;
966		int     li, ndx;
967	<	double  pol, azi, d;
967	>	double  pol, azi;
968
969		if ((v[2] < -1.0) | (v[2] > 1.0))
970		return(-1);
#	Line 1169 | Line 1204 | check_bsdf_data(       /* check that BSDF data is sane */
1204		)
1205		{
1206		double          *omega_iarr, *omega_oarr;
1207	<	double          dom, contrib, hemi_total, full_total;
1207	>	double          dom, hemi_total, full_total;
1208		int             nneg;
1209		FVECT           v;
1210		int             i, o;
#	Line 1319 | Line 1354 | load_BSDF(             /* load BSDF data from file */
1354		error(WARNING, errmsg);
1355		ezxml_free(fl);
1356		return(NULL);
1357	<	}
1358	<	load_angle_basis(ezxml_child(ezxml_child(wtl,
1359	<	"DataDefinition"), "AngleBasis"));
1357	>	}
1358	>	for (wld = ezxml_child(ezxml_child(wtl,
1359	>	"DataDefinition"), "AngleBasis");
1360	>	wld != NULL; wld = wld->next)
1361	>	load_angle_basis(wld);
1362		dp = (struct BSDF_data *)calloc(1, sizeof(struct BSDF_data));
1363		load_geometry(dp, ezxml_child(wtl, "Material"));
1364		for (wld = ezxml_child(wtl, "WavelengthData");

Diff Legend

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