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

Comparing ray/src/common/cone.c (file contents):
Revision 2.5 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.9 by schorsch, Sun Jul 27 22:12:01 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  cone.c - routines for making cones
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  "standard.h"
11  
# Line 111 | Line 56 | int  getxf;
56  
57                  co->ca = o->oargs.farg;
58                                                  /* get radii */
59 <                if (o->otype == OBJ_CYLINDER | o->otype == OBJ_TUBE) {
59 >                if ((o->otype == OBJ_CYLINDER) | (o->otype == OBJ_TUBE)) {
60                          if (o->oargs.nfargs != 7)
61                                  goto argcerr;
62                          if (co->ca[6] < -FTINY) {
# Line 134 | Line 79 | int  getxf;
79                          else sgn1 = 0;
80                          if (sgn0+sgn1 == 0)
81                                  goto raderr;
82 <                        if (sgn0 < 0 | sgn1 < 0) {
82 >                        if ((sgn0 < 0) | (sgn1 < 0)) {
83                                  objerror(o, o->otype==OBJ_RING?USER:WARNING,
84                                          "negative radii");
85                                  o->otype = o->otype == OBJ_CONE ?
# Line 181 | Line 126 | int  getxf;
126                  if (o->otype == OBJ_RING) {
127                          co->al = 0.0;
128                          co->sl = CO_R1(co) - CO_R0(co);
129 <                } else if (o->otype == OBJ_CONE | o->otype == OBJ_CUP) {
129 >                } else if ((o->otype == OBJ_CONE) | (o->otype == OBJ_CUP)) {
130                          co->sl = co->ca[7] - co->ca[6];
131                          co->sl = sqrt(co->sl*co->sl + co->al*co->al);
132                  } else { /* OBJ_CYLINDER or OBJ_TUBE */
# Line 198 | Line 143 | argcerr:
143          objerror(o, USER, "bad # arguments");
144   raderr:
145          objerror(o, USER, "illegal radii");
146 +        return NULL; /* pro forma return */
147   }
148  
149  
# Line 224 | Line 170 | register CONE  *co;
170          register double  d;
171          register int  i;
172  
173 <        co->tm = (FLOAT (*)[4])malloc(sizeof(MAT4));
173 >        co->tm = (RREAL (*)[4])malloc(sizeof(MAT4));
174          if (co->tm == NULL)
175                  error(SYSTEM, "out of memory in conexform");
176  
# Line 260 | Line 206 | register CONE  *co;
206          multmat4(co->tm, co->tm, m4);
207  
208                                  /* scale z-axis */
209 <        if (co->p0 != co->p1 & co->r0 != co->r1) {
209 >        if ((co->p0 != co->p1) & (co->r0 != co->r1)) {
210                  setident4(m4);
211                  m4[2][2] = (CO_R1(co) - CO_R0(co)) / co->al;
212                  multmat4(co->tm, co->tm, m4);

Diff Legend

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