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.74 by greg, Mon Feb 7 20:13:55 2005 UTC vs.
Revision 2.80 by schorsch, Sun Apr 27 17:22:49 2008 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 < #include  <sys/times.h>
19 < #include  <unistd.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
20 – #endif
26  
27   #include  <time.h>
28   #include  <signal.h>
29  
25 – #include  "platform.h"
30   #include  "ray.h"
31   #include  "paths.h"
32   #include  "ambient.h"
# Line 67 | Line 71 | void  (*trace)() = NULL;               /* trace call */
71  
72   int  do_irrad = 0;                      /* compute irradiance? */
73  
74 + int  rand_samp = 0;                     /* pure Monte Carlo sampling? */
75 +
76   double  dstrsrc = 0.0;                  /* square source distribution */
77   double  shadthresh = .05;               /* shadow threshold */
78   double  shadcert = .5;                  /* shadow certainty */
# Line 675 | Line 681 | pixvalue(              /* compute pixel value */
681                  return(0.0);
682          }
683          vdist = ourview.vdist;
684 <
685 <        samplendx = pixnumber(x,y,hres,vres);   /* set pixel index */
680 <
684 >                                                /* set pixel index */
685 >        samplendx = pixnumber(x,y,hres,vres);
686                                                  /* optional motion blur */
687          if (lastview.type && mblur > FTINY && (lmax = viewray(lorg, ldir,
688                                          &lastview, hpos, vpos)) >= -FTINY) {
# Line 709 | Line 714 | pixvalue(              /* compute pixel value */
714                          }
715                  } else {                        /* non-standard view case */
716                          double  dfd = PI/4.*dblur*(.5 - frandom());
717 <                        if (ourview.type != VT_ANG) {
717 >                        if (ourview.type != VT_ANG && ourview.type != VT_PLS) {
718                                  if (ourview.type != VT_CYL)
719                                          dfh /= sqrt(ourview.hn2);
720                                  dfv /= sqrt(ourview.vn2);
# Line 726 | Line 731 | pixvalue(              /* compute pixel value */
731                          return(0.0);
732          }
733  
734 <        rayorigin(&thisray, NULL, PRIMARY, 1.0);
734 >        rayorigin(&thisray, PRIMARY, NULL, NULL);
735  
736          rayvalue(&thisray);                     /* trace ray */
737  

Diff Legend

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