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 |
> |
int sgn0, sgn1; |
52 |
|
register CONE *co; |
53 |
|
|
54 |
|
if ((co = (CONE *)o->os) == NULL) { |
59 |
|
|
60 |
|
co->ca = o->oargs.farg; |
61 |
|
/* get radii */ |
62 |
< |
if (o->otype == OBJ_CYLINDER || o->otype == OBJ_TUBE) { |
62 |
> |
if (o->otype == OBJ_CYLINDER | o->otype == OBJ_TUBE) { |
63 |
|
if (o->oargs.nfargs != 7) |
64 |
|
goto argcerr; |
65 |
< |
if (co->ca[6] <= FTINY) |
65 |
> |
if (co->ca[6] < -FTINY) { |
66 |
> |
objerror(o, WARNING, "negative radius"); |
67 |
> |
o->otype = o->otype == OBJ_CYLINDER ? |
68 |
> |
OBJ_TUBE : OBJ_CYLINDER; |
69 |
> |
co->ca[6] = -co->ca[6]; |
70 |
> |
} else if (co->ca[6] <= FTINY) |
71 |
|
goto raderr; |
72 |
+ |
co->p0 = 0; co->p1 = 3; |
73 |
|
co->r0 = co->r1 = 6; |
74 |
|
} else { |
75 |
|
if (o->oargs.nfargs != 8) |
76 |
|
goto argcerr; |
77 |
< |
if (co->ca[6] < -FTINY || co->ca[7] < -FTINY) |
77 |
> |
if (co->ca[6] < -FTINY) sgn0 = -1; |
78 |
> |
else if (co->ca[6] > FTINY) sgn0 = 1; |
79 |
> |
else sgn0 = 0; |
80 |
> |
if (co->ca[7] < -FTINY) sgn1 = -1; |
81 |
> |
else if (co->ca[7] > FTINY) sgn1 = 1; |
82 |
> |
else sgn1 = 0; |
83 |
> |
if (sgn0+sgn1 == 0) |
84 |
|
goto raderr; |
85 |
< |
if (co->ca[6] < 0.0) co->ca[6] = 0.0; |
86 |
< |
if (co->ca[7] < 0.0) co->ca[7] = 0.0; |
87 |
< |
if (fabs(co->ca[7] - co->ca[6]) <= FTINY) |
88 |
< |
goto raderr; |
89 |
< |
co->r0 = 6; |
90 |
< |
co->r1 = 7; |
85 |
> |
if (sgn0 < 0 | sgn1 < 0) { |
86 |
> |
objerror(o, o->otype==OBJ_RING?USER:WARNING, |
87 |
> |
"negative radii"); |
88 |
> |
o->otype = o->otype == OBJ_CONE ? |
89 |
> |
OBJ_CUP : OBJ_CONE; |
90 |
> |
} |
91 |
> |
co->ca[6] = co->ca[6]*sgn0; |
92 |
> |
co->ca[7] = co->ca[7]*sgn1; |
93 |
> |
if (co->ca[7] - co->ca[6] > FTINY) { |
94 |
> |
if (o->otype == OBJ_RING) |
95 |
> |
co->p0 = co->p1 = 0; |
96 |
> |
else { |
97 |
> |
co->p0 = 0; co->p1 = 3; |
98 |
> |
} |
99 |
> |
co->r0 = 6; co->r1 = 7; |
100 |
> |
} else if (co->ca[6] - co->ca[7] > FTINY) { |
101 |
> |
if (o->otype == OBJ_RING) |
102 |
> |
co->p0 = co->p1 = 0; |
103 |
> |
else { |
104 |
> |
co->p0 = 3; co->p1 = 0; |
105 |
> |
} |
106 |
> |
co->r0 = 7; co->r1 = 6; |
107 |
> |
} else { |
108 |
> |
if (o->otype == OBJ_RING) |
109 |
> |
goto raderr; |
110 |
> |
o->otype = o->otype == OBJ_CONE ? |
111 |
> |
OBJ_CYLINDER : OBJ_TUBE; |
112 |
> |
o->oargs.nfargs = 7; |
113 |
> |
co->p0 = 0; co->p1 = 3; |
114 |
> |
co->r0 = co->r1 = 6; |
115 |
> |
} |
116 |
|
} |
117 |
|
/* get axis orientation */ |
118 |
< |
co->p0 = 0; |
82 |
< |
if (o->otype == OBJ_RING) { |
83 |
< |
if (co->ca[6] > co->ca[7]) { /* make r0 smaller */ |
84 |
< |
co->r0 = 7; |
85 |
< |
co->r1 = 6; |
86 |
< |
} |
87 |
< |
co->p1 = 0; |
118 |
> |
if (o->otype == OBJ_RING) |
119 |
|
VCOPY(co->ad, o->oargs.farg+3); |
120 |
< |
} else { |
121 |
< |
co->p1 = 3; |
122 |
< |
co->ad[0] = co->ca[3] - co->ca[0]; |
123 |
< |
co->ad[1] = co->ca[4] - co->ca[1]; |
93 |
< |
co->ad[2] = co->ca[5] - co->ca[2]; |
120 |
> |
else { |
121 |
> |
co->ad[0] = CO_P1(co)[0] - CO_P0(co)[0]; |
122 |
> |
co->ad[1] = CO_P1(co)[1] - CO_P0(co)[1]; |
123 |
> |
co->ad[2] = CO_P1(co)[2] - CO_P0(co)[2]; |
124 |
|
} |
125 |
|
co->al = normalize(co->ad); |
126 |
|
if (co->al == 0.0) |
128 |
|
/* compute axis and side lengths */ |
129 |
|
if (o->otype == OBJ_RING) { |
130 |
|
co->al = 0.0; |
131 |
< |
co->sl = co->ca[co->r1] - co->ca[co->r0]; |
132 |
< |
} else if (o->otype == OBJ_CONE || o->otype == OBJ_CUP) { |
131 |
> |
co->sl = CO_R1(co) - CO_R0(co); |
132 |
> |
} else if (o->otype == OBJ_CONE | o->otype == OBJ_CUP) { |
133 |
|
co->sl = co->ca[7] - co->ca[6]; |
134 |
|
co->sl = sqrt(co->sl*co->sl + co->al*co->al); |
135 |
< |
} else { /* OBJ_CYLINDER || OBJ_TUBE */ |
135 |
> |
} else { /* OBJ_CYLINDER or OBJ_TUBE */ |
136 |
|
co->sl = co->al; |
137 |
|
} |
138 |
|
co->tm = NULL; |
154 |
|
{ |
155 |
|
register CONE *co = (CONE *)o->os; |
156 |
|
|
157 |
+ |
if (o->os == NULL) |
158 |
+ |
return; |
159 |
|
if (co->tm != NULL) |
160 |
|
free((char *)co->tm); |
161 |
|
free(o->os); |
166 |
|
conexform(co) /* get cone transformation matrix */ |
167 |
|
register CONE *co; |
168 |
|
{ |
169 |
< |
double sqrt(), fabs(); |
138 |
< |
double m4[4][4]; |
169 |
> |
MAT4 m4; |
170 |
|
register double d; |
171 |
|
register int i; |
172 |
|
|
173 |
< |
co->tm = (double (*)[4])malloc(sizeof(m4)); |
173 |
> |
co->tm = (FLOAT (*)[4])malloc(sizeof(MAT4)); |
174 |
|
if (co->tm == NULL) |
175 |
|
error(SYSTEM, "out of memory in conexform"); |
176 |
|
|
179 |
|
if (co->r0 == co->r1) |
180 |
|
d = 0.0; |
181 |
|
else |
182 |
< |
d = co->ca[co->r0] / (co->ca[co->r1] - co->ca[co->r0]); |
182 |
> |
d = CO_R0(co) / (CO_R1(co) - CO_R0(co)); |
183 |
|
for (i = 0; i < 3; i++) |
184 |
< |
co->tm[3][i] = d*(co->ca[co->p1+i] - co->ca[co->p0+i]) |
185 |
< |
- co->ca[co->p0+i]; |
184 |
> |
co->tm[3][i] = d*(CO_P1(co)[i] - CO_P0(co)[i]) |
185 |
> |
- CO_P0(co)[i]; |
186 |
|
|
187 |
|
/* rotate to positive z-axis */ |
188 |
|
setident4(m4); |
206 |
|
multmat4(co->tm, co->tm, m4); |
207 |
|
|
208 |
|
/* scale z-axis */ |
209 |
< |
setident4(m4); |
210 |
< |
if (co->p0 != co->p1 && co->r0 != co->r1) { |
211 |
< |
d = fabs(co->ca[co->r1] - co->ca[co->r0]); |
212 |
< |
m4[2][2] = d/co->al; |
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); |
213 |
|
} |
183 |
– |
multmat4(co->tm, co->tm, m4); |
214 |
|
} |