--- ray/src/rt/t_data.c 1989/04/11 13:30:37 1.3 +++ ray/src/rt/t_data.c 2003/02/22 02:07:29 2.5 @@ -1,19 +1,73 @@ -/* Copyright (c) 1989 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: t_data.c,v 2.5 2003/02/22 02:07:29 greg Exp $"; #endif - /* * t_data.c - routine for stored textures + */ + +/* ==================================================================== + * The Radiance Software License, Version 1.0 * - * 6/4/86 + * Copyright (c) 1990 - 2002 The Regents of the University of California, + * through Lawrence Berkeley National Laboratory. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: + * "This product includes Radiance software + * (http://radsite.lbl.gov/) + * developed by the Lawrence Berkeley National Laboratory + * (http://www.lbl.gov/)." + * Alternately, this acknowledgment may appear in the software itself, + * if and wherever such third-party acknowledgments normally appear. + * + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory" + * and "The Regents of the University of California" must + * not be used to endorse or promote products derived from this + * software without prior written permission. For written + * permission, please contact radiance@radsite.lbl.gov. + * + * 5. Products derived from this software may not be called "Radiance", + * nor may "Radiance" appear in their name, without prior written + * permission of Lawrence Berkeley National Laboratory. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of Lawrence Berkeley National Laboratory. For more + * information on Lawrence Berkeley National Laboratory, please see + * . */ #include "ray.h" #include "data.h" +#include "func.h" + /* * A stored texture is specified as follows: * @@ -31,88 +85,53 @@ static char SCCSid[] = "$SunId$ LBL"; * to get from the original coordinates to the current coordinates. */ -typedef struct { - struct { - double sca; /* scale factor */ - double xfm[4][4]; /* transformation matrix */ - } fore, back; -} XFORM; - t_data(m, r) /* interpolate texture data */ register OBJREC *m; RAY *r; { - extern double varvalue(), funvalue(), datavalue(); - extern int errno; int nv; - FVECT dval, disp; - double pt[MAXDIM]; + FVECT disp; + double dval[3], pt[MAXDIM]; + double d; DATARRAY *dp; - register XFORM *mxf; - register char **sa; + register MFUNC *mf; register int i; if (m->oargs.nsargs < 8) objerror(m, USER, "bad # arguments"); - sa = m->oargs.sarg; - - for (i = 7; i < m->oargs.nsargs && sa[i][0] != '-'; i++) - ; - nv = i-7; - if ((mxf = (XFORM *)m->os) == NULL) { - mxf = (XFORM *)malloc(sizeof(XFORM)); - if (mxf == NULL) - goto memerr; - mxf->fore.sca = 1.0; - setident4(mxf->fore.xfm); - if (xf(mxf->fore.xfm, &mxf->fore.sca, - m->oargs.nsargs-i, sa+i) != m->oargs.nsargs-i) - objerror(m, USER, "bad transform"); - if (mxf->fore.sca < 0.0) - mxf->fore.sca = -mxf->fore.sca; - mxf->back.sca = 1.0; - setident4(mxf->back.xfm); - invxf(mxf->back.xfm, &mxf->back.sca, - m->oargs.nsargs-i, sa+i); - if (mxf->back.sca < 0.0) - mxf->back.sca = -mxf->back.sca; - m->os = (char *)mxf; - } - - setmap(m, r, mxf->back.xfm, mxf->back.sca); - - if (nv > MAXDIM) - goto dimerr; - if (!vardefined(sa[7])) - loadfunc(sa[6]); + dp = getdata(m->oargs.sarg[3]); + i = (1 << (nv = dp->nd)) - 1; + mf = getfunc(m, 6, i<<7, 1); + setfunc(m, r); errno = 0; for (i = 0; i < nv; i++) - pt[i] = varvalue(sa[i+7]); + pt[i] = evalue(mf->ep[i]); if (errno) goto computerr; - for (i = 0; i < 3; i++) { - dp = getdata(sa[i+3]); + dval[0] = datavalue(dp, pt); + for (i = 1; i < 3; i++) { + dp = getdata(m->oargs.sarg[i+3]); if (dp->nd != nv) - goto dimerr; + objerror(m, USER, "dimension error"); dval[i] = datavalue(dp, pt); } errno = 0; for (i = 0; i < 3; i++) - disp[i] = funvalue(sa[i], 3, dval); + disp[i] = funvalue(m->oargs.sarg[i], 3, dval); if (errno) goto computerr; - - multv3(disp, disp, mxf->fore.xfm); - multv3(disp, disp, r->rofx); + if (mf->f != &unitxf) + multv3(disp, disp, mf->f->xfm); + if (r->rox != NULL) { + multv3(disp, disp, r->rox->f.xfm); + d = 1.0 / (mf->f->sca * r->rox->f.sca); + } else + d = 1.0 / mf->f->sca; for (i = 0; i < 3; i++) - r->pert[i] += disp[i] / (mxf->fore.sca * r->rofs); - return; -dimerr: - objerror(m, USER, "dimension error"); -memerr: - error(SYSTEM, "out of memory in t_data"); + r->pert[i] += disp[i] * d; + return(0); computerr: objerror(m, WARNING, "compute error"); - return; + return(0); }