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

Comparing ray/src/hd/holofile.c (file contents):
Revision 3.19 by gregl, Sun Jan 4 12:32:53 1998 UTC vs.
Revision 3.21 by gregl, Wed Jan 7 17:31:00 1998 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ SGI";
# Line 16 | Line 16 | static char SCCSid[] = "$SunId$ SGI";
16   #define CACHESIZE       16      /* default cache size (Mbytes, 0==inf) */
17   #endif
18   #ifndef FREEBEAMS
19 < #define FREEBEAMS       512     /* maximum beams to free at a time */
19 > #define FREEBEAMS       1024    /* maximum beams to free at a time */
20   #endif
21   #ifndef PCTFREE
22 < #define PCTFREE         20      /* maximum fraction to free (%) */
22 > #define PCTFREE         15      /* maximum fraction to free (%) */
23   #endif
24   #ifndef MAXFRAG
25   #define MAXFRAG         32767   /* maximum fragments/file to track (0==inf) */
# Line 126 | Line 126 | HDGRID *hproto;                /* holodeck section grid */
126                          error(SYSTEM, "failure loading holodeck directory");
127                                                  /* check that it's clean */
128                  if (hp->bi[nbeams(hp)].fo < 0)
129 <                        error(USER, "dirty holodeck section");
129 >                        error(WARNING, "dirty holodeck section");
130          } else {                        /* assume we're creating it */
131                  if ((hp = hdalloc(hproto)) == NULL)
132                          goto memerr;
# Line 641 | Line 641 | register HOLO  *hp;                    /* section we're adding from */
641   {
642          register int    i, j;
643                                          /* insert each beam from hp */
644 <        for (i = nbeams(hp); i > 0; i--) {
644 >        for (i = 1; i <= nbeams(hp); i++) {
645                  if (hp->bl[i] == NULL)          /* check if loaded */
646                          continue;
647   #if 0

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines