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

Comparing ray/src/util/rsensor.c (file contents):
Revision 2.17 by greg, Fri Apr 24 19:17:12 2015 UTC vs.
Revision 2.21 by greg, Tue Mar 15 18:05:03 2022 UTC

# Line 9 | Line 9 | static const char RCSid[] = "$Id$";
9   */
10  
11   #include "ray.h"
12 + #include "platform.h"
13   #include "source.h"
14   #include "view.h"
15   #include "random.h"
# Line 26 | Line 27 | VIEW           ourview =  {VT_ANG,{0.,0.,0.},{0.,0.,1.},{1.,0.,
27                                  1.,180.,180.,0.,0.,0.,0.,
28                                  {0.,0.,0.},{0.,0.,0.},0.,0.};
29  
30 < unsigned long   nsamps = 10000; /* desired number of initial samples */
30 < unsigned long   nssamps = 9000; /* number of super-samples */
30 > long            nsamps = 10000; /* desired number of initial samples */
31   int             ndsamps = 32;   /* number of direct samples */
32   int             nprocs = 1;     /* number of rendering processes */
33  
# Line 59 | Line 59 | print_defaults()               /* print out default parameters */
59          over_options();
60          printf("-n %-9d\t\t\t# number of processes\n", nprocs);
61          printf("-rd %-9ld\t\t\t# ray directions\n", nsamps);
62 –        /* printf("-rs %-9ld\t\t\t# ray super-samples\n", nssamps); */
62          printf("-dn %-9d\t\t\t# direct number of samples\n", ndsamps);
63          printf("-vp %f %f %f\t# view point\n",
64                          ourview.vp[0], ourview.vp[1], ourview.vp[2]);
# Line 77 | Line 76 | quit(ec)                       /* make sure exit is called */
76   int     ec;
77   {
78          if (ray_pnprocs > 0)    /* close children if any */
79 <                ray_pclose(0);          
79 >                ray_pclose(0);
80 >        else if (ray_pnprocs < 0)
81 >                _exit(ec);      /* avoid flush in child */
82          exit(ec);
83   }
84  
# Line 129 | Line 130 | main(
130                  if (argv[i][1] == 'r') {        /* sampling options */
131                          if (argv[i][2] == 'd')
132                                  nsamps = atol(argv[++i]);
132 –                        else if (argv[i][2] == 's')
133 –                                nssamps = atol(argv[++i]);
133                          else {
134                                  sprintf(errmsg, "bad option at '%s'", argv[i]);
135                                  error(USER, errmsg);
# Line 237 | Line 236 | load_sensor(
236                  cp = fskip(cp);
237                  if (cp == NULL)
238                          break;
239 <                if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]) {
239 >                if (ntp[1] > 1 && sarr[ntp[1]+1] <= sarr[ntp[1]]+FTINY) {
240                          sprintf(errmsg,
241                  "Phi values not monotinically increasing in sensor file '%s'",
242                                          sfile);
# Line 303 | Line 302 | load_sensor(
302          else if (fabs(sarr[1]) > FTINY)
303                  sprintf(errmsg, "minimum phi must be 0 in sensor file '%s'",
304                                  sfile);
305 <        else if (sarr[ntp[1]] <= FTINY)
305 >        else if (sarr[ntp[1]] < 270.-FTINY)
306                  sprintf(errmsg,
307 <                        "maximum phi must be positive in sensor file '%s'",
307 >                        "maximum phi must be 270 or greater in sensor file '%s'",
308                                  sfile);
309 +        else if (sarr[ntp[1]] >= 360.-FTINY)
310 +                sprintf(errmsg,
311 +                        "maximum phi must be less than 360 in sensor file '%s'",
312 +                                sfile);
313          if (errmsg[0])
314                  error(USER, errmsg);
315          return((float *)realloc((void *)sarr, sizeof(float)*nelem));
# Line 318 | Line 321 | init_ptable(
321          char    *sfile
322   )
323   {
324 <        int     samptot = nsamps;
324 >        long    samptot = nsamps;
325          float   *rowp, *rowp1;
326          double  rowsum[MAXNT], rowomega[MAXNT];
327          double  thdiv[MAXNT+1], phdiv[MAXNP+1];

Diff Legend

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