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

Comparing ray/src/util/glareval.c (file contents):
Revision 1.21 by greg, Mon Nov 11 15:09:42 1991 UTC vs.
Revision 2.17 by greg, Fri Feb 28 05:18:49 2020 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1991 Regents of the University of California */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   * Compute pixels for glare calculation
6   */
7  
8 + #include "copyright.h"
9 +
10 + #include <stdlib.h>
11 + #include <string.h>
12 +
13 + #include "platform.h"
14 + #include "rtprocess.h" /* Windows: must come first because of conflicts */
15   #include "glare.h"
16 < #include "resolu.h"
16 >
17                                          /* maximum rtrace buffer size */
18   #define MAXPIX          (4096/(6*sizeof(float)))
19  
# Line 17 | Line 21 | static char SCCSid[] = "$SunId$ LBL";
21   #define HSIZE           317     /* size of scanline hash table */
22   #define NRETIRE         16      /* number of scanlines to retire at once */
23  
24 < int     rt_pd[3] = {-1,-1,-1};  /* process id & descriptors for rtrace */
24 > static SUBPROC  rt_pd = SP_INACTIVE; /* process id & descriptors for rtrace */
25  
26   FILE    *pictfp = NULL;         /* picture file pointer */
27   double  exposure;               /* picture exposure */
# Line 41 | Line 45 | static int     maxpix;         /* maximum number of pixels to buf
45   static SCAN     *freelist;              /* scanline free list */
46   static SCAN     *hashtab[HSIZE];        /* scanline hash table */
47  
48 + static long     scanbufsiz;             /* size of allocated scanline buffer */
49 +
50   static long     ncall = 0L;     /* number of calls to getpictscan */
51   static long     nread = 0L;     /* number of scanlines read */
52   static long     nrecl = 0L;     /* number of scanlines reclaimed */
53  
54   static int      wrongformat = 0;
55  
56 < SCAN    *scanretire();
56 > static SCAN * claimscan(int     y);
57 > static COLR * getpictscan(int   y);
58 > static double pict_val(FVECT    vd);
59 > static void rt_compute(float    *pb, int        np);
60 > static gethfunc getexpos;
61 > static SCAN * scanretire(void);
62 > static void initscans(void);
63 > static void donescans(void);
64  
52 – extern long     ftell();
65  
66 <
67 < SCAN *
68 < claimscan(y)                    /* claim scanline from buffers */
69 < int     y;
66 > static SCAN *
67 > claimscan(                      /* claim scanline from buffers */
68 >        int     y
69 > )
70   {
71          int     hi = shash(y);
72          SCAN    *slast;
# Line 80 | Line 92 | int    y;
92   }
93  
94  
95 < COLR *
96 < getpictscan(y)                  /* get picture scanline */
97 < int     y;
95 > static COLR *
96 > getpictscan(                    /* get picture scanline */
97 >        int     y
98 > )
99   {
100          register SCAN   *sl;
101          register int    i;
# Line 132 | Line 145 | seekerr:
145  
146  
147   #ifdef DEBUG
148 < pict_stats()                    /* print out picture read statistics */
148 > void
149 > pict_stats(void)                        /* print out picture read statistics */
150   {
151          static long     lastcall = 0L;  /* ncall at last report */
152          static long     lastread = 0L;  /* nread at last report */
# Line 149 | Line 163 | pict_stats()                   /* print out picture read statistics */
163   #endif
164  
165  
166 < double
167 < pict_val(vd)                    /* find picture value for view direction */
168 < FVECT   vd;
166 > static double
167 > pict_val(                       /* find picture value for view direction */
168 >        FVECT   vd
169 > )
170   {
171          FVECT   pp;
172          FVECT   ip;
# Line 162 | Line 177 | FVECT  vd;
177          pp[0] = pictview.vp[0] + vd[0];
178          pp[1] = pictview.vp[1] + vd[1];
179          pp[2] = pictview.vp[2] + vd[2];
180 <        viewloc(ip, &pictview, pp);
166 <        if (ip[2] <= FTINY || ip[0] < 0. || ip[0] >= 1. ||
167 <                        ip[1] < 0. || ip[1] >= 1.)
180 >        if (viewloc(ip, &pictview, pp) != 1)
181                  return(-1.0);
182          colr_color(res, getpictscan((int)(ip[1]*pysiz))[(int)(ip[0]*pxsiz)]);
183          return(luminance(res)/exposure);
184   }
185  
186  
187 < double
188 < getviewpix(vh, vv)              /* compute single view pixel */
189 < int     vh, vv;
187 > extern double
188 > getviewpix(             /* compute single view pixel */
189 >        int     vh,
190 >        int     vv
191 > )
192   {
193          FVECT   dir;
194          float   rt_buf[12];
# Line 184 | Line 199 | int    vh, vv;
199          npixinvw++;
200          if ((res = pict_val(dir)) >= 0.0)
201                  return(res);
202 <        if (rt_pd[0] == -1) {
202 >        if (!(rt_pd.flags & PF_RUNNING)) {
203                  npixmiss++;
204                  return(-1.0);
205          }
# Line 199 | Line 214 | int    vh, vv;
214   }
215  
216  
217 < getviewspan(vv, vb)             /* compute a span of view pixels */
218 < int     vv;
219 < float   *vb;
217 > extern void
218 > getviewspan(            /* compute a span of view pixels */
219 >        int     vv,
220 >        float   *vb
221 > )
222   {
223          float   rt_buf[6*MAXPIX];       /* rtrace send/receive buffer */
224          register int    n;              /* number of pixels in buffer */
# Line 223 | Line 240 | float  *vb;
240                  npixinvw++;
241                  if ((vb[vh+hsize] = pict_val(dir)) >= 0.0)
242                          continue;
243 <                if (rt_pd[0] == -1) {           /* missing information */
243 >                if (!(rt_pd.flags & PF_RUNNING)) {      /* missing information */
244                          npixmiss++;
245                          continue;
246                  }
247                                                  /* send to rtrace */
248                  if (n >= maxpix) {                      /* flush */
249                          rt_compute(rt_buf, n);
250 <                        while (n-- > 0)
250 >                        while (n > 0) {
251 >                                --n;
252                                  vb[buf_vh[n]+hsize] = luminance(rt_buf+3*n);
253 +                        }
254                  }
255                  rt_buf[6*n] = ourview.vp[0];
256                  rt_buf[6*n+1] = ourview.vp[1];
# Line 253 | Line 272 | float  *vb;
272   }
273  
274  
275 < rt_compute(pb, np)              /* process buffer through rtrace */
276 < float   *pb;
277 < int     np;
275 > static void
276 > rt_compute(             /* process buffer through rtrace */
277 >        float   *pb,
278 >        int     np
279 > )
280   {
281   #ifdef DEBUG
282          if (verbose && np > 1)
283                  fprintf(stderr, "%s: sending %d samples to rtrace...\n",
284                                  progname, np);
285   #endif
286 <        bzero(pb+6*np, 6*sizeof(float));
287 <        if (process(rt_pd, pb, pb, 3*sizeof(float)*np,
288 <                        6*sizeof(float)*(np+1)) < 3*sizeof(float)*np) {
286 >        memset(pb+6*np, '\0', 6*sizeof(float));
287 >        if (process(&rt_pd, (char *)pb, (char *)pb, 3*sizeof(float)*(np+1),
288 >                        6*sizeof(float)*(np+1)) < 3*sizeof(float)*(np+1)) {
289                  fprintf(stderr, "%s: rtrace communication error\n",
290                                  progname);
291                  exit(1);
# Line 272 | Line 293 | int    np;
293   }
294  
295  
296 < getexpos(s)                     /* get exposure from header line */
297 < char    *s;
296 > static int
297 > getexpos(                       /* get exposure from header line */
298 >        char    *s,
299 >        void    *p
300 > )
301   {
302 <        char    fmt[32];
302 >        char    fmt[MAXFMTLEN];
303  
304          if (isexpos(s))
305                  exposure *= exposval(s);
# Line 283 | Line 307 | char   *s;
307                  formatval(fmt, s);
308                  wrongformat = strcmp(fmt, COLRFMT);
309          }
310 +        return(0);
311   }
312  
313  
314 < open_pict(fn)                   /* open picture file */
315 < char    *fn;
314 > extern void
315 > open_pict(                      /* open picture file */
316 >        char    *fn
317 > )
318   {
319          if ((pictfp = fopen(fn, "r")) == NULL) {
320 <                fprintf("%s: cannot open\n", fn);
320 >                fprintf(stderr, "%s: cannot open\n", fn);
321                  exit(1);
322          }
323 +        SET_FILE_BINARY(pictfp);
324          exposure = 1.0;
325          getheader(pictfp, getexpos, NULL);
326          if (wrongformat || !fscnresolu(&pxsiz, &pysiz, pictfp)) {
# Line 303 | Line 331 | char   *fn;
331   }
332  
333  
334 < close_pict()                    /* done with picture */
334 > extern void
335 > close_pict(void)                        /* done with picture */
336   {
337          if (pictfp == NULL)
338                  return;
# Line 313 | Line 342 | close_pict()                   /* done with picture */
342   }
343  
344  
345 < fork_rtrace(av)                 /* open pipe and start rtrace */
346 < char    *av[];
345 > extern void
346 > fork_rtrace(                    /* open pipe and start rtrace */
347 >        char    *av[]
348 > )
349   {
350          int     rval;
351  
352 <        rval = open_process(rt_pd, av);
352 >        rval = open_process(&rt_pd, av);
353          if (rval < 0) {
354                  perror(progname);
355                  exit(1);
# Line 334 | Line 365 | char   *av[];
365   }
366  
367  
368 < done_rtrace()                   /* wait for rtrace to finish */
368 > extern void
369 > done_rtrace(void)                       /* wait for rtrace to finish */
370   {
371          int     status;
372  
373 <        status = close_process(rt_pd);
373 >        status = close_process(&rt_pd);
374          if (status > 0) {
375                  fprintf(stderr, "%s: bad status (%d) from rtrace\n",
376                                  progname, status);
377                  exit(1);
378          }
347 –        rt_pd[0] = -1;
379   }
380  
381  
382 < SCAN *
383 < scanretire()                    /* retire old scanlines to free list */
382 > static SCAN *
383 > scanretire(void)                        /* retire old scanlines to free list */
384   {
385          SCAN    *sold[NRETIRE];
386          int     n;
# Line 392 | Line 423 | scanretire()                   /* retire old scanlines to free list */
423   static char     *scan_buf;
424  
425  
426 < initscans()                             /* initialize scanline buffers */
426 > static void
427 > initscans(void)                         /* initialize scanline buffers */
428   {
429          int     scansize;
430          register SCAN   *ptr;
431          register int    i;
432                                          /* initialize positions */
433 <        scanpos = (long *)malloc(pysiz*sizeof(long));
433 >        scanpos = (long *)bmalloc(pysiz*sizeof(long));
434          if (scanpos == NULL)
435                  memerr("scanline positions");
436          for (i = pysiz-1; i >= 0; i--)
# Line 409 | Line 441 | initscans()                            /* initialize scanline buffers */
441                  hashtab[i] = NULL;
442                                          /* allocate scanline buffers */
443          scansize = sizeof(SCAN) + pxsiz*sizeof(COLR);
444 < #ifdef ALIGN
445 <        scansize = scansize+(sizeof(ALIGN)-1) & ~(sizeof(ALIGN)-1);
444 > #ifdef ALIGNT
445 >        scansize = scansize+(sizeof(ALIGNT)-1) & ~(sizeof(ALIGNT)-1);
446   #endif
447          i = MAXSBUF / scansize;         /* compute number to allocate */
448          if (i > HSIZE)
449                  i = HSIZE;
450 <        scan_buf = malloc(i*scansize);  /* get in one big chunk */
450 >        scanbufsiz = i*scansize;
451 >        scan_buf = bmalloc(scanbufsiz); /* get in one big chunk */
452          if (scan_buf == NULL)
453                  memerr("scanline buffers");
454          ptr = (SCAN *)scan_buf;
# Line 430 | Line 463 | initscans()                            /* initialize scanline buffers */
463   }
464  
465  
466 < donescans()                             /* free up scanlines */
466 > static void
467 > donescans(void)                         /* free up scanlines */
468   {
469 <        free(scan_buf);
470 <        free((char *)scanpos);
469 >        bfree(scan_buf, scanbufsiz);
470 >        bfree((char *)scanpos, pysiz*sizeof(long));
471   }

Diff Legend

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