[ViewVC] Diff of: Development/ray/src/common/bsdf.c

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.33 by greg, Tue Jun 28 21:11:04 2011 UTC vs.
Revision 2.39 by greg, Mon Mar 5 00:17:06 2012 UTC

+        if (wdb == NULL)                /* no geometry section? */
+                return SDEnone;
-+
+        if ((geom = ezxml_child(wdb, "Name")) != NULL) {
-+
+                strncpy(sd->matn, ezxml_txt(geom), SDnameLn);
-+
+                sd->matn[SDnameLn-1] = '\0';
-+
+        }
-+
+        if ((geom = ezxml_child(wdb, "Manufacturer")) != NULL) {
-+
+                strncpy(sd->makr, ezxml_txt(geom), SDnameLn);
-+
+                sd->makr[SDnameLn-1] = '\0';
-+
+        }
+        sd->dim[0] = sd->dim[1] = sd->dim[2] = .0;
-+
+        SDerrorDetail[0] = '\0';
+        if ((geom = ezxml_child(wdb, "Width")) != NULL)
+                sd->dim[0] = atof(ezxml_txt(geom)) *
+                                to_meters(ezxml_attr(geom, "unit"));
+                sd->dim[2] = atof(ezxml_txt(geom)) *
+                                to_meters(ezxml_attr(geom, "unit"));
+        if ((sd->dim[0] < 0) | (sd->dim[1] < 0) | (sd->dim[2] < 0)) {
-<
+                sprintf(SDerrorDetail, "Negative size in \"%s\"", sd->name);
->
+                if (!SDerrorDetail[0])
->
+                        sprintf(SDerrorDetail, "Negative dimension in \"%s\"",
->
+                                                sd->name);
+                return SDEdata;
+        if ((geom = ezxml_child(wdb, "Geometry")) == NULL ||
+                return SDEsupport;
+        cfact = to_meters(ezxml_attr(geom, "unit"));
-+
+        if (cfact <= 0)
-+
+                return SDEformat;
+        sd->mgf = (char *)malloc(strlen(mgfstr)+32);
+        if (sd->mgf == NULL) {
+                strcpy(SDerrorDetail, "Out of memory in SDloadGeometry");
+        wtl = ezxml_child(ezxml_child(fl, "Optical"), "Layer");
+        if (wtl == NULL) {
-<
+                sprintf(SDerrorDetail, "BSDF \"%s\": no optical layer'",
->
+                sprintf(SDerrorDetail, "BSDF \"%s\": no optical layers'",
+                                sd->name);
+                ezxml_free(fl);
+                return SDEformat;
+                                /* load geometry if present */
+        lastErr = SDloadGeometry(sd, ezxml_child(wtl, "Material"));
-<
+        if (lastErr)
->
+        if (lastErr) {
->
+                ezxml_free(fl);
+                return lastErr;
-+
+        }
+                                /* try loading variable resolution data */
+        lastErr = SDloadTre(sd, wtl);
+                                /* check our result */
+        return df;
-+
+/* Add component(s) to spectral distribution function */
-+
+SDSpectralDF *
-+
+SDaddComponent(SDSpectralDF *odf, int nadd)
-+
+{
-+
+        SDSpectralDF    *df;
-+
-+
+        if (odf == NULL)
-+
+                return SDnewSpectralDF(nadd);
-+
+        if (nadd <= 0)
-+
+                return odf;
-+
+        df = (SDSpectralDF *)realloc(odf, sizeof(SDSpectralDF) +
-+
+                                (odf->ncomp+nadd-1)*sizeof(SDComponent));
-+
+        if (df == NULL) {
-+
+                sprintf(SDerrorDetail,
-+
+                        "Cannot add %d component(s) to spectral DF", nadd);
-+
+                SDfreeSpectralDF(odf);
-+
+                return NULL;
-+
+        }
-+
+        memset(df->comp+df->ncomp, 0, nadd*sizeof(SDComponent));
-+
+        df->ncomp += nadd;
-+
+        return df;
-+
+}
-+
+/* Free cached cumulative distributions for BSDF component */
+void
+SDfreeCumulativeCache(SDSpectralDF *df)
+                return;
+        SDfreeCumulativeCache(df);
+        for (n = df->ncomp; n-- > 0; )
-<
+                (*df->comp[n].func->freeSC)(df->comp[n].dist);
->
+                if (df->comp[n].dist != NULL)
->
+                        (*df->comp[n].func->freeSC)(df->comp[n].dist);
+        free(df);
+        cd = (*sdc->func->getCDist)(inVec, sdc);
+        if (cd == NULL)
+                return SDEmemory;
-<
+        if (cd->cTotal <= 1e-7) {       /* anything to sample? */
->
+        if (cd->cTotal <= 1e-6) {       /* anything to sample? */
+                sv->spec = c_dfcolor;
+                sv->cieY = .0;
+                memset(ioVec, 0, 3*sizeof(double));
+                sv->cieY += cdarr[i]->cTotal;
-<
+        if (sv->cieY <= 1e-7) {         /* anything to sample? */
->
+        if (sv->cieY <= 1e-6) {         /* anything to sample? */
+                sv->cieY = .0;
+                memset(ioVec, 0, 3*sizeof(double));
+                return SDEnone;
+                error(WARNING, errmsg);
+                ezxml_free(fl);
+                return(NULL);
-<
+        }
-<
+        load_angle_basis(ezxml_child(ezxml_child(wtl,
-<
+                                "DataDefinition"), "AngleBasis"));
->
+        }
->
+        for (wld = ezxml_child(ezxml_child(wtl,
->
+                                "DataDefinition"), "AngleBasis");
->
+                        wld != NULL; wld = wld->next)
->
+                load_angle_basis(wld);
+        dp = (struct BSDF_data *)calloc(1, sizeof(struct BSDF_data));
+        load_geometry(dp, ezxml_child(wtl, "Material"));
+        for (wld = ezxml_child(wtl, "WavelengthData");

Diff Legend

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

Comparing ray/src/common/bsdf.c (file contents): Revision 2.33 by greg, Tue Jun 28 21:11:04 2011 UTC vs. Revision 2.39 by greg, Mon Mar 5 00:17:06 2012 UTC

Diff Legend

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.33 by greg, Tue Jun 28 21:11:04 2011 UTC vs.
Revision 2.39 by greg, Mon Mar 5 00:17:06 2012 UTC