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 2.79 by schorsch, Thu Apr 24 10:28:25 2008 UTC vs.
Revision 2.84 by greg, Fri Feb 25 06:51:50 2011 UTC

# Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9  
10   #include  <sys/types.h>
11  
12 < #ifndef NON_POSIX
13 < #ifdef BSD
14 < #include  <sys/time.h>
15 < #include  <sys/resource.h>
12 > #include  "platform.h"
13 > #ifdef NON_POSIX
14 > #ifdef MINGW
15 >  #include  <sys/time.h>
16 > #endif
17   #else
18 < #ifndef MINGW
19 < #include  <sys/times.h>
20 < #else
21 < #include  <sys/time.h>
18 > #ifdef BSD
19 >  #include  <sys/time.h>
20 >  #include  <sys/resource.h>
21 > #else
22 >  #include  <sys/times.h>
23 >  #include  <unistd.h>
24 > #endif
25   #endif
22 #include  <unistd.h>
23 #endif
24 #endif
26  
27   #include  <time.h>
28   #include  <signal.h>
29  
29 #include  "platform.h"
30   #include  "ray.h"
31   #include  "paths.h"
32   #include  "ambient.h"
# Line 51 | Line 51 | int  dimlist[MAXDIM];                  /* sampling dimensions */
51   int  ndims = 0;                         /* number of sampling dimensions */
52   int  samplendx;                         /* sample index number */
53  
54 //extern void  ambnotify();
54   void  (*addobjnotify[])() = {ambnotify, NULL};
55  
56   VIEW  ourview = STDVIEW;                /* view parameters */
# Line 92 | Line 91 | double specjitter = 1.;                /* specular sampling jitter *
91   int  backvis = 1;                       /* back face visibility */
92  
93   int  maxdepth = 7;                      /* maximum recursion depth */
94 < double  minweight = 4e-3;               /* minimum ray weight */
94 > double  minweight = 1e-3;               /* minimum ray weight */
95  
96   char  *ambfile = NULL;                  /* ambient file name */
97   COLOR  ambval = BLKCOLOR;               /* ambient value */
# Line 119 | Line 118 | int  hres, vres;                       /* resolution for this frame */
118  
119   static VIEW     lastview;               /* the previous view input */
120  
122 //extern char  *mktemp();  /* XXX should be in stdlib.h or unistd.h */
123
124 //double        pixvalue();
125
121   static void report(int);
122   static int nextview(FILE *fp);
123   static void render(char *zfile, char *oldfile);
# Line 700 | Line 695 | pixvalue(              /* compute pixel value */
695                                                  /* optional depth-of-field */
696          if (dblur > FTINY && vdist > FTINY) {
697                  double  vc, dfh, dfv;
698 <                                                /* PI/4. square/circle conv. */
699 <                dfh = PI/4.*dblur*(.5 - frandom());
700 <                dfv = PI/4.*dblur*(.5 - frandom());
698 >                                                /* square/circle conv. */
699 >                dfh = vc = 1. - 2.*frandom();
700 >                dfv = 1. - 2.*frandom();
701 >                dfh *= .5*dblur*sqrt(1. - .5*dfv*dfv);
702 >                dfv *= .5*dblur*sqrt(1. - .5*vc*vc);
703                  if (ourview.type == VT_PER || ourview.type == VT_PAR) {
704                          dfh /= sqrt(ourview.hn2);
705                          dfv /= sqrt(ourview.vn2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines