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.34 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.42 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   *  raytrace.c - routines for tracing and shading rays.
# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in ray.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12   #include  "ray.h"
13  
# Line 75 | Line 20 | static const char      RCSid[] = "$Id$";
20   unsigned long  raynum = 0;              /* next unique ray number */
21   unsigned long  nrays = 0;               /* number of calls to localhit */
22  
23 < static FLOAT  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
23 > static RREAL  Lambfa[5] = {PI, PI, PI, 0.0, 0.0};
24   OBJREC  Lamb = {
25          OVOID, MAT_PLASTIC, "Lambertian",
26          {0, 5, NULL, Lambfa}, NULL,
# Line 150 | Line 95 | register RAY  *r;
95   {
96          r->rno = raynum++;
97          r->newcset = r->clipset;
98 +        r->hitf = rayhit;
99          r->robj = OVOID;
100          r->ro = NULL;
101          r->rox = NULL;
102          r->rt = r->rot = FHUGE;
103          r->pert[0] = r->pert[1] = r->pert[2] = 0.0;
104 +        r->uv[0] = r->uv[1] = 0.0;
105          setcolor(r->pcol, 1.0, 1.0, 1.0);
106          setcolor(r->rcol, 0.0, 0.0, 0.0);
107   }
# Line 227 | Line 174 | int  mod;
174                  }
175                  ******/
176                                          /* hack for irradiance calculation */
177 <                if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS))) {
177 >                if (do_irrad && !(r->crtype & ~(PRIMARY|TRANS)) &&
178 >                                (ofun[m->otype].flags & (T_M|T_X))) {
179                          if (irr_ignore(m->otype)) {
180   #if  MAXLOOP
181                                  depth--;
# Line 280 | Line 228 | register RAY  *r;
228   }
229  
230  
231 + void
232   raytexture(r, mod)                      /* get material modifiers */
233   RAY  *r;
234 < int  mod;
234 > OBJECT  mod;
235   {
236          register OBJREC  *m;
237   #if  MAXLOOP
# Line 329 | Line 278 | double  coef;
278                                          /* compute foreground and background */
279          foremat = backmat = 0;
280                                          /* foreground */
281 <        copystruct(&fr, r);
281 >        fr = *r;
282          if (coef > FTINY)
283                  foremat = rayshade(&fr, fore);
284                                          /* background */
285 <        copystruct(&br, r);
285 >        br = *r;
286          if (coef < 1.0-FTINY)
287                  backmat = rayshade(&br, back);
288                                          /* check for transparency */
289 <        if (backmat ^ foremat)
289 >        if (backmat ^ foremat) {
290                  if (backmat && coef > FTINY)
291                          raytrans(&fr);
292                  else if (foremat && coef < 1.0-FTINY)
293                          raytrans(&br);
294 +        }
295                                          /* mix perturbations */
296          for (i = 0; i < 3; i++)
297                  r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i];
# Line 464 | Line 414 | register RAY  *r;
414   }
415  
416  
417 + void
418 + rayhit(oset, r)                 /* standard ray hit test */
419 + OBJECT  *oset;
420 + RAY  *r;
421 + {
422 +        OBJREC  *o;
423 +        int     i;
424 +
425 +        for (i = oset[0]; i > 0; i--) {
426 +                o = objptr(oset[i]);
427 +                if ((*ofun[o->otype].funp)(o, r))
428 +                        r->robj = oset[i];
429 +        }
430 + }
431 +
432 +
433   int
434   localhit(r, scene)              /* check for hit in the octree */
435   register RAY  *r;
# Line 522 | Line 488 | register CUBE  *scene;
488          }
489          cxset[0] = 0;
490          raymove(curpos, cxset, sflags, r, scene);
491 <        return(r->ro != NULL & r->ro != &Aftplane);
491 >        return((r->ro != NULL) & (r->ro != &Aftplane));
492   }
493  
494  
# Line 619 | Line 585 | CUBE  *cu;
585   OBJECT  *cxs;
586   {
587          OBJECT  oset[MAXSET+1];
622        register OBJREC  *o;
623        register int  i;
588  
589          objset(oset, cu->cutree);
590 <        checkset(oset, cxs);                    /* eliminate double-checking */
591 <        for (i = oset[0]; i > 0; i--) {
592 <                o = objptr(oset[i]);
593 <                if ((*ofun[o->otype].funp)(o, r))
594 <                        r->robj = oset[i];
631 <        }
632 <        if (r->ro == NULL)
590 >        checkset(oset, cxs);                    /* avoid double-checking */
591 >
592 >        (*r->hitf)(oset, r);                    /* test for hit in set */
593 >
594 >        if (r->robj == OVOID)
595                  return(0);                      /* no scores yet */
596  
597          return(incube(cu, r->rop));             /* hit OK if in current cube */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines