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

Comparing ray/src/rt/rpict.c (file contents):
Revision 1.25 by greg, Tue May 21 17:41:35 1991 UTC vs.
Revision 1.31 by greg, Tue Aug 13 12:16:34 1991 UTC

# Line 36 | Line 36 | double  pixaspect = 1.0;               /* pixel aspect ratio */
36   int  psample = 4;                       /* pixel sample size */
37   double  maxdiff = .05;                  /* max. difference for interpolation */
38   double  dstrpix = 0.67;                 /* square pixel distribution */
39 – int  psuper = 2;                        /* pixel super-sampling rate */
39  
40   double  dstrsrc = 0.0;                  /* square source distribution */
41   double  shadthresh = .05;               /* shadow threshold */
42   double  shadcert = .5;                  /* shadow certainty */
43 + int  directrelay = 0;                   /* number of source relays */
44 + int  vspretest = 512;                   /* virtual source pretest density */
45 + int  directinvis = 0;                   /* sources invisible? */
46  
47   int  maxdepth = 6;                      /* maximum recursion depth */
48   double  minweight = 5e-3;               /* minimum ray weight */
# Line 65 | Line 67 | extern long  tstart;                   /* starting time */
67  
68   extern long  nrays;                     /* number of rays traced */
69  
70 < #define  MAXDIV         32              /* maximum sample size */
70 > #define  MAXDIV         15              /* maximum sample size */
71  
72   #define  pixjitter()    (.5+dstrpix*(.5-frandom()))
73  
# Line 127 | Line 129 | char  *zfile, *oldfile;
129                                          /* check sampling */
130          if (psample < 1)
131                  psample = 1;
132 <        else if (psample > MAXDIV)
132 >        else if (psample > MAXDIV) {
133 >                sprintf(errmsg, "pixel sampling reduced from %d to %d",
134 >                                psample, MAXDIV);
135 >                error(WARNING, errmsg);
136                  psample = MAXDIV;
137 +        }
138                                          /* allocate scanlines */
139          for (i = 0; i <= psample; i++) {
140                  scanbar[i] = (COLOR *)malloc(hresolu*sizeof(COLOR));
# Line 348 | Line 354 | int  x, y;                     /* pixel position */
354  
355          rayorigin(&thisray, NULL, PRIMARY, 1.0);
356  
357 <        samplendx = 3*y + x;                    /* set pixel index */
357 >        samplendx = pixnumber(x,y,hresolu,vresolu);     /* set pixel index */
358  
359          rayvalue(&thisray);                     /* trace ray */
360  
# Line 407 | Line 413 | char  *oldfile;
413          return(y);
414   writerr:
415          error(SYSTEM, "write error in salvage");
416 + }
417 +
418 +
419 + int
420 + pixnumber(x, y, xres, yres)             /* compute pixel index (brushed) */
421 + register int  x, y;
422 + int  xres, yres;
423 + {
424 +        x -= y;
425 +        while (x < 0)
426 +                x += xres;
427 +        return((((x>>2)*yres + y) << 2) + (x & 3));
428   }

Diff Legend

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