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 |
|
|
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"); |
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 |
|
} |
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; |
147 |
|
argcerr: |
148 |
|
objerror(o, USER, "bad # arguments"); |
149 |
|
raderr: |
150 |
< |
objerror(o, USER, "illegal radii"); |
151 |
< |
return NULL; /* pro forma return */ |
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 */ |
152 |
< |
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; |
168 |
|
|
169 |
|
|
170 |
|
void |
171 |
< |
conexform(co) /* get cone transformation matrix */ |
167 |
< |
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 = (RREAL (*)[4])malloc(sizeof(MAT4)); |
178 |
|
if (co->tm == NULL) |