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

Comparing ray/src/common/xf.c (file contents):
Revision 2.1 by greg, Tue Nov 12 16:54:14 1991 UTC vs.
Revision 2.4 by greg, Sat Feb 22 02:07:23 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1990 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   *  xf.c - routines to convert transform arguments into 4X4 matrix.
6   *
7 < *     1/28/86
7 > *  External symbols declared in standard.h
8   */
9  
10 + /* ====================================================================
11 + * The Radiance Software License, Version 1.0
12 + *
13 + * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 + * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 + *
16 + * Redistribution and use in source and binary forms, with or without
17 + * modification, are permitted provided that the following conditions
18 + * are met:
19 + *
20 + * 1. Redistributions of source code must retain the above copyright
21 + *         notice, this list of conditions and the following disclaimer.
22 + *
23 + * 2. Redistributions in binary form must reproduce the above copyright
24 + *       notice, this list of conditions and the following disclaimer in
25 + *       the documentation and/or other materials provided with the
26 + *       distribution.
27 + *
28 + * 3. The end-user documentation included with the redistribution,
29 + *           if any, must include the following acknowledgment:
30 + *             "This product includes Radiance software
31 + *                 (http://radsite.lbl.gov/)
32 + *                 developed by the Lawrence Berkeley National Laboratory
33 + *               (http://www.lbl.gov/)."
34 + *       Alternately, this acknowledgment may appear in the software itself,
35 + *       if and wherever such third-party acknowledgments normally appear.
36 + *
37 + * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 + *       and "The Regents of the University of California" must
39 + *       not be used to endorse or promote products derived from this
40 + *       software without prior written permission. For written
41 + *       permission, please contact [email protected].
42 + *
43 + * 5. Products derived from this software may not be called "Radiance",
44 + *       nor may "Radiance" appear in their name, without prior written
45 + *       permission of Lawrence Berkeley National Laboratory.
46 + *
47 + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 + * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 + * SUCH DAMAGE.
59 + * ====================================================================
60 + *
61 + * This software consists of voluntary contributions made by many
62 + * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 + * information on Lawrence Berkeley National Laboratory, please see
64 + * <http://www.lbl.gov/>.
65 + */
66 +
67   #include  "standard.h"
68  
69   #define  d2r(a)         ((PI/180.)*(a))
# Line 23 | Line 77 | register XF  *ret;
77   int  ac;
78   char  *av[];
79   {
26 –        double  atof(), sin(), cos();
80          MAT4  xfmat, m4;
81          double  xfsca, dtmp;
82          int  i, icnt;
# Line 69 | Line 122 | char  *av[];
122                                  m4[1][0] = -(m4[0][1] = sin(dtmp));
123                                  break;
124                          default:
125 <                                return(i);
125 >                                goto done;
126                          }
127                          break;
128  
# Line 102 | Line 155 | char  *av[];
155                                  m4[2][2] = -1.0;
156                                  break;
157                          default:
158 <                                return(i);
158 >                                goto done;
159                          }
160                          break;
161  
# Line 118 | Line 171 | char  *av[];
171                          continue;
172  
173                  default:
174 <                        return(i);
174 >                        goto done;
175  
176                  }
177                  multmat4(xfmat, xfmat, m4);
# Line 138 | Line 191 | register XF  *ret;
191   int  ac;
192   char  *av[];
193   {
141 –        double  atof(), sin(), cos();
194          MAT4  xfmat, m4;
195          double  xfsca, dtmp;
196          int  i, icnt;
# Line 184 | Line 236 | char  *av[];
236                                  m4[1][0] = -(m4[0][1] = sin(dtmp));
237                                  break;
238                          default:
239 <                                return(i);
239 >                                goto done;
240                          }
241                          break;
242  
# Line 217 | Line 269 | char  *av[];
269                                  m4[2][2] = -1.0;
270                                  break;
271                          default:
272 <                                return(i);
272 >                                goto done;
273                          }
274                          break;
275  
# Line 233 | Line 285 | char  *av[];
285                          break;
286  
287                  default:
288 <                        return(i);
288 >                        goto done;
289  
290                  }
291                  multmat4(xfmat, m4, xfmat);     /* left multiply */

Diff Legend

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