14 |
|
|
15 |
|
#include "platform.h" |
16 |
|
#include "ray.h" |
17 |
+ |
#include "source.h" |
18 |
|
#include "ambient.h" |
19 |
|
#include "otypes.h" |
20 |
|
#include "rpaint.h" |
110 |
|
if (sscanvec(buf, nv.vp)) |
111 |
|
change++; |
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 |
+ |
} |
123 |
|
sprintf(buf, "view up (%.6g %.6g %.6g): ", |
124 |
|
ourview.vup[0], ourview.vup[1], ourview.vup[2]); |
125 |
|
(*dev->comout)(buf); |
285 |
|
|
286 |
|
|
287 |
|
extern void |
288 |
+ |
getfocus( /* set focus distance */ |
289 |
+ |
char *s |
290 |
+ |
) |
291 |
+ |
{ |
292 |
+ |
char buf[64]; |
293 |
+ |
FVECT vc; |
294 |
+ |
double dist; |
295 |
+ |
|
296 |
+ |
if (sscanf(s, "%lf", &dist) < 1) { |
297 |
+ |
int x, y; |
298 |
+ |
RAY thisray; |
299 |
+ |
if (dev->getcur == NULL) |
300 |
+ |
return; |
301 |
+ |
(*dev->comout)("Pick focus point\n"); |
302 |
+ |
if ((*dev->getcur)(&x, &y) == ABORT) |
303 |
+ |
return; |
304 |
+ |
if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, |
305 |
+ |
&ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) { |
306 |
+ |
error(COMMAND, "not on image"); |
307 |
+ |
return; |
308 |
+ |
} |
309 |
+ |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
310 |
+ |
if (!localhit(&thisray, &thescene)) { |
311 |
+ |
error(COMMAND, "not a local object"); |
312 |
+ |
return; |
313 |
+ |
} |
314 |
+ |
dist = thisray.rot; |
315 |
+ |
} else if (dist <= .0) { |
316 |
+ |
error(COMMAND, "focus distance must be positive"); |
317 |
+ |
return; |
318 |
+ |
} |
319 |
+ |
ourview.vdist = dist; |
320 |
+ |
sprintf(buf, "Focus distance set to %f\n", dist); |
321 |
+ |
(*dev->comout)(buf); |
322 |
+ |
} |
323 |
+ |
|
324 |
+ |
|
325 |
+ |
extern void |
326 |
|
getmove( /* move camera */ |
327 |
|
char *s |
328 |
|
) |
525 |
|
|
526 |
|
if (s[0] == '\0') { |
527 |
|
(*dev->comout)( |
528 |
< |
"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: "); |
528 |
> |
"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: "); |
529 |
|
(*dev->comin)(buf, NULL); |
530 |
|
s = buf; |
531 |
|
} |
532 |
|
switch (s[0]) { |
533 |
+ |
case 'u': /* uncorrelated sampling */ |
534 |
+ |
getparam(s+1, "uncorrelated sampling", 'b', |
535 |
+ |
(void *)&rand_samp); |
536 |
+ |
break; |
537 |
|
case 'l': /* limit */ |
538 |
|
switch (s[1]) { |
539 |
|
case 'w': /* weight */ |
726 |
|
return; |
727 |
|
} |
728 |
|
|
729 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
729 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
730 |
|
|
731 |
|
rayvalue(&thisray); |
732 |
|
|
733 |
|
if (thisray.ro == NULL) |
734 |
|
(*dev->comout)("ray hit nothing"); |
735 |
|
else { |
736 |
< |
sprintf(buf, "ray hit %s%s %s \"%s\"", |
737 |
< |
thisray.rod < 0.0 ? "back of " : "", |
738 |
< |
thisray.ro->omod == OVOID ? VOIDID : |
739 |
< |
objptr(thisray.ro->omod)->oname, |
736 |
> |
OBJREC *mat = NULL; |
737 |
> |
OBJREC *mod = NULL; |
738 |
> |
char matspec[256]; |
739 |
> |
matspec[0] = '\0'; |
740 |
> |
if (thisray.ro->omod != OVOID) { |
741 |
> |
mod = objptr(thisray.ro->omod); |
742 |
> |
mat = findmaterial(mod); |
743 |
> |
} |
744 |
> |
if (thisray.rod < 0.0) |
745 |
> |
strcpy(matspec, "back of "); |
746 |
> |
if (mod != NULL) { |
747 |
> |
strcat(matspec, mod->oname); |
748 |
> |
if (mat != mod && mat != NULL) |
749 |
> |
sprintf(matspec+strlen(matspec), |
750 |
> |
" (%s)", mat->oname); |
751 |
> |
} else |
752 |
> |
strcat(matspec, VOIDID); |
753 |
> |
sprintf(buf, "ray hit %s %s \"%s\"", matspec, |
754 |
|
ofun[thisray.ro->otype].funame, |
755 |
|
thisray.ro->oname); |
756 |
|
if ((ino = objptr(thisray.robj)) != thisray.ro) |