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

Comparing ray/src/common/cone.c (file contents):
Revision 2.4 by greg, Thu Nov 19 21:32:48 1992 UTC vs.
Revision 2.9 by schorsch, Sun Jul 27 22:12:01 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1992 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   *  cone.c - routines for making cones
9 – *
10 – *     2/12/86
6   */
7  
8 + #include "copyright.h"
9 +
10   #include  "standard.h"
11  
12   #include  "object.h"
# Line 59 | 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 82 | 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 129 | 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 146 | 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  
150 + void
151   freecone(o)                     /* free memory associated with cone */
152   OBJREC  *o;
153   {
# Line 157 | Line 156 | OBJREC  *o;
156          if (co == NULL)
157                  return;
158          if (co->tm != NULL)
159 <                free((char *)co->tm);
160 <        free((char *)co);
159 >                free((void *)co->tm);
160 >        free((void *)co);
161          o->os = NULL;
162   }
163  
164  
165 + void
166   conexform(co)                   /* get cone transformation matrix */
167   register CONE  *co;
168   {
# Line 170 | 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 206 | 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 (old)
> Changed lines (new)