1 |
< |
/* Copyright (c) 1991 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1992 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
48 |
|
register OBJREC *o; |
49 |
|
int getxf; |
50 |
|
{ |
51 |
< |
double fabs(), sqrt(); |
51 |
> |
extern double sqrt(); |
52 |
|
int sgn0, sgn1; |
53 |
|
register CONE *co; |
54 |
|
|
60 |
|
|
61 |
|
co->ca = o->oargs.farg; |
62 |
|
/* get radii */ |
63 |
< |
if (o->otype == OBJ_CYLINDER || o->otype == OBJ_TUBE) { |
63 |
> |
if (o->otype == OBJ_CYLINDER | o->otype == OBJ_TUBE) { |
64 |
|
if (o->oargs.nfargs != 7) |
65 |
|
goto argcerr; |
66 |
|
if (co->ca[6] < -FTINY) { |
70 |
|
co->ca[6] = -co->ca[6]; |
71 |
|
} else if (co->ca[6] <= FTINY) |
72 |
|
goto raderr; |
73 |
+ |
co->p0 = 0; co->p1 = 3; |
74 |
|
co->r0 = co->r1 = 6; |
75 |
|
} else { |
76 |
|
if (o->oargs.nfargs != 8) |
83 |
|
else sgn1 = 0; |
84 |
|
if (sgn0+sgn1 == 0) |
85 |
|
goto raderr; |
86 |
< |
if (sgn0 < 0 || sgn1 < 0) { |
86 |
> |
if (sgn0 < 0 | sgn1 < 0) { |
87 |
|
objerror(o, o->otype==OBJ_RING?USER:WARNING, |
88 |
|
"negative radii"); |
89 |
|
o->otype = o->otype == OBJ_CONE ? |
91 |
|
} |
92 |
|
co->ca[6] = co->ca[6]*sgn0; |
93 |
|
co->ca[7] = co->ca[7]*sgn1; |
94 |
< |
co->r0 = 6; |
94 |
< |
co->r1 = 7; |
95 |
< |
if (fabs(co->ca[7] - co->ca[6]) <= FTINY) { |
94 |
> |
if (co->ca[7] - co->ca[6] > FTINY) { |
95 |
|
if (o->otype == OBJ_RING) |
96 |
+ |
co->p0 = co->p1 = 0; |
97 |
+ |
else { |
98 |
+ |
co->p0 = 0; co->p1 = 3; |
99 |
+ |
} |
100 |
+ |
co->r0 = 6; co->r1 = 7; |
101 |
+ |
} else if (co->ca[6] - co->ca[7] > FTINY) { |
102 |
+ |
if (o->otype == OBJ_RING) |
103 |
+ |
co->p0 = co->p1 = 0; |
104 |
+ |
else { |
105 |
+ |
co->p0 = 3; co->p1 = 0; |
106 |
+ |
} |
107 |
+ |
co->r0 = 7; co->r1 = 6; |
108 |
+ |
} else { |
109 |
+ |
if (o->otype == OBJ_RING) |
110 |
|
goto raderr; |
111 |
|
o->otype = o->otype == OBJ_CONE ? |
112 |
|
OBJ_CYLINDER : OBJ_TUBE; |
113 |
|
o->oargs.nfargs = 7; |
114 |
< |
co->r1 = 6; |
114 |
> |
co->p0 = 0; co->p1 = 3; |
115 |
> |
co->r0 = co->r1 = 6; |
116 |
|
} |
117 |
|
} |
118 |
|
/* get axis orientation */ |
119 |
< |
co->p0 = 0; |
106 |
< |
if (o->otype == OBJ_RING) { |
107 |
< |
if (co->ca[6] > co->ca[7]) { /* make r0 smaller */ |
108 |
< |
co->r0 = 7; |
109 |
< |
co->r1 = 6; |
110 |
< |
} |
111 |
< |
co->p1 = 0; |
119 |
> |
if (o->otype == OBJ_RING) |
120 |
|
VCOPY(co->ad, o->oargs.farg+3); |
121 |
< |
} else { |
122 |
< |
co->p1 = 3; |
123 |
< |
co->ad[0] = co->ca[3] - co->ca[0]; |
124 |
< |
co->ad[1] = co->ca[4] - co->ca[1]; |
117 |
< |
co->ad[2] = co->ca[5] - co->ca[2]; |
121 |
> |
else { |
122 |
> |
co->ad[0] = CO_P1(co)[0] - CO_P0(co)[0]; |
123 |
> |
co->ad[1] = CO_P1(co)[1] - CO_P0(co)[1]; |
124 |
> |
co->ad[2] = CO_P1(co)[2] - CO_P0(co)[2]; |
125 |
|
} |
126 |
|
co->al = normalize(co->ad); |
127 |
|
if (co->al == 0.0) |
129 |
|
/* compute axis and side lengths */ |
130 |
|
if (o->otype == OBJ_RING) { |
131 |
|
co->al = 0.0; |
132 |
< |
co->sl = co->ca[co->r1] - co->ca[co->r0]; |
133 |
< |
} else if (o->otype == OBJ_CONE || o->otype == OBJ_CUP) { |
132 |
> |
co->sl = CO_R1(co) - CO_R0(co); |
133 |
> |
} else if (o->otype == OBJ_CONE | o->otype == OBJ_CUP) { |
134 |
|
co->sl = co->ca[7] - co->ca[6]; |
135 |
|
co->sl = sqrt(co->sl*co->sl + co->al*co->al); |
136 |
< |
} else { /* OBJ_CYLINDER || OBJ_TUBE */ |
136 |
> |
} else { /* OBJ_CYLINDER or OBJ_TUBE */ |
137 |
|
co->sl = co->al; |
138 |
|
} |
139 |
|
co->tm = NULL; |
167 |
|
conexform(co) /* get cone transformation matrix */ |
168 |
|
register CONE *co; |
169 |
|
{ |
170 |
< |
double sqrt(), fabs(); |
171 |
< |
double m4[4][4]; |
170 |
> |
extern double sqrt(); |
171 |
> |
MAT4 m4; |
172 |
|
register double d; |
173 |
|
register int i; |
174 |
|
|
175 |
< |
co->tm = (double (*)[4])malloc(sizeof(m4)); |
175 |
> |
co->tm = (FLOAT (*)[4])malloc(sizeof(MAT4)); |
176 |
|
if (co->tm == NULL) |
177 |
|
error(SYSTEM, "out of memory in conexform"); |
178 |
|
|
181 |
|
if (co->r0 == co->r1) |
182 |
|
d = 0.0; |
183 |
|
else |
184 |
< |
d = co->ca[co->r0] / (co->ca[co->r1] - co->ca[co->r0]); |
184 |
> |
d = CO_R0(co) / (CO_R1(co) - CO_R0(co)); |
185 |
|
for (i = 0; i < 3; i++) |
186 |
< |
co->tm[3][i] = d*(co->ca[co->p1+i] - co->ca[co->p0+i]) |
187 |
< |
- co->ca[co->p0+i]; |
186 |
> |
co->tm[3][i] = d*(CO_P1(co)[i] - CO_P0(co)[i]) |
187 |
> |
- CO_P0(co)[i]; |
188 |
|
|
189 |
|
/* rotate to positive z-axis */ |
190 |
|
setident4(m4); |
208 |
|
multmat4(co->tm, co->tm, m4); |
209 |
|
|
210 |
|
/* scale z-axis */ |
211 |
< |
setident4(m4); |
212 |
< |
if (co->p0 != co->p1 && co->r0 != co->r1) { |
213 |
< |
d = fabs(co->ca[co->r1] - co->ca[co->r0]); |
214 |
< |
m4[2][2] = d/co->al; |
211 |
> |
if (co->p0 != co->p1 & co->r0 != co->r1) { |
212 |
> |
setident4(m4); |
213 |
> |
m4[2][2] = (CO_R1(co) - CO_R0(co)) / co->al; |
214 |
> |
multmat4(co->tm, co->tm, m4); |
215 |
|
} |
209 |
– |
multmat4(co->tm, co->tm, m4); |
216 |
|
} |