ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/rv3.c
(Generate patch)

Comparing ray/src/rt/rv3.c (file contents):
Revision 2.1 by greg, Tue Nov 12 17:09:47 1991 UTC vs.
Revision 2.7 by greg, Thu Dec 22 11:46:19 1994 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1987 Regents of the University of California */
1 > /* Copyright (c) 1994 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 19 | Line 19 | static char SCCSid[] = "$SunId$ LBL";
19   #include  "random.h"
20  
21   #ifndef WFLUSH
22 < #define WFLUSH          30              /* flush after this many rays */
22 > #ifdef SPEED
23 > #define WFLUSH          (5*SPEED)
24 > #else
25 > #define WFLUSH          100             /* flush after this many rays */
26   #endif
27 + #endif
28  
29 + #ifdef  SMLFLT
30 + #define  sscanvec(s,v)  (sscanf(s,"%f %f %f",v,v+1,v+2)==3)
31 + #else
32 + #define  sscanvec(s,v)  (sscanf(s,"%lf %lf %lf",v,v+1,v+2)==3)
33 + #endif
34  
35 +
36   getrect(s, r)                           /* get a box */
37   char  *s;
38   register RECT  *r;
# Line 87 | Line 97 | double  *mp;
97                  error(COMMAND, "illegal magnification");
98                  return(-1);
99          }
100 <        if (sscanf(s, "%*lf %lf %lf %lf", &vec[0], &vec[1], &vec[2]) != 3) {
100 >        if (!sscanvec(sskip(s), vec)) {
101                  if (dev->getcur == NULL)
102                          return(-1);
103                  (*dev->comout)("Pick view center\n");
104                  if ((*dev->getcur)(&x, &y) == ABORT)
105                          return(-1);
106 <                if (viewray(thisray.rorg, thisray.rdir, &ourview,
107 <                                (x+.5)/hresolu, (y+.5)/vresolu) < 0) {
106 >                if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir,
107 >                        &ourview, (x+.5)/hresolu, (y+.5)/vresolu)) < -FTINY) {
108                          error(COMMAND, "not on image");
109                          return(-1);
110                  }
# Line 137 | Line 147 | paint(p, xmin, ymin, xmax, ymax)       /* compute and paint
147   register PNODE  *p;
148   int  xmin, ymin, xmax, ymax;
149   {
150 <        extern long  nrays;
151 <        static long  lastflush = 0;
150 >        extern unsigned long  nrays;
151 >        static unsigned long  lastflush = 0;
152          static RAY  thisray;
153          double  h, v;
154  
# Line 152 | Line 162 | int  xmin, ymin, xmax, ymax;
162          h = xmin + (xmax-xmin)*frandom();
163          v = ymin + (ymax-ymin)*frandom();
164          
165 <        if (viewray(thisray.rorg, thisray.rdir, &ourview,
166 <                        h/hresolu, v/vresolu) < 0) {
165 >        if ((thisray.rmax = viewray(thisray.rorg, thisray.rdir, &ourview,
166 >                        h/hresolu, v/vresolu)) < -FTINY) {
167                  setcolor(thisray.rcol, 0.0, 0.0, 0.0);
168          } else {
169                  rayorigin(&thisray, NULL, PRIMARY, 1.0);
# Line 375 | Line 385 | moveview(angle, elev, mag, vc)                 /* move viewpoint */
385   double  angle, elev, mag;
386   FVECT  vc;
387   {
378 –        extern double  sqrt(), dist2();
388          double  d;
389          FVECT  v1;
390          VIEW  nv;
# Line 395 | Line 404 | FVECT  vc;
404                  d = 0.0;                        /* don't move closer */
405                  for (i = 0; i < 3; i++)
406                          d += (vc[i] - ourview.vp[i])*ourview.vdir[i];
407 +                nv.vfore = ourview.vfore;
408 +                nv.vaft = ourview.vaft;
409          } else {
410                  nv.horiz = ourview.horiz;
411                  nv.vert = ourview.vert;
412                  d = sqrt(dist2(ourview.vp, vc)) / mag;
413 +                nv.vfore = ourview.vfore + d - d*mag;
414 +                if (nv.vfore < 0.0) nv.vfore = 0.0;
415 +                nv.vaft = ourview.vaft + d - d*mag;
416 +                if (nv.vaft < nv.vfore) nv.vaft = 0.0;
417          }
418          for (i = 0; i < 3; i++)
419                  nv.vp[i] = vc[i] - d*nv.vdir[i];

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines