ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/t_data.c
(Generate patch)

Comparing ray/src/rt/t_data.c (file contents):
Revision 1.5 by greg, Thu Oct 5 07:23:19 1989 UTC vs.
Revision 2.5 by greg, Sat Feb 22 02:07:29 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1989 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  t_data.c - routine for stored textures
6 + */
7 +
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10   *
11 < *     6/4/86
11 > * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 > * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 > *
14 > * Redistribution and use in source and binary forms, with or without
15 > * modification, are permitted provided that the following conditions
16 > * are met:
17 > *
18 > * 1. Redistributions of source code must retain the above copyright
19 > *         notice, this list of conditions and the following disclaimer.
20 > *
21 > * 2. Redistributions in binary form must reproduce the above copyright
22 > *       notice, this list of conditions and the following disclaimer in
23 > *       the documentation and/or other materials provided with the
24 > *       distribution.
25 > *
26 > * 3. The end-user documentation included with the redistribution,
27 > *           if any, must include the following acknowledgment:
28 > *             "This product includes Radiance software
29 > *                 (http://radsite.lbl.gov/)
30 > *                 developed by the Lawrence Berkeley National Laboratory
31 > *               (http://www.lbl.gov/)."
32 > *       Alternately, this acknowledgment may appear in the software itself,
33 > *       if and wherever such third-party acknowledgments normally appear.
34 > *
35 > * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 > *       and "The Regents of the University of California" must
37 > *       not be used to endorse or promote products derived from this
38 > *       software without prior written permission. For written
39 > *       permission, please contact [email protected].
40 > *
41 > * 5. Products derived from this software may not be called "Radiance",
42 > *       nor may "Radiance" appear in their name, without prior written
43 > *       permission of Lawrence Berkeley National Laboratory.
44 > *
45 > * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 > * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 > * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 > * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 > * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 > * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 > * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 > * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 > * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 > * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 > * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 > * SUCH DAMAGE.
57 > * ====================================================================
58 > *
59 > * This software consists of voluntary contributions made by many
60 > * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 > * information on Lawrence Berkeley National Laboratory, please see
62 > * <http://www.lbl.gov/>.
63   */
64  
65   #include  "ray.h"
66  
67   #include  "data.h"
68  
69 + #include  "func.h"
70 +
71   /*
72   *      A stored texture is specified as follows:
73   *
# Line 31 | Line 85 | static char SCCSid[] = "$SunId$ LBL";
85   *  to get from the original coordinates to the current coordinates.
86   */
87  
34 typedef struct {
35        struct {
36                double  sca;            /* scale factor */
37                double  xfm[4][4];      /* transformation matrix */
38        }  fore, back;
39 }  XFORM;
88  
41
89   t_data(m, r)                    /* interpolate texture data */
90   register OBJREC  *m;
91   RAY  *r;
92   {
46        extern double  varvalue(), funvalue(), datavalue();
47        extern int  errno;
93          int  nv;
94 <        FVECT  dval, disp;
95 <        double  pt[MAXDIM];
94 >        FVECT  disp;
95 >        double  dval[3], pt[MAXDIM];
96          double  d;
97          DATARRAY  *dp;
98 <        register XFORM  *mxf;
54 <        register char  **sa;
98 >        register MFUNC  *mf;
99          register int  i;
100  
101          if (m->oargs.nsargs < 8)
102                  objerror(m, USER, "bad # arguments");
103 <        sa = m->oargs.sarg;
104 <
105 <        for (i = 7; i < m->oargs.nsargs && sa[i][0] != '-'; i++)
106 <                ;
63 <        nv = i-7;
64 <        if ((mxf = (XFORM *)m->os) == NULL) {
65 <                mxf = (XFORM *)malloc(sizeof(XFORM));
66 <                if (mxf == NULL)
67 <                        goto memerr;
68 <                if (xf(mxf->fore.xfm, &mxf->fore.sca,
69 <                        m->oargs.nsargs-i, sa+i) != m->oargs.nsargs-i)
70 <                        objerror(m, USER, "bad transform");
71 <                if (mxf->fore.sca < 0.0)
72 <                        mxf->fore.sca = -mxf->fore.sca;
73 <                invxf(mxf->back.xfm, &mxf->back.sca,
74 <                                m->oargs.nsargs-i, sa+i);
75 <                if (mxf->back.sca < 0.0)
76 <                        mxf->back.sca = -mxf->back.sca;
77 <                m->os = (char *)mxf;
78 <        }
79 <
80 <        setmap(m, r, mxf->back.xfm, mxf->back.sca);
81 <
82 <        if (nv > MAXDIM)
83 <                goto dimerr;
84 <        if (!vardefined(sa[7]))
85 <                loadfunc(sa[6]);
103 >        dp = getdata(m->oargs.sarg[3]);
104 >        i = (1 << (nv = dp->nd)) - 1;
105 >        mf = getfunc(m, 6, i<<7, 1);
106 >        setfunc(m, r);
107          errno = 0;
108          for (i = 0; i < nv; i++)
109 <                pt[i] = varvalue(sa[i+7]);
109 >                pt[i] = evalue(mf->ep[i]);
110          if (errno)
111                  goto computerr;
112 <        for (i = 0; i < 3; i++) {
113 <                dp = getdata(sa[i+3]);
112 >        dval[0] = datavalue(dp, pt);
113 >        for (i = 1; i < 3; i++) {
114 >                dp = getdata(m->oargs.sarg[i+3]);
115                  if (dp->nd != nv)
116 <                        goto dimerr;
116 >                        objerror(m, USER, "dimension error");
117                  dval[i] = datavalue(dp, pt);
118          }
119          errno = 0;
120          for (i = 0; i < 3; i++)
121 <                disp[i] = funvalue(sa[i], 3, dval);
121 >                disp[i] = funvalue(m->oargs.sarg[i], 3, dval);
122          if (errno)
123                  goto computerr;
124 <
125 <        multv3(disp, disp, mxf->fore.xfm);
126 <        multv3(disp, disp, r->rofx);
127 <        d = 1.0 / (mxf->fore.sca * r->rofs);
124 >        if (mf->f != &unitxf)
125 >                multv3(disp, disp, mf->f->xfm);
126 >        if (r->rox != NULL) {
127 >                multv3(disp, disp, r->rox->f.xfm);
128 >                d = 1.0 / (mf->f->sca * r->rox->f.sca);
129 >        } else
130 >                d = 1.0 / mf->f->sca;
131          for (i = 0; i < 3; i++)
132                  r->pert[i] += disp[i] * d;
133 <        return;
109 < dimerr:
110 <        objerror(m, USER, "dimension error");
111 < memerr:
112 <        error(SYSTEM, "out of memory in t_data");
133 >        return(0);
134   computerr:
135          objerror(m, WARNING, "compute error");
136 <        return;
136 >        return(0);
137   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines