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.11 by greg, Fri Sep 16 15:09:21 2016 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 96 | Line 41 | static const char      RCSid[] = "$Id$";
41  
42  
43   CONE *
44 < getcone(o, getxf)                       /* get cone structure */
45 < register OBJREC  *o;
46 < int  getxf;
44 > getcone(                                /* get cone structure */
45 >        OBJREC  *o,
46 >        int  getxf
47 > )
48   {
49          int  sgn0, sgn1;
50 <        register CONE  *co;
50 >        CONE  *co;
51  
52          if ((co = (CONE *)o->os) == NULL) {
53  
# Line 111 | Line 57 | int  getxf;
57  
58                  co->ca = o->oargs.farg;
59                                                  /* get radii */
60 <                if (o->otype == OBJ_CYLINDER | o->otype == OBJ_TUBE) {
60 >                if ((o->otype == OBJ_CYLINDER) | (o->otype == OBJ_TUBE)) {
61                          if (o->oargs.nfargs != 7)
62                                  goto argcerr;
63                          if (co->ca[6] < -FTINY) {
# Line 134 | Line 80 | int  getxf;
80                          else sgn1 = 0;
81                          if (sgn0+sgn1 == 0)
82                                  goto raderr;
83 <                        if (sgn0 < 0 | sgn1 < 0) {
84 <                                objerror(o, o->otype==OBJ_RING?USER:WARNING,
85 <                                        "negative radii");
83 >                        if ((sgn0 < 0) | (sgn1 < 0)) {
84 >                                if (o->otype == OBJ_RING)
85 >                                        goto raderr;
86 >                                objerror(o, WARNING, "negative radii");
87                                  o->otype = o->otype == OBJ_CONE ?
88                                                  OBJ_CUP : OBJ_CONE;
89                          }
# Line 175 | Line 122 | int  getxf;
122                          co->ad[2] = CO_P1(co)[2] - CO_P0(co)[2];
123                  }
124                  co->al = normalize(co->ad);
125 <                if (co->al == 0.0)
126 <                        objerror(o, USER, "zero orientation");
125 >                if (co->al == 0.0) {
126 >                        objerror(o, WARNING, "unknown orientation");
127 >                        free(co);
128 >                        return(NULL);
129 >                }
130                                          /* compute axis and side lengths */
131                  if (o->otype == OBJ_RING) {
132                          co->al = 0.0;
133                          co->sl = CO_R1(co) - CO_R0(co);
134 <                } else if (o->otype == OBJ_CONE | o->otype == OBJ_CUP) {
134 >                } else if ((o->otype == OBJ_CONE) | (o->otype == OBJ_CUP)) {
135                          co->sl = co->ca[7] - co->ca[6];
136                          co->sl = sqrt(co->sl*co->sl + co->al*co->al);
137                  } else { /* OBJ_CYLINDER or OBJ_TUBE */
# Line 197 | Line 147 | int  getxf;
147   argcerr:
148          objerror(o, USER, "bad # arguments");
149   raderr:
150 <        objerror(o, USER, "illegal radii");
150 >        objerror(o, WARNING, "illegal radii");
151 >        free(co);
152 >        return(NULL);
153   }
154  
155  
156   void
157 < freecone(o)                     /* free memory associated with cone */
206 < OBJREC  *o;
157 > freecone(OBJREC *o)             /* free memory associated with cone */
158   {
159 <        register CONE  *co = (CONE *)o->os;
159 >        CONE  *co = (CONE *)o->os;
160  
161          if (co == NULL)
162                  return;
# Line 217 | Line 168 | OBJREC  *o;
168  
169  
170   void
171 < conexform(co)                   /* get cone transformation matrix */
221 < register CONE  *co;
171 > conexform(CONE *co)                     /* get cone transformation matrix */
172   {
173          MAT4  m4;
174 <        register double  d;
175 <        register int  i;
174 >        double  d;
175 >        int  i;
176  
177 <        co->tm = (FLOAT (*)[4])malloc(sizeof(MAT4));
177 >        co->tm = (RREAL (*)[4])malloc(sizeof(MAT4));
178          if (co->tm == NULL)
179                  error(SYSTEM, "out of memory in conexform");
180  
# Line 260 | Line 210 | register CONE  *co;
210          multmat4(co->tm, co->tm, m4);
211  
212                                  /* scale z-axis */
213 <        if (co->p0 != co->p1 & co->r0 != co->r1) {
213 >        if ((co->p0 != co->p1) & (co->r0 != co->r1)) {
214                  setident4(m4);
215                  m4[2][2] = (CO_R1(co) - CO_R0(co)) / co->al;
216                  multmat4(co->tm, co->tm, m4);

Diff Legend

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