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

Comparing ray/src/rt/rtrace.c (file contents):
Revision 2.27 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.34 by greg, Wed Sep 24 14:55:54 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  rtrace.c - program and variables for individual ray tracing.
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   /*
11   *  Input is in the form:
# Line 76 | Line 21 | static const char      RCSid[] = "$Id$";
21   *  irradiance values are desired.
22   */
23  
24 < #include  "ray.h"
24 > #include  <time.h>
25  
26 + #include  "platform.h"
27 + #include  "ray.h"
28   #include  "otypes.h"
82 –
29   #include  "resolu.h"
30  
31   CUBE  thescene;                         /* our scene */
# Line 128 | Line 74 | double  specjitter = 1.;               /* specular sampling jitter
74  
75   int  backvis = 1;                       /* back face visibility */
76  
77 < int  maxdepth = 6;                      /* maximum recursion depth */
78 < double  minweight = 4e-3;               /* minimum ray weight */
77 > int  maxdepth = 8;                      /* maximum recursion depth */
78 > double  minweight = 2e-3;               /* minimum ray weight */
79  
80   char  *ambfile = NULL;                  /* ambient file name */
81   COLOR  ambval = BLKCOLOR;               /* ambient value */
82   int  ambvwt = 0;                        /* initial weight for ambient value */
83 < double  ambacc = 0.2;                   /* ambient accuracy */
84 < int  ambres = 128;                      /* ambient resolution */
85 < int  ambdiv = 512;                      /* ambient divisions */
86 < int  ambssamp = 0;                      /* ambient super-samples */
83 > double  ambacc = 0.1;                   /* ambient accuracy */
84 > int  ambres = 256;                      /* ambient resolution */
85 > int  ambdiv = 1024;                     /* ambient divisions */
86 > int  ambssamp = 512;                    /* ambient super-samples */
87   int  ambounce = 0;                      /* ambient bounces */
88   char  *amblist[128];                    /* ambient include/exclude list */
89   int  ambincl = -1;                      /* include == 1, exclude == 0 */
# Line 145 | Line 91 | int  ambincl = -1;                     /* include == 1, exclude == 0 */
91  
92   static RAY  thisray;                    /* for our convenience */
93  
94 < static void  oputo(), oputd(), oputv(), oputl(), oputL(),
94 > static void  oputo(), oputd(), oputv(), oputl(), oputL(), oputc(),
95                  oputp(), oputn(), oputN(), oputs(), oputw(), oputm();
96  
97   static void  ourtrace(), tabin();
# Line 163 | Line 109 | void
109   quit(code)                      /* quit program */
110   int  code;
111   {
112 < #ifndef  NIX
112 > #ifndef  NON_POSIX /* XXX we don't clean up elsewhere? */
113          headclean();            /* delete header file */
114          pfclean();              /* clean up persist files */
115   #endif
# Line 201 | Line 147 | char  *fname;
147                  sprintf(errmsg, "cannot open input file \"%s\"", fname);
148                  error(SYSTEM, errmsg);
149          }
150 < #ifdef MSDOS
150 > #ifdef _WIN32
151          if (inform != 'a')
152 <                setmode(fileno(fp), O_BINARY);
152 >                SET_FILE_BINARY(fp);
153   #endif
154                                          /* set up output */
155          setoutput(outvals);
# Line 289 | Line 235 | register char  *vs;
235                          *table++ = oputl;
236                          castonly = 0;
237                          break;
238 +                case 'c':                               /* local coordinates */
239 +                        *table++ = oputc;
240 +                        break;
241                  case 'L':                               /* single ray length */
242                          *table++ = oputL;
243                          break;
# Line 336 | Line 285 | double dmax;
285          thisray.rmax = dmax;
286          rayorigin(&thisray, NULL, PRIMARY, 1.0);
287          if (castonly) {
288 <                if (!localhit(&thisray, &thescene))
288 >                if (!localhit(&thisray, &thescene)) {
289                          if (thisray.ro == &Aftplane) {  /* clipped */
290                                  thisray.ro = NULL;
291                                  thisray.rot = FHUGE;
292                          } else
293                                  sourcehit(&thisray);
294 +                }
295          } else
296                  rayvalue(&thisray);
297          printvals(&thisray);
# Line 484 | Line 434 | RAY  *r;
434  
435   static void
436   oputo(r)                                /* print origin */
437 < register RAY  *r;
437 > RAY  *r;
438   {
439          (*putreal)(r->rorg[0]);
440          (*putreal)(r->rorg[1]);
# Line 494 | Line 444 | register RAY  *r;
444  
445   static void
446   oputd(r)                                /* print direction */
447 < register RAY  *r;
447 > RAY  *r;
448   {
449          (*putreal)(r->rdir[0]);
450          (*putreal)(r->rdir[1]);
# Line 504 | Line 454 | register RAY  *r;
454  
455   static void
456   oputv(r)                                /* print value */
457 < register RAY  *r;
457 > RAY  *r;
458   {
459          COLR  cout;
460          
# Line 523 | Line 473 | register RAY  *r;
473  
474   static void
475   oputl(r)                                /* print effective distance */
476 < register RAY  *r;
476 > RAY  *r;
477   {
478          (*putreal)(r->rt);
479   }
# Line 531 | Line 481 | register RAY  *r;
481  
482   static void
483   oputL(r)                                /* print single ray length */
484 < register RAY  *r;
484 > RAY  *r;
485   {
486          (*putreal)(r->rot);
487   }
488  
489  
490   static void
491 + oputc(r)                                /* print local coordinates */
492 + RAY  *r;
493 + {
494 +        (*putreal)(r->uv[0]);
495 +        (*putreal)(r->uv[1]);
496 + }
497 +
498 +
499 + static void
500   oputp(r)                                /* print point */
501 < register RAY  *r;
501 > RAY  *r;
502   {
503          if (r->rot < FHUGE) {
504                  (*putreal)(r->rop[0]);
# Line 555 | Line 514 | register RAY  *r;
514  
515   static void
516   oputN(r)                                /* print unperturbed normal */
517 < register RAY  *r;
517 > RAY  *r;
518   {
519          if (r->rot < FHUGE) {
520                  (*putreal)(r->ron[0]);
# Line 590 | Line 549 | RAY  *r;
549  
550   static void
551   oputs(r)                                /* print name */
552 < register RAY  *r;
552 > RAY  *r;
553   {
554          if (r->ro != NULL)
555                  fputs(r->ro->oname, stdout);
# Line 602 | Line 561 | register RAY  *r;
561  
562   static void
563   oputw(r)                                /* print weight */
564 < register RAY  *r;
564 > RAY  *r;
565   {
566          (*putreal)(r->rweight);
567   }
# Line 610 | Line 569 | register RAY  *r;
569  
570   static void
571   oputm(r)                                /* print modifier */
572 < register RAY  *r;
572 > RAY  *r;
573   {
574          if (r->ro != NULL)
575                  if (r->ro->omod != OVOID)

Diff Legend

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