1 |
|
#ifndef lint |
2 |
< |
static const char RCSid[] = "$Id$"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
4 |
|
/* |
5 |
|
* Convert Radiance -> OpenGL surfaces. |
37 |
|
if (mp != curmat && domats) { |
38 |
|
NOPOLY(); |
39 |
|
domatobj(curmat = mp, cent); |
40 |
< |
} else if (!ispoly) |
40 |
> |
} else if (!ispoly) { |
41 |
|
NOPOLY(); |
42 |
+ |
} |
43 |
|
} |
44 |
|
|
45 |
|
|
107 |
|
} |
108 |
|
|
109 |
|
|
110 |
< |
static |
110 |
> |
static void |
111 |
|
newtess() /* allocate GLU tessellation object */ |
112 |
|
{ |
113 |
|
if ((gluto = gluNewTess()) == NULL) |
114 |
|
error(INTERNAL, "gluNewTess failed"); |
115 |
< |
gluTessCallback(gluto, GLU_TESS_BEGIN, (_GLUfuncptr)glBegin); |
116 |
< |
gluTessCallback(gluto, GLU_TESS_VERTEX, (_GLUfuncptr)glVertex3dv); |
115 |
> |
gluTessCallback(gluto, GLU_TESS_BEGIN, glBegin); |
116 |
> |
gluTessCallback(gluto, GLU_TESS_VERTEX, glVertex3dv); |
117 |
|
gluTessCallback(gluto, GLU_TESS_END, glEnd); |
118 |
|
gluTessCallback(gluto, GLU_TESS_COMBINE, myCombine); |
119 |
|
gluTessCallback(gluto, GLU_TESS_ERROR, glu_error); |
121 |
|
} |
122 |
|
|
123 |
|
|
124 |
< |
static |
124 |
> |
static void |
125 |
|
newquadric() /* allocate GLU quadric structure */ |
126 |
|
{ |
127 |
|
if ((gluqo = gluNewQuadric()) == NULL) |
139 |
|
FVECT norm, cent; |
140 |
|
register int i; |
141 |
|
|
142 |
< |
if (o->oargs.nfargs < 9 | o->oargs.nfargs % 3) |
142 |
> |
if ((o->oargs.nfargs < 9) | (o->oargs.nfargs % 3)) |
143 |
|
objerror(o, USER, "bad # real arguments"); |
144 |
|
area = polyarea(cent, norm, o->oargs.nfargs/3, (FVECT *)o->oargs.farg); |
145 |
|
if (area <= FTINY) |
146 |
< |
return; |
146 |
> |
return(0); |
147 |
|
if (dolights) /* check for source */ |
148 |
|
doflatsrc((MATREC *)o->os, cent, norm, area); |
149 |
|
setmaterial((MATREC *)o->os, cent, 1); /* set material */ |
178 |
|
(GLdouble)o->oargs.farg[3*i+1], |
179 |
|
(GLdouble)o->oargs.farg[3*i+2]); |
180 |
|
} |
181 |
+ |
return(0); |
182 |
|
} |
183 |
|
|
184 |
|
|
209 |
|
o->otype = o->otype==OBJ_SPHERE ? OBJ_BUBBLE : OBJ_SPHERE; |
210 |
|
o->oargs.farg[3] = -o->oargs.farg[3]; |
211 |
|
} else if (o->oargs.farg[3] <= FTINY) |
212 |
< |
return; |
212 |
> |
return(0); |
213 |
|
if (dolights) |
214 |
|
dosphsrc((MATREC *)o->os, o->oargs.farg, |
215 |
|
PI*o->oargs.farg[3]*o->oargs.farg[3]); |
225 |
|
(GLdouble)o->oargs.farg[2]); |
226 |
|
gluSphere(gluqo, (GLdouble)o->oargs.farg[3], NSLICES, NSTACKS); |
227 |
|
glPopMatrix(); |
228 |
+ |
return(0); |
229 |
|
} |
230 |
|
|
231 |
|
|
237 |
|
FVECT cent; |
238 |
|
register int iscyl; |
239 |
|
|
240 |
< |
iscyl = o->otype==OBJ_CYLINDER | o->otype==OBJ_TUBE; |
240 |
> |
iscyl = (o->otype==OBJ_CYLINDER) | (o->otype==OBJ_TUBE); |
241 |
|
if (o->oargs.nfargs != (iscyl ? 7 : 8)) |
242 |
|
objerror(o, USER, "bad # real arguments"); |
243 |
|
if (o->oargs.farg[6] < -FTINY) { |
253 |
|
} else if (!iscyl && o->oargs.farg[7] < -FTINY) |
254 |
|
objerror(o, USER, "illegal radii"); |
255 |
|
if (o->oargs.farg[6] <= FTINY && (iscyl || o->oargs.farg[7] <= FTINY)) |
256 |
< |
return; |
256 |
> |
return; /* XXX we should return a value here */ |
257 |
|
if (!iscyl) { |
258 |
|
if (o->oargs.farg[6] < 0.) /* complains for tiny neg's */ |
259 |
|
o->oargs.farg[6] = 0.; |
260 |
|
if (o->oargs.farg[7] < 0.) |
261 |
|
o->oargs.farg[7] = 0.; |
262 |
|
} |
263 |
+ |
h = sqrt(dist2(o->oargs.farg,o->oargs.farg+3)); |
264 |
+ |
if (h <= FTINY) |
265 |
+ |
return; /* XXX we should return a value here */ |
266 |
|
cent[0] = .5*(o->oargs.farg[0] + o->oargs.farg[3]); |
267 |
|
cent[1] = .5*(o->oargs.farg[1] + o->oargs.farg[4]); |
268 |
|
cent[2] = .5*(o->oargs.farg[2] + o->oargs.farg[5]); |
269 |
|
setmaterial((MATREC *)o->os, cent, 0); |
270 |
|
if (gluqo == NULL) newquadric(); |
271 |
|
glu_rout = "making cylinder"; |
272 |
< |
gluQuadricOrientation(gluqo, o->otype==OBJ_CUP | o->otype==OBJ_TUBE ? |
272 |
> |
gluQuadricOrientation(gluqo, (o->otype==OBJ_CUP) | (o->otype==OBJ_TUBE) ? |
273 |
|
GLU_INSIDE : GLU_OUTSIDE); |
274 |
|
gluQuadricNormals(gluqo, GLU_SMOOTH); |
275 |
|
glMatrixMode(GL_MODELVIEW); |
278 |
|
glTranslated((GLdouble)o->oargs.farg[0], (GLdouble)o->oargs.farg[1], |
279 |
|
(GLdouble)o->oargs.farg[2]); |
280 |
|
/* compute height & rotation angle */ |
275 |
– |
h = sqrt(dist2(o->oargs.farg,o->oargs.farg+3)); |
276 |
– |
if (h <= FTINY) |
277 |
– |
return; |
281 |
|
x1 = o->oargs.farg[1] - o->oargs.farg[4]; |
282 |
|
y1 = o->oargs.farg[3] - o->oargs.farg[0]; |
283 |
|
/* z1 = 0; */ |
284 |
< |
d = 180./PI * asin(sqrt(x1*x1 + y1*y1) / h); |
284 |
> |
d = x1*x1 + y1*y1; |
285 |
> |
if (d <= FTINY*FTINY) |
286 |
> |
x1 = 1.; |
287 |
> |
else |
288 |
> |
d = 180./PI * asin(sqrt(d) / h); |
289 |
|
if (o->oargs.farg[5] < o->oargs.farg[2]) |
290 |
|
d = 180. - d; |
291 |
|
if (d > FTINY) |
293 |
|
gluCylinder(gluqo, o->oargs.farg[6], o->oargs.farg[iscyl ? 6 : 7], |
294 |
|
h, NSLICES, 1); |
295 |
|
glPopMatrix(); |
296 |
+ |
return(0); |
297 |
|
} |
298 |
|
|
299 |
|
|
301 |
|
o_ring(o) /* convert a ring */ |
302 |
|
register OBJREC *o; |
303 |
|
{ |
304 |
< |
double x1, y1, d; |
304 |
> |
double x1, y1, d, h; |
305 |
|
|
306 |
|
if (o->oargs.nfargs != 8) |
307 |
|
objerror(o, USER, "bad # real arguments"); |
315 |
|
if (o->oargs.farg[6] < 0.) /* complains for tiny neg's */ |
316 |
|
o->oargs.farg[6] = 0.; |
317 |
|
if (o->oargs.farg[7] - o->oargs.farg[6] <= FTINY) |
318 |
< |
return; |
318 |
> |
return; /* XXX we should return a value here */ |
319 |
> |
h = VLEN(o->oargs.farg+3); |
320 |
> |
if (h <= FTINY) |
321 |
> |
return; /* XXX we should return a value here */ |
322 |
|
if (dolights) |
323 |
|
doflatsrc((MATREC *)o->os, o->oargs.farg, o->oargs.farg+3, |
324 |
|
PI*(o->oargs.farg[7]*o->oargs.farg[7] - |
333 |
|
glTranslated((GLdouble)o->oargs.farg[0], (GLdouble)o->oargs.farg[1], |
334 |
|
(GLdouble)o->oargs.farg[2]); |
335 |
|
/* compute rotation angle */ |
325 |
– |
d = VLEN(o->oargs.farg+3); |
326 |
– |
if (d <= FTINY) |
327 |
– |
return; |
336 |
|
x1 = -o->oargs.farg[4]; |
337 |
|
y1 = o->oargs.farg[3]; |
338 |
|
/* z1 = 0; */ |
339 |
< |
d = 180./PI * asin(sqrt(x1*x1 + y1*y1) / d); |
339 |
> |
d = x1*x1 + y1*y1; |
340 |
> |
if (d <= FTINY*FTINY) |
341 |
> |
x1 = 1.; |
342 |
> |
else |
343 |
> |
d = 180./PI * asin(sqrt(d) / h); |
344 |
|
if (o->oargs.farg[5] < 0.) |
345 |
|
d = 180. - d; |
346 |
|
if (d > FTINY) |
347 |
|
glRotated(d, (GLdouble)x1, (GLdouble)y1, 0.); |
348 |
|
gluDisk(gluqo, o->oargs.farg[6], o->oargs.farg[7], NSLICES, 1); |
349 |
|
glPopMatrix(); |
350 |
+ |
return(0); |
351 |
|
} |