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 1.11 by greg, Sat Aug 18 10:34:47 1990 UTC vs.
Revision 1.14 by greg, Tue May 21 17:41:23 1991 UTC

# Line 20 | Line 20 | static char SCCSid[] = "$SunId$ LBL";
20   *  All values default to ascii representation of real
21   *  numbers.  Binary representations can be selected
22   *  with '-ff' for float or '-fd' for double.  By default,
23 < *  radiance is computed.  The '-i' option indicates that
23 > *  radiance is computed.  The '-i' or '-I' options indicate that
24   *  irradiance values are desired.
25   */
26  
# Line 30 | Line 30 | static char SCCSid[] = "$SunId$ LBL";
30  
31   #include  "otypes.h"
32  
33 + int  dimlist[MAXDIM];                   /* sampling dimensions */
34 + int  ndims = 0;                         /* number of sampling dimensions */
35 + int  samplendx = 0;                     /* index for this sample */
36 +
37 + int  imm_irrad = 0;                     /* compute immediate irradiance? */
38 +
39   int  inform = 'a';                      /* input format */
40   int  outform = 'a';                     /* output format */
41   char  *outvals = "v";                   /* output specification */
# Line 53 | Line 59 | int  ambounce = 0;                     /* ambient bounces */
59   char  *amblist[128];                    /* ambient include/exclude list */
60   int  ambincl = -1;                      /* include == 1, exclude == 0 */
61  
62 + extern OBJREC  Lamb;                    /* a Lambertian surface */
63 +
64   static RAY  thisray;                    /* for our convenience */
65  
66   static int  oputo(), oputd(), oputv(), oputl(),
# Line 102 | Line 110 | char  *fname;
110                          fflush(stdout);
111                          continue;
112                  }
113 +                samplendx++;
114                                                          /* compute and print */
115 <                if (outvals[0] == 'i')
115 >                if (imm_irrad)
116                          irrad(orig, direc);
117                  else
118 <                        radiance(orig, direc);
118 >                        traceray(orig, direc);
119                                                          /* flush if time */
120                  if (--nextflush == 0) {
121                          fflush(stdout);
# Line 172 | Line 181 | register char  *vs;
181   }
182  
183  
184 < radiance(org, dir)              /* compute radiance value */
184 > traceray(org, dir)              /* compute and print ray value(s) */
185   FVECT  org, dir;
186   {
187          register int  (**tp)();
# Line 194 | Line 203 | FVECT  org, dir;
203   }
204  
205  
206 < irrad(org, dir)                 /* compute irradiance value */
206 > irrad(org, dir)                 /* compute immediate irradiance value */
207   FVECT  org, dir;
208   {
200 –        static double  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
201 –        static OBJREC  Lamb = {
202 –                OVOID, MAT_PLASTIC, "Lambertian",
203 –                {0, 5, NULL, Lambfa}, NULL, -1,
204 –        };
209          register int  i;
210  
211          for (i = 0; i < 3; i++) {

Diff Legend

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