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

Comparing ray/src/rt/mx_data.c (file contents):
Revision 2.6 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.11 by greg, Wed Nov 15 18:02:53 2023 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  mx_data.c - routine for stored mixtures.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
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 < */
8 > #include "copyright.h"
9  
10   #include  "ray.h"
66 –
11   #include  "data.h"
68 –
12   #include  "func.h"
13 + #include  "rtotypes.h"
14  
15   /*
16   *  A stored mixture is specified:
# Line 97 | Line 41 | static const char      RCSid[] = "$Id$";
41   */
42  
43  
44 < mx_data(m, r)                   /* interpolate mixture data */
45 < register OBJREC  *m;
46 < RAY  *r;
44 > int
45 > mx_data(                        /* interpolate mixture data */
46 >        OBJREC  *m,
47 >        RAY  *r
48 > )
49   {
50          OBJECT  obj;
51          double  coef;
52 <        double  pt[MAXDIM];
52 >        double  pt[MAXDDIM];
53          DATARRAY  *dp;
54          OBJECT  mod[2];
55 <        register MFUNC  *mf;
56 <        register int  i;
55 >        MFUNC  *mf;
56 >        int  i;
57  
58          if (m->oargs.nsargs < 6)
59                  objerror(m, USER, "bad # arguments");
# Line 127 | Line 73 | RAY  *r;
73          errno = 0;
74          for (i = 0; i < dp->nd; i++) {
75                  pt[i] = evalue(mf->ep[i]);
76 <                if (errno)
76 >                if (errno == EDOM || errno == ERANGE)
77                          goto computerr;
78          }
79          coef = datavalue(dp, pt);
80          errno = 0;
81          coef = funvalue(m->oargs.sarg[2], 1, &coef);
82 <        if (errno)
82 >        if (errno == EDOM || errno == ERANGE)
83                  goto computerr;
84          if (raymixture(r, mod[0], mod[1], coef)) {
85                  if (m->omod != OVOID)
# Line 147 | Line 93 | computerr:
93   }
94  
95  
96 < mx_pdata(m, r)                  /* interpolate mixture picture */
97 < register OBJREC  *m;
98 < RAY  *r;
96 > int
97 > mx_pdata(                       /* interpolate mixture picture */
98 >        OBJREC  *m,
99 >        RAY  *r
100 > )
101   {
102          OBJECT  obj;
103          double  col[3], coef;
104 <        double  pt[MAXDIM];
104 >        double  pt[MAXDDIM];
105          DATARRAY  *dp;
106          OBJECT  mod[2];
107 <        register MFUNC  *mf;
108 <        register int  i;
107 >        MFUNC  *mf;
108 >        int  i;
109  
110          if (m->oargs.nsargs < 7)
111                  objerror(m, USER, "bad # arguments");
# Line 176 | Line 124 | RAY  *r;
124          errno = 0;
125          pt[1] = evalue(mf->ep[0]);      /* y major ordering */
126          pt[0] = evalue(mf->ep[1]);
127 <        if (errno)
127 >        if (errno == EDOM || errno == ERANGE)
128                  goto computerr;
129          for (i = 0; i < 3; i++)         /* get pixel from picture */
130                  col[i] = datavalue(dp+i, pt);
131          errno = 0;                      /* evaluate function on pixel */
132          coef = funvalue(m->oargs.sarg[2], 3, col);
133 <        if (errno)
133 >        if (errno == EDOM || errno == ERANGE)
134                  goto computerr;
135          if (raymixture(r, mod[0], mod[1], coef)) {
136                  if (m->omod != OVOID)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines