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

Comparing ray/src/rt/raytrace.c (file contents):
Revision 2.33 by gwlarson, Tue Sep 15 09:52:39 1998 UTC vs.
Revision 2.35 by greg, Tue Feb 25 02:47:23 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1998 Silicon Graphics, Inc. */
2 –
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ SGI";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6 –
4   /*
5   *  raytrace.c - routines for tracing and shading rays.
6   *
7 < *     8/7/85
7 > *  External symbols declared in ray.h
8   */
9  
10 + #include "copyright.h"
11 +
12   #include  "ray.h"
13  
15 – #include  "octree.h"
16 –
14   #include  "otypes.h"
15  
16   #include  "otspecial.h"
17  
18   #define  MAXCSET        ((MAXSET+1)*2-1)        /* maximum check set size */
19  
23 – extern CUBE  thescene;                  /* our scene */
24 – extern int  maxdepth;                   /* maximum recursion depth */
25 – extern double  minweight;               /* minimum ray weight */
26 – extern int  do_irrad;                   /* compute irradiance? */
27 – extern COLOR  ambval;                   /* ambient value */
28 –
29 – extern COLOR  cextinction;              /* global extinction coefficient */
30 – extern COLOR  salbedo;                  /* global scattering albedo */
31 – extern double  seccg;                   /* global scattering eccentricity */
32 – extern double  ssampdist;               /* scatter sampling distance */
33 –
20   unsigned long  raynum = 0;              /* next unique ray number */
21   unsigned long  nrays = 0;               /* number of calls to localhit */
22  
# Line 42 | Line 28 | OBJREC  Lamb = {
28  
29   OBJREC  Aftplane;                       /* aft clipping plane object */
30  
31 < static int  raymove(), checkset(), checkhit();
31 > static int  raymove(), checkhit();
32 > static void  checkset();
33  
34   #ifndef  MAXLOOP
35   #define  MAXLOOP        0               /* modifier loop detection */
# Line 51 | Line 38 | static int  raymove(), checkset(), checkhit();
38   #define  RAYHIT         (-1)            /* return value for intercepted ray */
39  
40  
41 + int
42   rayorigin(r, ro, rt, rw)                /* start new ray from old one */
43   register RAY  *r, *ro;
44   int  rt;
# Line 101 | Line 89 | double  rw;
89   }
90  
91  
92 + void
93   rayclear(r)                     /* clear a ray for (re)evaluation */
94   register RAY  *r;
95   {
# Line 108 | Line 97 | register RAY  *r;
97          r->newcset = r->clipset;
98          r->robj = OVOID;
99          r->ro = NULL;
100 +        r->rox = NULL;
101          r->rt = r->rot = FHUGE;
102          r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
103          setcolor(r->pcol, 1.0, 1.0, 1.0);
# Line 115 | Line 105 | register RAY  *r;
105   }
106  
107  
108 + void
109   raytrace(r)                     /* trace a ray and compute its value */
110   RAY  *r;
111   {
121 –        extern int  (*trace)();
122 –
112          if (localhit(r, &thescene))
113                  raycont(r);             /* hit local surface, evaluate */
114          else if (r->ro == &Aftplane) {
# Line 135 | Line 124 | RAY  *r;
124   }
125  
126  
127 + void
128   raycont(r)                      /* check for clipped object and continue */
129   register RAY  *r;
130   {
# Line 144 | Line 134 | register RAY  *r;
134   }
135  
136  
137 + void
138   raytrans(r)                     /* transmit ray as is */
139   register RAY  *r;
140   {
# Line 158 | Line 149 | register RAY  *r;
149   }
150  
151  
152 + int
153   rayshade(r, mod)                /* shade ray r with material mod */
154   register RAY  *r;
155   int  mod;
# Line 201 | Line 193 | int  mod;
193   }
194  
195  
196 + void
197   rayparticipate(r)                       /* compute ray medium participation */
198   register RAY  *r;
199   {
# Line 264 | Line 257 | int  mod;
257   }
258  
259  
260 + int
261   raymixture(r, fore, back, coef)         /* mix modifiers */
262   register RAY  *r;
263   OBJECT  fore, back;
# Line 364 | Line 358 | register RAY  *r;
358   }
359  
360  
361 + void
362   newrayxf(r)                     /* get new tranformation matrix for ray */
363   RAY  *r;
364   {
# Line 383 | Line 378 | RAY  *r;
378                  if (rp->rox == &xp->xf) {               /* xp in use */
379                          xp = xp->next;                  /* move to next */
380                          if (xp == xflast) {             /* need new one */
381 <                                xp = (struct xfn *)bmalloc(sizeof(struct xfn));
381 >                                xp = (struct xfn *)malloc(sizeof(struct xfn));
382                                  if (xp == NULL)
383                                          error(SYSTEM,
384                                                  "out of memory in newrayxf");
# Line 400 | Line 395 | RAY  *r;
395   }
396  
397  
398 + void
399   flipsurface(r)                  /* reverse surface orientation */
400   register RAY  *r;
401   {
# Line 413 | Line 409 | register RAY  *r;
409   }
410  
411  
412 + int
413   localhit(r, scene)              /* check for hit in the octree */
414   register RAY  *r;
415   register CUBE  *scene;
# Line 560 | Line 557 | register CUBE  *cu;
557   }
558  
559  
560 < static
560 > static int
561   checkhit(r, cu, cxs)            /* check for hit in full cube */
562   register RAY  *r;
563   CUBE  *cu;
# Line 584 | Line 581 | OBJECT  *cxs;
581   }
582  
583  
584 < static
584 > static void
585   checkset(os, cs)                /* modify checked set and set to check */
586   register OBJECT  *os;                   /* os' = os - cs */
587   register OBJECT  *cs;                   /* cs' = cs + os */

Diff Legend

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