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.52 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.62 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 1 | Line 1
1   #ifndef lint
2 < static const char       RCSid[] = "$Id$";
2 > static const char RCSid[] = "$Id";
3   #endif
4   /*
5   *  rpict.c - routines and variables for picture generation.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
11 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
12 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
13 < *
14 < * Redistribution and use in source and binary forms, with or without
15 < * modification, are permitted provided that the following conditions
16 < * are met:
17 < *
18 < * 1. Redistributions of source code must retain the above copyright
19 < *         notice, this list of conditions and the following disclaimer.
20 < *
21 < * 2. Redistributions in binary form must reproduce the above copyright
22 < *       notice, this list of conditions and the following disclaimer in
23 < *       the documentation and/or other materials provided with the
24 < *       distribution.
25 < *
26 < * 3. The end-user documentation included with the redistribution,
27 < *           if any, must include the following acknowledgment:
28 < *             "This product includes Radiance software
29 < *                 (http://radsite.lbl.gov/)
30 < *                 developed by the Lawrence Berkeley National Laboratory
31 < *               (http://www.lbl.gov/)."
32 < *       Alternately, this acknowledgment may appear in the software itself,
33 < *       if and wherever such third-party acknowledgments normally appear.
34 < *
35 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
36 < *       and "The Regents of the University of California" must
37 < *       not be used to endorse or promote products derived from this
38 < *       software without prior written permission. For written
39 < *       permission, please contact [email protected].
40 < *
41 < * 5. Products derived from this software may not be called "Radiance",
42 < *       nor may "Radiance" appear in their name, without prior written
43 < *       permission of Lawrence Berkeley National Laboratory.
44 < *
45 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
49 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56 < * SUCH DAMAGE.
57 < * ====================================================================
58 < *
59 < * This software consists of voluntary contributions made by many
60 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
61 < * information on Lawrence Berkeley National Laboratory, please see
62 < * <http://www.lbl.gov/>.
63 < */
8 > #include "copyright.h"
9  
10 + #include  "platform.h"
11   #include  "ray.h"
12  
13   #include  <sys/types.h>
14  
15 < #ifndef NIX
15 > #ifndef NON_POSIX
16   #ifdef BSD
17   #include  <sys/time.h>
18   #include  <sys/resource.h>
# Line 76 | Line 22 | static const char      RCSid[] = "$Id$";
22   #endif
23   #endif
24  
25 < extern time_t   time();
80 <
25 > #include  <time.h>
26   #include  <signal.h>
27  
28   #include  "view.h"
84 –
29   #include  "random.h"
86 –
30   #include  "paths.h"
31  
32 +
33   #define  RFTEMPLATE     "rfXXXXXX"
34  
35   #ifndef SIGCONT
36 + #ifdef SIGIO     /* XXX can we live without this? */
37   #define SIGCONT         SIGIO
38   #endif
39 + #endif
40  
41   CUBE  thescene;                         /* our scene */
42   OBJECT  nsceneobjs;                     /* number of objects in our scene */
# Line 163 | Line 109 | int  hres, vres;                       /* resolution for this frame */
109  
110   static VIEW     lastview;               /* the previous view input */
111  
112 < extern char  *mktemp();
112 > extern char  *mktemp();  /* XXX should be in stdlib.h or unistd.h */
113  
114   void  report();
115  
116   double  pixvalue();
117  
118 < #ifdef NIX
173 < #define  file_exists(f) (access(f,F_OK)==0)
174 < #else
118 > #ifdef RHAS_STAT
119   #include  <sys/types.h>
120   #include  <sys/stat.h>
121   int
# Line 182 | Line 126 | char  *fname;
126          if (stat(fname, &sbuf) < 0) return(0);
127          return((sbuf.st_mode & S_IFREG) != 0);
128   }
129 + #else
130 + #define  file_exists(f) (access(f,F_OK)==0)
131   #endif
132  
133  
# Line 191 | Line 137 | int  code;
137   {
138          if (code)                       /* report status */
139                  report();
140 < #ifndef NIX
140 > #ifndef NON_POSIX
141          headclean();                    /* delete header file */
142          pfclean();                      /* clean up persist files */
143   #endif
# Line 199 | Line 145 | int  code;
145   }
146  
147  
148 < #ifndef NIX
148 > #ifndef NON_POSIX
149   void
150   report()                /* report progress */
151   {
# Line 236 | Line 182 | report()               /* report progress */
182                          nrays, pctdone, u/3600., s/3600.,
183                          (tlastrept-tstart)/3600., myhostname());
184          eputs(errmsg);
185 < #ifndef BSD
185 > #ifdef SIGCONT
186          signal(SIGCONT, report);
187   #endif
188   }
# Line 268 | Line 214 | char  *pout, *zout, *prvr;
214   * sequenced file naming.
215   */
216   {
271 –        extern char  *rindex(), *strncpy(), *strcat(), *strcpy();
217          char  fbuf[128], fbuf2[128];
218          int  npicts;
219          register char  *cp;
# Line 298 | Line 243 | char  *pout, *zout, *prvr;
243                  setview(&ourview);
244                  prvr = fbuf;                    /* mark for renaming */
245          }
246 <        if (pout != NULL & prvr != NULL) {
246 >        if ((pout != NULL) & (prvr != NULL)) {
247                  sprintf(fbuf, pout, seq);
248                  if (!strcmp(prvr, fbuf)) {      /* rename */
249                          strcpy(fbuf2, fbuf);
# Line 308 | Line 253 | char  *pout, *zout, *prvr;
253                                  cp--;
254                          strcpy(cp, RFTEMPLATE);
255                          prvr = mktemp(fbuf2);
256 <                        if (rename(fbuf, prvr) < 0)
256 >                        if (rename(fbuf, prvr) < 0) {
257                                  if (errno == ENOENT) {  /* ghost file */
258                                          sprintf(errmsg,
259                                                  "new output file \"%s\"",
# Line 321 | Line 266 | char  *pout, *zout, *prvr;
266                                                  fbuf, prvr);
267                                          error(SYSTEM, errmsg);
268                                  }
269 +                        }
270                  }
271          }
272          npicts = 0;                     /* render sequence */
# Line 345 | Line 291 | char  *pout, *zout, *prvr;
291                                          "cannot open output file \"%s\"", fbuf);
292                                  error(SYSTEM, errmsg);
293                          }
294 < #ifdef MSDOS
349 <                        setmode(fileno(stdout), O_BINARY);
350 < #endif
294 >                        SET_FILE_BINARY(stdout);
295                          dupheader();
296                  }
297                  hres = hresolu; vres = vresolu; pa = pixaspect;
298 <                if (prvr != NULL)
298 >                if (prvr != NULL) {
299                          if (viewfile(prvr, &ourview, &rs) <= 0
300                                          || rs.rt != PIXSTANDARD) {
301                                  sprintf(errmsg,
# Line 362 | Line 306 | char  *pout, *zout, *prvr;
306                                  hres = scanlen(&rs);
307                                  vres = numscans(&rs);
308                          }
309 +                }
310                  if ((cp = setview(&ourview)) != NULL)
311                          error(USER, cp);
312                  normaspect(viewaspect(&ourview), &pa, &hres, &vres);
# Line 379 | Line 324 | char  *pout, *zout, *prvr;
324                  putchar('\n');
325                  if (pa < .99 || pa > 1.01)
326                          fputaspect(pa, stdout);
327 +                fputnow(stdout);
328                  fputformat(COLRFMT, stdout);
329                  putchar('\n');
330                  if (zout != NULL)
# Line 400 | Line 346 | FILE  *fp;
346   {
347          char  linebuf[256];
348  
349 <        copystruct(&lastview, &ourview);
349 >        lastview = ourview;
350          while (fgets(linebuf, sizeof(linebuf), fp) != NULL)
351                  if (isview(linebuf) && sscanview(&ourview, linebuf) > 0)
352                          return(0);
# Line 449 | Line 395 | char  *zfile, *oldfile;
395                          sprintf(errmsg, "cannot open z-file \"%s\"", zfile);
396                          error(SYSTEM, errmsg);
397                  }
398 < #ifdef MSDOS
453 <                setmode(zfd, O_BINARY);
454 < #endif
398 >                SET_FD_BINARY(zfd);
399                  for (i = 0; i <= psample; i++) {
400                          zbar[i] = (float *)malloc(hres*sizeof(float));
401                          if (zbar[i] == NULL)
# Line 474 | Line 418 | char  *zfile, *oldfile;
418          pctdone = 100.0*i/vres;
419          if (ralrm > 0)                  /* report init stats */
420                  report();
421 < #ifndef  BSD
421 > #ifdef SIGCONT
422          else
479 – #endif
423          signal(SIGCONT, report);
424 + #endif
425          ypos = vres-1 - i;                      /* initialize sampling */
426          if (directvis)
427                  init_drawsources(psample);
# Line 503 | Line 447 | char  *zfile, *oldfile;
447                  if (directvis)                          /* add bitty sources */
448                          drawsources(scanbar, zbar, 0, hres, ypos, ystep);
449                                                          /* write it out */
450 < #ifndef  BSD
450 > #ifdef SIGCONT
451                  signal(SIGCONT, SIG_IGN);       /* don't interrupt writes */
452   #endif
453                  for (i = ystep; i > 0; i--) {
# Line 520 | Line 464 | char  *zfile, *oldfile;
464                  pctdone = 100.0*(vres-1-ypos)/vres;
465                  if (ralrm > 0 && time((time_t *)NULL) >= tlastrept+ralrm)
466                          report();
467 < #ifndef  BSD
467 > #ifdef SIGCONT
468                  else
469                          signal(SIGCONT, report);
470   #endif
471          }
472                                                  /* clean up */
473 + #ifdef SIGCONT
474          signal(SIGCONT, SIG_IGN);
475 + #endif
476          if (zfd != -1 && write(zfd, (char *)zbar[0], hres*sizeof(float))
477                                  < hres*sizeof(float))
478                  goto writerr;
# Line 547 | Line 493 | alldone:
493          pctdone = 100.0;
494          if (ralrm > 0)
495                  report();
496 + #ifdef SIGCONT
497          signal(SIGCONT, SIG_DFL);
498 + #endif
499          return;
500   writerr:
501          error(SYSTEM, "write error in render");
# Line 733 | Line 681 | char  *oldfile;
681                  error(WARNING, errmsg);
682                  goto gotzip;
683          }
684 < #ifdef MSDOS
737 <        setmode(fileno(fp), O_BINARY);
738 < #endif
684 >        SET_FILE_BINARY(fp);
685                                  /* discard header */
686          getheader(fp, NULL, NULL);
687                                  /* get picture size */

Diff Legend

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