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

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.4 by greg, Sat Jul 3 05:28:05 2010 UTC vs.
Revision 2.6 by greg, Fri Sep 3 23:53:50 2010 UTC

-+
+static double
-+
+to_meters(              /* return factor to convert given unit to meters */
-+
+        const char *unit
-+
+)
-+
+{
-+
+        if (unit == NULL) return(1.);           /* safe assumption? */
-+
+        if (!strcasecmp(unit, "Meter")) return(1.);
-+
+        if (!strcasecmp(unit, "Foot")) return(.3048);
-+
+        if (!strcasecmp(unit, "Inch")) return(.0254);
-+
+        if (!strcasecmp(unit, "Centimeter")) return(.01);
-+
+        sprintf(errmsg, "unknown dimensional unit '%s'", unit);
-+
+        error(USER, errmsg);
-+
+}
-+
-+
+static void
-+
+load_geometry(          /* load geometric dimensions and description (if any) */
-+
+        struct BSDF_data *dp,
-+
+        ezxml_t wdb
-+
+)
-+
+{
-+
+        ezxml_t         geom;
-+
+        double          cfact;
-+
+        const char      *fmt, *mgfstr;
-+
-+
+        dp->dim[0] = dp->dim[1] = dp->dim[2] = 0;
-+
+        dp->mgf = NULL;
-+
+        if ((geom = ezxml_child(wdb, "Width")) != NULL)
-+
+                dp->dim[0] = atof(ezxml_txt(geom)) *
-+
+                                to_meters(ezxml_attr(geom, "unit"));
-+
+        if ((geom = ezxml_child(wdb, "Height")) != NULL)
-+
+                dp->dim[1] = atof(ezxml_txt(geom)) *
-+
+                                to_meters(ezxml_attr(geom, "unit"));
-+
+        if ((geom = ezxml_child(wdb, "Thickness")) != NULL)
-+
+                dp->dim[2] = atof(ezxml_txt(geom)) *
-+
+                                to_meters(ezxml_attr(geom, "unit"));
-+
+        if ((geom = ezxml_child(wdb, "Geometry")) == NULL ||
-+
+                        (mgfstr = ezxml_txt(geom)) == NULL)
-+
+                return;
-+
+        if ((fmt = ezxml_attr(geom, "format")) != NULL &&
-+
+                        strcasecmp(fmt, "MGF")) {
-+
+                sprintf(errmsg, "unrecognized geometry format '%s'", fmt);
-+
+                error(WARNING, errmsg);
-+
+                return;
-+
+        }
-+
+        cfact = to_meters(ezxml_attr(geom, "unit"));
-+
+        dp->mgf = (char *)malloc(strlen(mgfstr)+32);
-+
+        if (dp->mgf == NULL)
-+
+                error(SYSTEM, "out of memory in load_geometry");
-+
+        if (cfact < 0.99 || cfact > 1.01)
-+
+                sprintf(dp->mgf, "xf -s %.5f\n%s\nxf\n", cfact, mgfstr);
-+
+        else
-+
+                strcpy(dp->mgf, mgfstr);
-+
+}
-+
-+
-+
+static void
+load_bsdf_data(         /* load BSDF distribution for this wavelength */
+        struct BSDF_data *dp,
+        ezxml_t wdb
+                sdata++;
+        if (*sdata) {
+                sprintf(errmsg, "%d extra characters after BSDF ScatteringData",
-<
+                                strlen(sdata));
->
+                                (int)strlen(sdata));
+                error(WARNING, errmsg);
+        return(1);
-+
+struct BSDF_data *
+load_BSDF(              /* load BSDF data from file */
+        char *fname
+        load_angle_basis(ezxml_child(ezxml_child(wtl,
+                                "DataDefinition"), "AngleBasis"));
+        dp = (struct BSDF_data *)calloc(1, sizeof(struct BSDF_data));
-+
+        load_geometry(dp, ezxml_child(wtl, "Material"));
+        for (wld = ezxml_child(wtl, "WavelengthData");
+                                wld != NULL; wld = wld->next) {
+                if (strcmp(ezxml_txt(ezxml_child(wld,"Wavelength")), "Visible"))
+        if (b == NULL)
+                return;
-+
+        if (b->mgf != NULL)
-+
+                free(b->mgf);
+        if (b->bsdf != NULL)
+                free(b->bsdf);
+        free(b);
+getBSDF_xfm(            /* compute BSDF orient. -> world orient. transform */
+        MAT4 xm,
+        FVECT nrm,
-<
+        UpDir ud
->
+        UpDir ud,
->
+        char *xfbuf
+        char    *xfargs[7];
+        XF      myxf;
+        FVECT   updir, xdest, ydest;
-+
+        int     i;
+        updir[0] = updir[1] = updir[2] = 0.;
+        switch (ud) {
+        fcross(ydest, nrm, xdest);
+        xf(&myxf, addrot(xfargs, xdest, ydest, nrm), xfargs);
+        copymat4(xm, myxf.xfm);
-+
+        if (xfbuf == NULL)
-+
+                return(1);
-+
+                                /* return xf arguments as well */
-+
+        for (i = 0; xfargs[i] != NULL; i++) {
-+
+                *xfbuf++ = ' ';
-+
+                strcpy(xfbuf, xfargs[i]);
-+
+                while (*xfbuf) ++xfbuf;
-+
+        }
+        return(1);

Diff Legend

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

Comparing ray/src/common/bsdf.c (file contents): Revision 2.4 by greg, Sat Jul 3 05:28:05 2010 UTC vs. Revision 2.6 by greg, Fri Sep 3 23:53:50 2010 UTC

Diff Legend

Comparing ray/src/common/bsdf.c (file contents):
Revision 2.4 by greg, Sat Jul 3 05:28:05 2010 UTC vs.
Revision 2.6 by greg, Fri Sep 3 23:53:50 2010 UTC