--- ray/src/rt/rv2.c 2004/03/30 16:13:01 2.43 +++ ray/src/rt/rv2.c 2008/08/21 16:13:00 2.56 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: rv2.c,v 2.43 2004/03/30 16:13:01 schorsch Exp $"; +static const char RCSid[] = "$Id: rv2.c,v 2.56 2008/08/21 16:13:00 greg Exp $"; #endif /* * rv2.c - command routines used in tracing a view. @@ -14,6 +14,7 @@ static const char RCSid[] = "$Id: rv2.c,v 2.43 2004/03 #include "platform.h" #include "ray.h" +#include "source.h" #include "ambient.h" #include "otypes.h" #include "rpaint.h" @@ -35,7 +36,7 @@ extern char *progname; extern char *octname; -extern void +void getframe( /* get a new frame */ char *s ) @@ -46,7 +47,7 @@ getframe( /* get a new frame */ } -extern void +void getrepaint( /* get area and repaint */ char *s ) @@ -55,11 +56,11 @@ getrepaint( /* get area and repaint */ if (getrect(s, &box) < 0) return; - paintrect(&ptrunk, 0, 0, hresolu, vresolu, &box); + paintrect(&ptrunk, &box); } -extern void +void getview( /* get/show view parameters */ char *s ) @@ -68,12 +69,11 @@ getview( /* get/show view parameters */ char buf[128]; char *fname; int change = 0; - VIEW nv; + VIEW nv = ourview; while (isspace(*s)) s++; if (*s == '-') { /* command line parameters */ - nv = ourview; if (sscanview(&nv, s)) newview(&nv); else @@ -101,8 +101,7 @@ getview( /* get/show view parameters */ if (buf[0] && buf[0] != ourview.type) { nv.type = buf[0]; change++; - } else - nv.type = ourview.type; + } sprintf(buf, "view point (%.6g %.6g %.6g): ", ourview.vp[0], ourview.vp[1], ourview.vp[2]); (*dev->comout)(buf); @@ -110,17 +109,17 @@ getview( /* get/show view parameters */ if (buf[0] == CTRL('C')) return; if (sscanvec(buf, nv.vp)) change++; - else - VCOPY(nv.vp, ourview.vp); sprintf(buf, "view direction (%.6g %.6g %.6g): ", - ourview.vdir[0], ourview.vdir[1], ourview.vdir[2]); + ourview.vdir[0]*ourview.vdist, + ourview.vdir[1]*ourview.vdist, + ourview.vdir[2]*ourview.vdist); (*dev->comout)(buf); (*dev->comin)(buf, NULL); if (buf[0] == CTRL('C')) return; - if (sscanvec(buf, nv.vdir)) + if (sscanvec(buf, nv.vdir)) { + nv.vdist = 1.; change++; - else - VCOPY(nv.vdir, ourview.vdir); + } sprintf(buf, "view up (%.6g %.6g %.6g): ", ourview.vup[0], ourview.vup[1], ourview.vup[2]); (*dev->comout)(buf); @@ -128,8 +127,6 @@ getview( /* get/show view parameters */ if (buf[0] == CTRL('C')) return; if (sscanvec(buf, nv.vup)) change++; - else - VCOPY(nv.vup, ourview.vup); sprintf(buf, "view horiz and vert size (%.6g %.6g): ", ourview.horiz, ourview.vert); (*dev->comout)(buf); @@ -137,9 +134,6 @@ getview( /* get/show view parameters */ if (buf[0] == CTRL('C')) return; if (sscanf(buf, "%lf %lf", &nv.horiz, &nv.vert) == 2) change++; - else { - nv.horiz = ourview.horiz; nv.vert = ourview.vert; - } sprintf(buf, "fore and aft clipping plane (%.6g %.6g): ", ourview.vfore, ourview.vaft); (*dev->comout)(buf); @@ -147,9 +141,6 @@ getview( /* get/show view parameters */ if (buf[0] == CTRL('C')) return; if (sscanf(buf, "%lf %lf", &nv.vfore, &nv.vaft) == 2) change++; - else { - nv.vfore = ourview.vfore; nv.vaft = ourview.vaft; - } sprintf(buf, "view shift and lift (%.6g %.6g): ", ourview.hoff, ourview.voff); (*dev->comout)(buf); @@ -157,15 +148,12 @@ getview( /* get/show view parameters */ if (buf[0] == CTRL('C')) return; if (sscanf(buf, "%lf %lf", &nv.hoff, &nv.voff) == 2) change++; - else { - nv.hoff = ourview.hoff; nv.voff = ourview.voff; - } if (change) newview(&nv); } -extern void +void lastview( /* return to a previous view */ char *s ) @@ -196,11 +184,11 @@ lastview( /* return to a previous view */ nv = ourview; ourview = oldview; oldview = nv; - newimage(); + newimage(NULL); } -extern void +void saveview( /* save view to rad file */ char *s ) @@ -238,7 +226,7 @@ saveview( /* save view to rad file */ } -extern void +void loadview( /* load view from rad file */ char *s ) @@ -281,28 +269,59 @@ loadview( /* load view from rad file */ } -extern void +void getaim( /* aim camera */ char *s ) { + VIEW nv = ourview; double zfact; - VIEW nv; if (getinterest(s, 1, nv.vdir, &zfact) < 0) return; - nv.type = ourview.type; - VCOPY(nv.vp, ourview.vp); - VCOPY(nv.vup, ourview.vup); - nv.horiz = ourview.horiz; nv.vert = ourview.vert; - nv.vfore = ourview.vfore; nv.vaft = ourview.vaft; - nv.hoff = ourview.hoff; nv.voff = ourview.voff; zoomview(&nv, zfact); newview(&nv); } -extern void +void +getfocus( /* set focus distance */ + char *s +) +{ + char buf[64]; + double dist; + + if (sscanf(s, "%lf", &dist) < 1) { + int x, y; + RAY thisray; + if (dev->getcur == NULL) + return; + (*dev->comout)("Pick focus point\n"); + if ((*dev->getcur)(&x, &y) == ABORT) + return; + if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, + &ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) { + error(COMMAND, "not on image"); + return; + } + rayorigin(&thisray, PRIMARY, NULL, NULL); + if (!localhit(&thisray, &thescene)) { + error(COMMAND, "not a local object"); + return; + } + dist = thisray.rot; + } else if (dist <= .0) { + error(COMMAND, "focus distance must be positive"); + return; + } + ourview.vdist = dist; + sprintf(buf, "Focus distance set to %f\n", dist); + (*dev->comout)(buf); +} + + +void getmove( /* move camera */ char *s ) @@ -316,12 +335,12 @@ getmove( /* move camera */ } -extern void +void getrotate( /* rotate camera */ char *s ) { - VIEW nv; + VIEW nv = ourview; FVECT v1; double angle, elev, zfact; @@ -330,26 +349,20 @@ getrotate( /* rotate camera */ error(COMMAND, "missing angle"); return; } - nv.type = ourview.type; - VCOPY(nv.vp, ourview.vp); - VCOPY(nv.vup, ourview.vup); - nv.hoff = ourview.hoff; nv.voff = ourview.voff; - nv.vfore = ourview.vfore; nv.vaft = ourview.vaft; spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.)); if (elev != 0.0) { fcross(v1, nv.vdir, ourview.vup); normalize(v1); spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.)); } - nv.horiz = ourview.horiz; nv.vert = ourview.vert; zoomview(&nv, zfact); newview(&nv); } -extern void +void getpivot( /* pivot viewpoint */ - register char *s + char *s ) { FVECT vc; @@ -366,16 +379,15 @@ getpivot( /* pivot viewpoint */ } -extern void +void getexposure( /* get new exposure */ char *s ) { char buf[128]; - register char *cp; - RECT r; + char *cp; int x, y; - register PNODE *p = &ptrunk; + PNODE *p = &ptrunk; int adapt = 0; double e = 1.0; @@ -392,9 +404,7 @@ getexposure( /* get new exposure */ (*dev->comout)("Pick point for exposure\n"); if ((*dev->getcur)(&x, &y) == ABORT) return; - r.l = r.d = 0; - r.r = hresolu; r.u = vresolu; - p = findrect(x, y, &ptrunk, &r, -1); + p = findrect(x, y, &ptrunk, -1); } else { if (*cp == '=') { /* absolute setting */ p = NULL; @@ -435,7 +445,7 @@ getexposure( /* get new exposure */ typedef union {int i; double d; COLOR C;} *MyUptr; -extern int +int getparam( /* get variable from user */ char *str, char *dsc, @@ -443,7 +453,7 @@ getparam( /* get variable from user */ void *p ) { - register MyUptr ptr = (MyUptr)p; + MyUptr ptr = (MyUptr)p; int i0; double d0, d1, d2; char buf[48]; @@ -459,7 +469,7 @@ getparam( /* get variable from user */ return(0); } ptr->i = i0; - return(1); + break; case 'r': /* real */ if (sscanf(str, "%lf", &d0) != 1) { (*dev->comout)(dsc); @@ -470,7 +480,7 @@ getparam( /* get variable from user */ return(0); } ptr->d = d0; - return(1); + break; case 'b': /* boolean */ if (sscanf(str, "%1s", buf) != 1) { (*dev->comout)(dsc); @@ -482,7 +492,7 @@ getparam( /* get variable from user */ return(0); } ptr->i = strchr("yY+1tT", buf[0]) != NULL; - return(1); + break; case 'C': /* color */ if (sscanf(str, "%lf %lf %lf", &d0, &d1, &d2) != 3) { (*dev->comout)(dsc); @@ -496,26 +506,33 @@ getparam( /* get variable from user */ return(0); } setcolor(ptr->C, d0, d1, d2); - return(1); + break; + default: + return(0); /* shouldn't happen */ } - return 0; /* nothing matched */ + newparam++; + return(1); } -extern void +void setparam( /* get/set program parameter */ - register char *s + char *s ) { char buf[128]; if (s[0] == '\0') { (*dev->comout)( - "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: "); + "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: "); (*dev->comin)(buf, NULL); s = buf; } switch (s[0]) { + case 'u': /* uncorrelated sampling */ + getparam(s+1, "uncorrelated sampling", 'b', + (void *)&rand_samp); + break; case 'l': /* limit */ switch (s[1]) { case 'w': /* weight */ @@ -677,9 +694,10 @@ badparam: } -extern void -traceray(s) /* trace a single ray */ -char *s; +void +traceray( /* trace a single ray */ + char *s +) { char buf[128]; int x, y; @@ -708,17 +726,29 @@ char *s; return; } - rayorigin(&thisray, NULL, PRIMARY, 1.0); - - rayvalue(&thisray); + ray_trace(&thisray); if (thisray.ro == NULL) (*dev->comout)("ray hit nothing"); else { - sprintf(buf, "ray hit %s%s %s \"%s\"", - thisray.rod < 0.0 ? "back of " : "", - thisray.ro->omod == OVOID ? VOIDID : - objptr(thisray.ro->omod)->oname, + OBJREC *mat = NULL; + OBJREC *mod = NULL; + char matspec[256]; + matspec[0] = '\0'; + if (thisray.ro->omod != OVOID) { + mod = objptr(thisray.ro->omod); + mat = findmaterial(mod); + } + if (thisray.rod < 0.0) + strcpy(matspec, "back of "); + if (mod != NULL) { + strcat(matspec, mod->oname); + if (mat != mod && mat != NULL) + sprintf(matspec+strlen(matspec), + " (%s)", mat->oname); + } else + strcat(matspec, VOIDID); + sprintf(buf, "ray hit %s %s \"%s\"", matspec, ofun[thisray.ro->otype].funame, thisray.ro->oname); if ((ino = objptr(thisray.robj)) != thisray.ro) @@ -746,9 +776,10 @@ char *s; } -extern void -writepict(s) /* write the picture to a file */ -char *s; +void +writepict( /* write the picture to a file */ + char *s +) { static char buf[128]; char *fname;