7 |
|
* External symbols declared in rpaint.h |
8 |
|
*/ |
9 |
|
|
10 |
< |
/* ==================================================================== |
11 |
< |
* The Radiance Software License, Version 1.0 |
12 |
< |
* |
13 |
< |
* Copyright (c) 1990 - 2002 The Regents of the University of California, |
14 |
< |
* through Lawrence Berkeley National Laboratory. All rights reserved. |
15 |
< |
* |
16 |
< |
* Redistribution and use in source and binary forms, with or without |
17 |
< |
* modification, are permitted provided that the following conditions |
18 |
< |
* are met: |
19 |
< |
* |
20 |
< |
* 1. Redistributions of source code must retain the above copyright |
21 |
< |
* notice, this list of conditions and the following disclaimer. |
22 |
< |
* |
23 |
< |
* 2. Redistributions in binary form must reproduce the above copyright |
24 |
< |
* notice, this list of conditions and the following disclaimer in |
25 |
< |
* the documentation and/or other materials provided with the |
26 |
< |
* distribution. |
27 |
< |
* |
28 |
< |
* 3. The end-user documentation included with the redistribution, |
29 |
< |
* if any, must include the following acknowledgment: |
30 |
< |
* "This product includes Radiance software |
31 |
< |
* (http://radsite.lbl.gov/) |
32 |
< |
* developed by the Lawrence Berkeley National Laboratory |
33 |
< |
* (http://www.lbl.gov/)." |
34 |
< |
* Alternately, this acknowledgment may appear in the software itself, |
35 |
< |
* if and wherever such third-party acknowledgments normally appear. |
36 |
< |
* |
37 |
< |
* 4. The names "Radiance," "Lawrence Berkeley National Laboratory" |
38 |
< |
* and "The Regents of the University of California" must |
39 |
< |
* not be used to endorse or promote products derived from this |
40 |
< |
* software without prior written permission. For written |
41 |
< |
* permission, please contact [email protected]. |
42 |
< |
* |
43 |
< |
* 5. Products derived from this software may not be called "Radiance", |
44 |
< |
* nor may "Radiance" appear in their name, without prior written |
45 |
< |
* permission of Lawrence Berkeley National Laboratory. |
46 |
< |
* |
47 |
< |
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED |
48 |
< |
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
49 |
< |
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
50 |
< |
* DISCLAIMED. IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR |
51 |
< |
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
52 |
< |
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
53 |
< |
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF |
54 |
< |
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
55 |
< |
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
56 |
< |
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT |
57 |
< |
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
58 |
< |
* SUCH DAMAGE. |
59 |
< |
* ==================================================================== |
60 |
< |
* |
61 |
< |
* This software consists of voluntary contributions made by many |
62 |
< |
* individuals on behalf of Lawrence Berkeley National Laboratory. For more |
63 |
< |
* information on Lawrence Berkeley National Laboratory, please see |
64 |
< |
* <http://www.lbl.gov/>. |
65 |
< |
*/ |
10 |
> |
#include "copyright.h" |
11 |
|
|
12 |
< |
#include "ray.h" |
12 |
> |
#include <ctype.h> |
13 |
> |
#include <string.h> |
14 |
|
|
15 |
+ |
#include "platform.h" |
16 |
+ |
#include "ray.h" |
17 |
+ |
#include "source.h" |
18 |
+ |
#include "ambient.h" |
19 |
|
#include "otypes.h" |
70 |
– |
|
20 |
|
#include "rpaint.h" |
21 |
|
|
73 |
– |
#include <ctype.h> |
74 |
– |
|
22 |
|
extern int psample; /* pixel sample size */ |
23 |
|
extern double maxdiff; /* max. sample difference */ |
24 |
|
|
37 |
|
|
38 |
|
|
39 |
|
void |
40 |
< |
getframe(s) /* get a new frame */ |
41 |
< |
char *s; |
40 |
> |
getframe( /* get a new frame */ |
41 |
> |
char *s |
42 |
> |
) |
43 |
|
{ |
44 |
|
if (getrect(s, &pframe) < 0) |
45 |
|
return; |
48 |
|
|
49 |
|
|
50 |
|
void |
51 |
< |
getrepaint(s) /* get area and repaint */ |
52 |
< |
char *s; |
51 |
> |
getrepaint( /* get area and repaint */ |
52 |
> |
char *s |
53 |
> |
) |
54 |
|
{ |
55 |
|
RECT box; |
56 |
|
|
57 |
|
if (getrect(s, &box) < 0) |
58 |
|
return; |
59 |
< |
paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box); |
59 |
> |
paintrect(&ptrunk, &box); |
60 |
|
} |
61 |
|
|
62 |
|
|
63 |
|
void |
64 |
< |
getview(s) /* get/show view parameters */ |
65 |
< |
char *s; |
64 |
> |
getview( /* get/show view parameters */ |
65 |
> |
char *s |
66 |
> |
) |
67 |
|
{ |
68 |
|
FILE *fp; |
69 |
|
char buf[128]; |
70 |
|
char *fname; |
71 |
|
int change = 0; |
72 |
< |
VIEW nv; |
72 |
> |
VIEW nv = ourview; |
73 |
|
|
74 |
|
while (isspace(*s)) |
75 |
|
s++; |
76 |
|
if (*s == '-') { /* command line parameters */ |
127 |
– |
copystruct(&nv, &ourview); |
77 |
|
if (sscanview(&nv, s)) |
78 |
|
newview(&nv); |
79 |
|
else |
101 |
|
if (buf[0] && buf[0] != ourview.type) { |
102 |
|
nv.type = buf[0]; |
103 |
|
change++; |
104 |
< |
} else |
156 |
< |
nv.type = ourview.type; |
104 |
> |
} |
105 |
|
sprintf(buf, "view point (%.6g %.6g %.6g): ", |
106 |
|
ourview.vp[0], ourview.vp[1], ourview.vp[2]); |
107 |
|
(*dev->comout)(buf); |
109 |
|
if (buf[0] == CTRL('C')) return; |
110 |
|
if (sscanvec(buf, nv.vp)) |
111 |
|
change++; |
164 |
– |
else |
165 |
– |
VCOPY(nv.vp, ourview.vp); |
112 |
|
sprintf(buf, "view direction (%.6g %.6g %.6g): ", |
113 |
< |
ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]); |
113 |
> |
ourview.vdir[0]*ourview.vdist, |
114 |
> |
ourview.vdir[1]*ourview.vdist, |
115 |
> |
ourview.vdir[2]*ourview.vdist); |
116 |
|
(*dev->comout)(buf); |
117 |
|
(*dev->comin)(buf, NULL); |
118 |
|
if (buf[0] == CTRL('C')) return; |
119 |
< |
if (sscanvec(buf, nv.vdir)) |
119 |
> |
if (sscanvec(buf, nv.vdir)) { |
120 |
> |
nv.vdist = 1.; |
121 |
|
change++; |
122 |
< |
else |
174 |
< |
VCOPY(nv.vdir, ourview.vdir); |
122 |
> |
} |
123 |
|
sprintf(buf, "view up (%.6g %.6g %.6g): ", |
124 |
|
ourview.vup[0], ourview.vup[1], ourview.vup[2]); |
125 |
|
(*dev->comout)(buf); |
127 |
|
if (buf[0] == CTRL('C')) return; |
128 |
|
if (sscanvec(buf, nv.vup)) |
129 |
|
change++; |
182 |
– |
else |
183 |
– |
VCOPY(nv.vup, ourview.vup); |
130 |
|
sprintf(buf, "view horiz and vert size (%.6g %.6g): ", |
131 |
|
ourview.horiz, ourview.vert); |
132 |
|
(*dev->comout)(buf); |
134 |
|
if (buf[0] == CTRL('C')) return; |
135 |
|
if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2) |
136 |
|
change++; |
191 |
– |
else { |
192 |
– |
nv.horiz = ourview.horiz; nv.vert = ourview.vert; |
193 |
– |
} |
137 |
|
sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ", |
138 |
|
ourview.vfore, ourview.vaft); |
139 |
|
(*dev->comout)(buf); |
141 |
|
if (buf[0] == CTRL('C')) return; |
142 |
|
if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2) |
143 |
|
change++; |
201 |
– |
else { |
202 |
– |
nv.vfore = ourview.vfore; nv.vaft = ourview.vaft; |
203 |
– |
} |
144 |
|
sprintf(buf, "view shift and lift (%.6g %.6g): ", |
145 |
|
ourview.hoff, ourview.voff); |
146 |
|
(*dev->comout)(buf); |
148 |
|
if (buf[0] == CTRL('C')) return; |
149 |
|
if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2) |
150 |
|
change++; |
211 |
– |
else { |
212 |
– |
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
213 |
– |
} |
151 |
|
if (change) |
152 |
|
newview(&nv); |
153 |
|
} |
154 |
|
|
155 |
|
|
156 |
|
void |
157 |
< |
lastview(s) /* return to a previous view */ |
158 |
< |
char *s; |
157 |
> |
lastview( /* return to a previous view */ |
158 |
> |
char *s |
159 |
> |
) |
160 |
|
{ |
161 |
|
char buf[128]; |
162 |
|
char *fname; |
164 |
|
VIEW nv; |
165 |
|
|
166 |
|
if (sscanf(s, "%s", buf) == 1) { /* get parameters from a file */ |
167 |
< |
copystruct(&nv, &stdview); |
167 |
> |
nv = stdview; |
168 |
|
if ((fname = getpath(buf, "", R_OK)) == NULL || |
169 |
|
(success = viewfile(fname, &nv, NULL)) == -1) { |
170 |
|
sprintf(errmsg, "cannot open \"%s\"", buf); |
181 |
|
error(COMMAND, "no previous view"); |
182 |
|
return; |
183 |
|
} |
184 |
< |
copystruct(&nv, &ourview); |
185 |
< |
copystruct(&ourview, &oldview); |
186 |
< |
copystruct(&oldview, &nv); |
187 |
< |
newimage(); |
184 |
> |
nv = ourview; |
185 |
> |
ourview = oldview; |
186 |
> |
oldview = nv; |
187 |
> |
newimage(NULL); |
188 |
|
} |
189 |
|
|
190 |
|
|
191 |
|
void |
192 |
< |
saveview(s) /* save view to rad file */ |
193 |
< |
char *s; |
192 |
> |
saveview( /* save view to rad file */ |
193 |
> |
char *s |
194 |
> |
) |
195 |
|
{ |
196 |
|
char view[64]; |
197 |
|
char *fname; |
227 |
|
|
228 |
|
|
229 |
|
void |
230 |
< |
loadview(s) /* load view from rad file */ |
231 |
< |
char *s; |
230 |
> |
loadview( /* load view from rad file */ |
231 |
> |
char *s |
232 |
> |
) |
233 |
|
{ |
234 |
|
char buf[512]; |
235 |
|
char *fname; |
260 |
|
buf[0] = '\0'; |
261 |
|
fgets(buf, sizeof(buf), fp); |
262 |
|
pclose(fp); |
263 |
< |
copystruct(&nv, &stdview); |
263 |
> |
nv = stdview; |
264 |
|
if (!sscanview(&nv, buf)) { |
265 |
|
error(COMMAND, "rad error -- no such view?"); |
266 |
|
return; |
270 |
|
|
271 |
|
|
272 |
|
void |
273 |
< |
getaim(s) /* aim camera */ |
274 |
< |
char *s; |
273 |
> |
getaim( /* aim camera */ |
274 |
> |
char *s |
275 |
> |
) |
276 |
|
{ |
277 |
+ |
VIEW nv = ourview; |
278 |
|
double zfact; |
337 |
– |
VIEW nv; |
279 |
|
|
280 |
|
if (getinterest(s, 1, nv.vdir, &zfact) < 0) |
281 |
|
return; |
341 |
– |
nv.type = ourview.type; |
342 |
– |
VCOPY(nv.vp, ourview.vp); |
343 |
– |
VCOPY(nv.vup, ourview.vup); |
344 |
– |
nv.horiz = ourview.horiz; nv.vert = ourview.vert; |
345 |
– |
nv.vfore = ourview.vfore; nv.vaft = ourview.vaft; |
346 |
– |
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
282 |
|
zoomview(&nv, zfact); |
283 |
|
newview(&nv); |
284 |
|
} |
285 |
|
|
286 |
|
|
287 |
|
void |
288 |
< |
getmove(s) /* move camera */ |
289 |
< |
char *s; |
288 |
> |
getfocus( /* set focus distance */ |
289 |
> |
char *s |
290 |
> |
) |
291 |
|
{ |
292 |
+ |
char buf[64]; |
293 |
+ |
double dist; |
294 |
+ |
|
295 |
+ |
if (sscanf(s, "%lf", &dist) < 1) { |
296 |
+ |
int x, y; |
297 |
+ |
RAY thisray; |
298 |
+ |
if (dev->getcur == NULL) |
299 |
+ |
return; |
300 |
+ |
(*dev->comout)("Pick focus point\n"); |
301 |
+ |
if ((*dev->getcur)(&x, &y) == ABORT) |
302 |
+ |
return; |
303 |
+ |
if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, |
304 |
+ |
&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) { |
305 |
+ |
error(COMMAND, "not on image"); |
306 |
+ |
return; |
307 |
+ |
} |
308 |
+ |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
309 |
+ |
if (!localhit(&thisray, &thescene)) { |
310 |
+ |
error(COMMAND, "not a local object"); |
311 |
+ |
return; |
312 |
+ |
} |
313 |
+ |
dist = thisray.rot; |
314 |
+ |
} else if (dist <= .0) { |
315 |
+ |
error(COMMAND, "focus distance must be positive"); |
316 |
+ |
return; |
317 |
+ |
} |
318 |
+ |
ourview.vdist = dist; |
319 |
+ |
sprintf(buf, "Focus distance set to %f\n", dist); |
320 |
+ |
(*dev->comout)(buf); |
321 |
+ |
} |
322 |
+ |
|
323 |
+ |
|
324 |
+ |
void |
325 |
+ |
getmove( /* move camera */ |
326 |
+ |
char *s |
327 |
+ |
) |
328 |
+ |
{ |
329 |
|
FVECT vc; |
330 |
|
double mag; |
331 |
|
|
336 |
|
|
337 |
|
|
338 |
|
void |
339 |
< |
getrotate(s) /* rotate camera */ |
340 |
< |
char *s; |
339 |
> |
getrotate( /* rotate camera */ |
340 |
> |
char *s |
341 |
> |
) |
342 |
|
{ |
343 |
< |
VIEW nv; |
343 |
> |
VIEW nv = ourview; |
344 |
|
FVECT v1; |
345 |
|
double angle, elev, zfact; |
346 |
|
|
349 |
|
error(COMMAND, "missing angle"); |
350 |
|
return; |
351 |
|
} |
378 |
– |
nv.type = ourview.type; |
379 |
– |
VCOPY(nv.vp, ourview.vp); |
380 |
– |
VCOPY(nv.vup, ourview.vup); |
381 |
– |
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
382 |
– |
nv.vfore = ourview.vfore; nv.vaft = ourview.vaft; |
352 |
|
spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.)); |
353 |
|
if (elev != 0.0) { |
354 |
|
fcross(v1, nv.vdir, ourview.vup); |
355 |
|
normalize(v1); |
356 |
|
spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.)); |
357 |
|
} |
389 |
– |
nv.horiz = ourview.horiz; nv.vert = ourview.vert; |
358 |
|
zoomview(&nv, zfact); |
359 |
|
newview(&nv); |
360 |
|
} |
361 |
|
|
362 |
|
|
363 |
|
void |
364 |
< |
getpivot(s) /* pivot viewpoint */ |
365 |
< |
register char *s; |
364 |
> |
getpivot( /* pivot viewpoint */ |
365 |
> |
char *s |
366 |
> |
) |
367 |
|
{ |
368 |
|
FVECT vc; |
369 |
|
double angle, elev, mag; |
380 |
|
|
381 |
|
|
382 |
|
void |
383 |
< |
getexposure(s) /* get new exposure */ |
384 |
< |
char *s; |
383 |
> |
getexposure( /* get new exposure */ |
384 |
> |
char *s |
385 |
> |
) |
386 |
|
{ |
387 |
|
char buf[128]; |
388 |
< |
register char *cp; |
419 |
< |
RECT r; |
388 |
> |
char *cp; |
389 |
|
int x, y; |
390 |
< |
register PNODE *p = &ptrunk; |
390 |
> |
PNODE *p = &ptrunk; |
391 |
|
int adapt = 0; |
392 |
|
double e = 1.0; |
393 |
|
|
404 |
|
(*dev->comout)("Pick point for exposure\n"); |
405 |
|
if ((*dev->getcur)(&x, &y) == ABORT) |
406 |
|
return; |
407 |
< |
r.l = r.d = 0; |
439 |
< |
r.r = hresolu; r.u = vresolu; |
440 |
< |
p = findrect(x, y, &ptrunk, &r, -1); |
407 |
> |
p = findrect(x, y, &ptrunk, -1); |
408 |
|
} else { |
409 |
|
if (*cp == '=') { /* absolute setting */ |
410 |
|
p = NULL; |
427 |
|
e *= atof(cp); |
428 |
|
} |
429 |
|
if (p != NULL) { /* relative setting */ |
430 |
+ |
compavg(p); |
431 |
|
if (bright(p->v) < 1e-15) { |
432 |
|
error(COMMAND, "cannot normalize to zero"); |
433 |
|
return; |
445 |
|
} |
446 |
|
|
447 |
|
typedef union {int i; double d; COLOR C;} *MyUptr; |
448 |
+ |
#define FEQ(x,y) (fabs((x)-(y)) <= FTINY) |
449 |
|
|
450 |
|
int |
451 |
< |
getparam(str, dsc, typ, p) /* get variable from user */ |
452 |
< |
char *str, *dsc; |
453 |
< |
int typ; |
454 |
< |
void *p; |
451 |
> |
getparam( /* get variable from user */ |
452 |
> |
char *str, |
453 |
> |
char *dsc, |
454 |
> |
int typ, |
455 |
> |
void *p |
456 |
> |
) |
457 |
|
{ |
458 |
< |
register MyUptr ptr = (MyUptr)p; |
458 |
> |
MyUptr ptr = (MyUptr)p; |
459 |
|
int i0; |
460 |
|
double d0, d1, d2; |
461 |
|
char buf[48]; |
470 |
|
if (sscanf(buf, "%d", &i0) != 1) |
471 |
|
return(0); |
472 |
|
} |
473 |
+ |
if (ptr->i == i0) |
474 |
+ |
return(0); |
475 |
|
ptr->i = i0; |
476 |
< |
return(1); |
476 |
> |
break; |
477 |
|
case 'r': /* real */ |
478 |
|
if (sscanf(str, "%lf", &d0) != 1) { |
479 |
|
(*dev->comout)(dsc); |
483 |
|
if (sscanf(buf, "%lf", &d0) != 1) |
484 |
|
return(0); |
485 |
|
} |
486 |
+ |
if (FEQ(ptr->d, d0)) |
487 |
+ |
return(0); |
488 |
|
ptr->d = d0; |
489 |
< |
return(1); |
489 |
> |
break; |
490 |
|
case 'b': /* boolean */ |
491 |
|
if (sscanf(str, "%1s", buf) != 1) { |
492 |
|
(*dev->comout)(dsc); |
493 |
|
sprintf(buf, "? (%c): ", ptr->i ? 'y' : 'n'); |
494 |
|
(*dev->comout)(buf); |
495 |
|
(*dev->comin)(buf, NULL); |
496 |
< |
if (buf[0] == '\0' || |
522 |
< |
index("yY+1tTnN-0fF", buf[0]) == NULL) |
496 |
> |
if (buf[0] == '\0') |
497 |
|
return(0); |
498 |
|
} |
499 |
< |
ptr->i = index("yY+1tT", buf[0]) != NULL; |
500 |
< |
return(1); |
499 |
> |
if (strchr("yY+1tTnN-0fF", buf[0]) == NULL) |
500 |
> |
return(0); |
501 |
> |
i0 = strchr("yY+1tT", buf[0]) != NULL; |
502 |
> |
if (ptr->i == i0) |
503 |
> |
return(0); |
504 |
> |
ptr->i = i0; |
505 |
> |
break; |
506 |
|
case 'C': /* color */ |
507 |
|
if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) { |
508 |
|
(*dev->comout)(dsc); |
515 |
|
if (sscanf(buf, "%lf %lf %lf", &d0, &d1, &d2) != 3) |
516 |
|
return(0); |
517 |
|
} |
518 |
+ |
if (FEQ(colval(ptr->C,RED), d0) && |
519 |
+ |
FEQ(colval(ptr->C,GRN), d1) && |
520 |
+ |
FEQ(colval(ptr->C,BLU), d2)) |
521 |
+ |
return(0); |
522 |
|
setcolor(ptr->C, d0, d1, d2); |
523 |
< |
return(1); |
523 |
> |
break; |
524 |
> |
default: |
525 |
> |
return(0); /* shouldn't happen */ |
526 |
|
} |
527 |
+ |
newparam++; |
528 |
+ |
return(1); |
529 |
|
} |
530 |
|
|
531 |
|
|
532 |
|
void |
533 |
< |
setparam(s) /* get/set program parameter */ |
534 |
< |
register char *s; |
533 |
> |
setparam( /* get/set program parameter */ |
534 |
> |
char *s |
535 |
> |
) |
536 |
|
{ |
537 |
|
char buf[128]; |
538 |
|
|
539 |
|
if (s[0] == '\0') { |
540 |
|
(*dev->comout)( |
541 |
< |
"aa ab ad ar as av aw b dc dv dj ds dt i lr lw me ma mg ms ps pt sj st bv: "); |
541 |
> |
"aa ab ad ar as av aw b bv dc dv dj ds dt i lr lw me ma mg ms ps pt sj st u: "); |
542 |
|
(*dev->comin)(buf, NULL); |
543 |
|
s = buf; |
544 |
|
} |
545 |
|
switch (s[0]) { |
546 |
+ |
case 'u': /* uncorrelated sampling */ |
547 |
+ |
getparam(s+1, "uncorrelated sampling", 'b', |
548 |
+ |
(void *)&rand_samp); |
549 |
+ |
break; |
550 |
|
case 'l': /* limit */ |
551 |
|
switch (s[1]) { |
552 |
|
case 'w': /* weight */ |
709 |
|
|
710 |
|
|
711 |
|
void |
712 |
< |
traceray(s) /* trace a single ray */ |
713 |
< |
char *s; |
712 |
> |
traceray( /* trace a single ray */ |
713 |
> |
char *s |
714 |
> |
) |
715 |
|
{ |
716 |
|
char buf[128]; |
717 |
|
int x, y; |
740 |
|
return; |
741 |
|
} |
742 |
|
|
743 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
751 |
< |
|
752 |
< |
rayvalue(&thisray); |
743 |
> |
ray_trace(&thisray); |
744 |
|
|
745 |
|
if (thisray.ro == NULL) |
746 |
|
(*dev->comout)("ray hit nothing"); |
747 |
|
else { |
748 |
< |
sprintf(buf, "ray hit %s%s %s \"%s\"", |
749 |
< |
thisray.rod < 0.0 ? "back of " : "", |
750 |
< |
thisray.ro->omod == OVOID ? VOIDID : |
751 |
< |
objptr(thisray.ro->omod)->oname, |
748 |
> |
OBJREC *mat = NULL; |
749 |
> |
OBJREC *mod = NULL; |
750 |
> |
char matspec[256]; |
751 |
> |
matspec[0] = '\0'; |
752 |
> |
if (thisray.ro->omod != OVOID) { |
753 |
> |
mod = objptr(thisray.ro->omod); |
754 |
> |
mat = findmaterial(mod); |
755 |
> |
} |
756 |
> |
if (thisray.rod < 0.0) |
757 |
> |
strcpy(matspec, "back of "); |
758 |
> |
if (mod != NULL) { |
759 |
> |
strcat(matspec, mod->oname); |
760 |
> |
if (mat != mod && mat != NULL) |
761 |
> |
sprintf(matspec+strlen(matspec), |
762 |
> |
" (%s)", mat->oname); |
763 |
> |
} else |
764 |
> |
strcat(matspec, VOIDID); |
765 |
> |
sprintf(buf, "ray hit %s %s \"%s\"", matspec, |
766 |
|
ofun[thisray.ro->otype].funame, |
767 |
|
thisray.ro->oname); |
768 |
|
if ((ino = objptr(thisray.robj)) != thisray.ro) |
791 |
|
|
792 |
|
|
793 |
|
void |
794 |
< |
writepict(s) /* write the picture to a file */ |
795 |
< |
char *s; |
794 |
> |
writepict( /* write the picture to a file */ |
795 |
> |
char *s |
796 |
> |
) |
797 |
|
{ |
798 |
|
static char buf[128]; |
799 |
|
char *fname; |
815 |
|
error(COMMAND, errmsg); |
816 |
|
return; |
817 |
|
} |
818 |
< |
#ifdef MSDOS |
813 |
< |
setmode(fileno(fp), O_BINARY); |
814 |
< |
#endif |
818 |
> |
SET_FILE_BINARY(fp); |
819 |
|
(*dev->comout)("writing \""); |
820 |
|
(*dev->comout)(fname); |
821 |
|
(*dev->comout)("\"...\n"); |