--- ray/src/rt/p_data.c 1991/11/12 17:09:34 2.1 +++ ray/src/rt/p_data.c 2003/02/22 02:07:29 2.5 @@ -1,19 +1,73 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: p_data.c,v 2.5 2003/02/22 02:07:29 greg Exp $"; #endif - /* * p_data.c - routine for stored patterns. + */ + +/* ==================================================================== + * 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 pattern can either be brightness or * color data. Brightness data is specified as: @@ -52,47 +106,34 @@ p_bdata(m, r) /* interpolate brightness data */ register OBJREC *m; RAY *r; { - extern double varvalue(), funvalue(), datavalue(); - extern int errno; - int nv; double bval; double pt[MAXDIM]; DATARRAY *dp; - register char **sa; + register MFUNC *mf; + register int i; - setfunc(m, r); - - sa = m->oargs.sarg; - if (m->oargs.nsargs < 4) objerror(m, USER, "bad # arguments"); - funcfile(sa[2]); + dp = getdata(m->oargs.sarg[1]); + i = (1 << dp->nd) - 1; + mf = getfunc(m, 2, i<<3, 0); + setfunc(m, r); errno = 0; - for (nv = 0; nv+3 < m->oargs.nsargs && - sa[nv+3][0] != '-'; nv++) { - if (nv >= MAXDIM) - goto dimerr; - pt[nv] = varvalue(sa[nv+3]); + for (i = dp->nd; i-- > 0; ) { + pt[i] = evalue(mf->ep[i]); + if (errno) + goto computerr; } - if (errno) - goto computerr; - dp = getdata(sa[1]); - if (dp->nd != nv) - goto dimerr; bval = datavalue(dp, pt); errno = 0; - bval = funvalue(sa[0], 1, &bval); + bval = funvalue(m->oargs.sarg[0], 1, &bval); if (errno) goto computerr; scalecolor(r->pcol, bval); - return; - -dimerr: - objerror(m, USER, "dimension error"); - + return(0); computerr: objerror(m, WARNING, "compute error"); - return; + return(0); } @@ -100,52 +141,46 @@ p_cdata(m, r) /* interpolate color data */ register OBJREC *m; RAY *r; { - extern double varvalue(), funvalue(), datavalue(); - extern int errno; - int i, nv; double col[3]; COLOR cval; double pt[MAXDIM]; + int nv; DATARRAY *dp; - register char **sa; + register MFUNC *mf; + register int i; - setfunc(m, r); - - sa = m->oargs.sarg; - if (m->oargs.nsargs < 8) objerror(m, USER, "bad # arguments"); - funcfile(sa[6]); - for (nv = 0; nv+7 < m->oargs.nsargs && - sa[nv+7][0] != '-'; nv++) { - if (nv >= MAXDIM) - goto dimerr; - errno = 0; - pt[nv] = varvalue(sa[nv+7]); + dp = getdata(m->oargs.sarg[3]); + i = (1 << (nv = dp->nd)) - 1; + mf = getfunc(m, 6, i<<7, 0); + setfunc(m, r); + errno = 0; + for (i = 0; i < nv; i++) { + pt[i] = evalue(mf->ep[i]); if (errno) goto computerr; } - for (i = 0; i < 3; i++) { - dp = getdata(sa[i+3]); + col[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"); col[i] = datavalue(dp, pt); } errno = 0; - setcolor(cval, funvalue(sa[0], 3, col), - funvalue(sa[1], 3, col), - funvalue(sa[2], 3, col)); + for (i = 0; i < 3; i++) + if (fundefined(m->oargs.sarg[i]) < 3) + colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i); + else + colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col); if (errno) goto computerr; multcolor(r->pcol, cval); - return; - -dimerr: - objerror(m, USER, "dimension error"); - + return(0); computerr: objerror(m, WARNING, "compute error"); - return; + return(0); } @@ -153,40 +188,37 @@ p_pdata(m, r) /* interpolate picture data */ register OBJREC *m; RAY *r; { - extern double varvalue(), funvalue(), datavalue(); - extern int errno; - int i; double col[3]; COLOR cval; double pt[2]; DATARRAY *dp; - register char **sa; + register MFUNC *mf; + register int i; - setfunc(m, r); - - sa = m->oargs.sarg; - if (m->oargs.nsargs < 7) objerror(m, USER, "bad # arguments"); - funcfile(sa[4]); + mf = getfunc(m, 4, 0x3<<5, 0); + setfunc(m, r); errno = 0; - pt[1] = varvalue(sa[5]); /* y major ordering */ - pt[0] = varvalue(sa[6]); + pt[1] = evalue(mf->ep[0]); /* y major ordering */ + pt[0] = evalue(mf->ep[1]); if (errno) goto computerr; - dp = getpict(sa[3]); + dp = getpict(m->oargs.sarg[3]); for (i = 0; i < 3; i++) col[i] = datavalue(dp+i, pt); errno = 0; - setcolor(cval, funvalue(sa[0], 3, col), - funvalue(sa[1], 3, col), - funvalue(sa[2], 3, col)); + for (i = 0; i < 3; i++) + if (fundefined(m->oargs.sarg[i]) < 3) + colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i); + else + colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col); if (errno) goto computerr; multcolor(r->pcol, cval); - return; + return(0); computerr: objerror(m, WARNING, "compute error"); - return; + return(0); }