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

Comparing ray/src/hd/rholo.c (file contents):
Revision 3.24 by gregl, Fri Dec 12 19:52:31 1997 UTC vs.
Revision 3.26 by gregl, Sat Dec 13 10:38:26 1997 UTC

# Line 88 | Line 88 | char   *argv[];
88                  default:
89                          goto userr;
90                  }
91 –                                                /* do we have a job? */
92 –        if (outdev == NULL && ncprocs <= 0)
93 –                goto userr;
91                                                  /* get root file name */
92          rootname(froot, hdkfile=argv[i++]);
93                                                  /* load... */
# Line 133 | Line 130 | char   *argv[];
130          quit(0);
131   userr:
132          fprintf(stderr,
133 < "Usage: %s {-n nprocs|-o disp} [-w][-f] output.hdk [control.hif [VAR=val ..]]\n",
133 > "Usage: %s [-n nprocs][-o disp][-w][-f] output.hdk [control.hif [VAR=val ..]]\n",
134                          progname);
135          quit(1);
136   }
# Line 233 | Line 230 | initrholo()                    /* get our holodeck running */
230                          goto memerr;
231                  freepacks[--i].nr = 0;
232                  freepacks[i].next = NULL;
233 <                if (!vbool(OBSTRUCTIONS)) {
233 >                if (!vdef(OBSTRUCTIONS) || !vbool(OBSTRUCTIONS)) {
234                          freepacks[i].offset = (float *)bmalloc(
235                                          RPACKSIZ*sizeof(float)*(i+1) );
236                          if (freepacks[i].offset == NULL)
# Line 336 | Line 333 | register HDGRID        *gp;
333                          error(SYSTEM, "out of memory");
334                  sprintf(vval(OCTREE), "%s.oct", froot);
335                  vdef(OCTREE)++;
339 –        }
340 –        if (!vdef(OBSTRUCTIONS)) {
341 –                vval(OBSTRUCTIONS) = "T";
342 –                vdef(OBSTRUCTIONS)++;
336          }
337          if (!vdef(VDIST)) {
338                  vval(VDIST) = "F";

Diff Legend

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