1 |
|
#ifndef lint |
2 |
< |
static const char RCSid[] = "$Id$"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
4 |
|
/* |
5 |
|
* Convert Radiance -> OpenGL surfaces. |
142 |
|
objerror(o, USER, "bad # real arguments"); |
143 |
|
area = polyarea(cent, norm, o->oargs.nfargs/3, (FVECT *)o->oargs.farg); |
144 |
|
if (area <= FTINY) |
145 |
< |
return; |
145 |
> |
return(0); |
146 |
|
if (dolights) /* check for source */ |
147 |
|
doflatsrc((MATREC *)o->os, cent, norm, area); |
148 |
|
setmaterial((MATREC *)o->os, cent, 1); /* set material */ |
177 |
|
(GLdouble)o->oargs.farg[3*i+1], |
178 |
|
(GLdouble)o->oargs.farg[3*i+2]); |
179 |
|
} |
180 |
+ |
return(0); |
181 |
|
} |
182 |
|
|
183 |
|
|
208 |
|
o->otype = o->otype==OBJ_SPHERE ? OBJ_BUBBLE : OBJ_SPHERE; |
209 |
|
o->oargs.farg[3] = -o->oargs.farg[3]; |
210 |
|
} else if (o->oargs.farg[3] <= FTINY) |
211 |
< |
return; |
211 |
> |
return(0); |
212 |
|
if (dolights) |
213 |
|
dosphsrc((MATREC *)o->os, o->oargs.farg, |
214 |
|
PI*o->oargs.farg[3]*o->oargs.farg[3]); |
224 |
|
(GLdouble)o->oargs.farg[2]); |
225 |
|
gluSphere(gluqo, (GLdouble)o->oargs.farg[3], NSLICES, NSTACKS); |
226 |
|
glPopMatrix(); |
227 |
+ |
return(0); |
228 |
|
} |
229 |
|
|
230 |
|
|
280 |
|
x1 = o->oargs.farg[1] - o->oargs.farg[4]; |
281 |
|
y1 = o->oargs.farg[3] - o->oargs.farg[0]; |
282 |
|
/* z1 = 0; */ |
283 |
< |
d = 180./PI * asin(sqrt(x1*x1 + y1*y1) / h); |
283 |
> |
d = x1*x1 + y1*y1; |
284 |
> |
if (d <= FTINY*FTINY) |
285 |
> |
x1 = 1.; |
286 |
> |
else |
287 |
> |
d = 180./PI * asin(sqrt(d) / h); |
288 |
|
if (o->oargs.farg[5] < o->oargs.farg[2]) |
289 |
|
d = 180. - d; |
290 |
|
if (d > FTINY) |
292 |
|
gluCylinder(gluqo, o->oargs.farg[6], o->oargs.farg[iscyl ? 6 : 7], |
293 |
|
h, NSLICES, 1); |
294 |
|
glPopMatrix(); |
295 |
+ |
return(0); |
296 |
|
} |
297 |
|
|
298 |
|
|
300 |
|
o_ring(o) /* convert a ring */ |
301 |
|
register OBJREC *o; |
302 |
|
{ |
303 |
< |
double x1, y1, d; |
303 |
> |
double x1, y1, d, h; |
304 |
|
|
305 |
|
if (o->oargs.nfargs != 8) |
306 |
|
objerror(o, USER, "bad # real arguments"); |
329 |
|
glTranslated((GLdouble)o->oargs.farg[0], (GLdouble)o->oargs.farg[1], |
330 |
|
(GLdouble)o->oargs.farg[2]); |
331 |
|
/* compute rotation angle */ |
332 |
< |
d = VLEN(o->oargs.farg+3); |
333 |
< |
if (d <= FTINY) |
332 |
> |
h = VLEN(o->oargs.farg+3); |
333 |
> |
if (h <= FTINY) |
334 |
|
return; |
335 |
|
x1 = -o->oargs.farg[4]; |
336 |
|
y1 = o->oargs.farg[3]; |
337 |
|
/* z1 = 0; */ |
338 |
< |
d = 180./PI * asin(sqrt(x1*x1 + y1*y1) / d); |
338 |
> |
d = x1*x1 + y1*y1; |
339 |
> |
if (d <= FTINY*FTINY) |
340 |
> |
x1 = 1.; |
341 |
> |
else |
342 |
> |
d = 180./PI * asin(sqrt(d) / h); |
343 |
|
if (o->oargs.farg[5] < 0.) |
344 |
|
d = 180. - d; |
345 |
|
if (d > FTINY) |
346 |
|
glRotated(d, (GLdouble)x1, (GLdouble)y1, 0.); |
347 |
|
gluDisk(gluqo, o->oargs.farg[6], o->oargs.farg[7], NSLICES, 1); |
348 |
|
glPopMatrix(); |
349 |
+ |
return(0); |
350 |
|
} |