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

Comparing ray/src/rt/ray.h (file contents):
Revision 2.12 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.15 by greg, Tue Mar 11 17:08:55 2003 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  ray.h - header file for routines using rays.
4   */
5  
6 < /* ====================================================================
7 < * The Radiance Software License, Version 1.0
8 < *
9 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 < *
12 < * Redistribution and use in source and binary forms, with or without
13 < * modification, are permitted provided that the following conditions
14 < * are met:
15 < *
16 < * 1. Redistributions of source code must retain the above copyright
17 < *         notice, this list of conditions and the following disclaimer.
18 < *
19 < * 2. Redistributions in binary form must reproduce the above copyright
20 < *       notice, this list of conditions and the following disclaimer in
21 < *       the documentation and/or other materials provided with the
22 < *       distribution.
23 < *
24 < * 3. The end-user documentation included with the redistribution,
25 < *           if any, must include the following acknowledgment:
26 < *             "This product includes Radiance software
27 < *                 (http://radsite.lbl.gov/)
28 < *                 developed by the Lawrence Berkeley National Laboratory
29 < *               (http://www.lbl.gov/)."
30 < *       Alternately, this acknowledgment may appear in the software itself,
31 < *       if and wherever such third-party acknowledgments normally appear.
32 < *
33 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 < *       and "The Regents of the University of California" must
35 < *       not be used to endorse or promote products derived from this
36 < *       software without prior written permission. For written
37 < *       permission, please contact [email protected].
38 < *
39 < * 5. Products derived from this software may not be called "Radiance",
40 < *       nor may "Radiance" appear in their name, without prior written
41 < *       permission of Lawrence Berkeley National Laboratory.
42 < *
43 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 < * SUCH DAMAGE.
55 < * ====================================================================
56 < *
57 < * This software consists of voluntary contributions made by many
58 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 < * information on Lawrence Berkeley National Laboratory, please see
60 < * <http://www.lbl.gov/>.
61 < */
6 > #include "copyright.h"
7  
8   #include  "standard.h"
9  
# Line 96 | Line 41 | typedef struct ray {
41          OBJECT  *clipset;       /* set of objects currently clipped */
42          OBJECT  *newcset;       /* next clipset, used for transmission */
43          void    (*revf)();      /* evaluation function for this ray */
44 +        void    (*hitf)();      /* custom hit test for this traversal */
45          OBJECT  robj;           /* intersected object number */
46          OBJREC  *ro;            /* intersected object (one with material) */
47          double  rot;            /* distance to object */
# Line 103 | Line 49 | typedef struct ray {
49          FVECT   ron;            /* intersection surface normal */
50          double  rod;            /* -DOT(rdir, ron) */
51          FULLXF  *rox;           /* object transformation */
52 +        FLOAT   uv[2];          /* local coordinates */
53          FVECT   pert;           /* surface normal perturbation */
54          COLOR   pcol;           /* pattern color */
55          COLOR   rcol;           /* returned ray value */
# Line 238 | Line 185 | extern void    ray_pclose();
185   extern int      rayorigin();
186   extern void     rayclear();
187   extern void     raytrace();
188 + extern void     rayhit();
189   extern void     raycont();
190   extern void     raytrans();
191   extern int      rayshade();
# Line 290 | Line 238 | extern void    ray_pclose(int nsub);
238   extern int      rayorigin(RAY *r, RAY *ro, int rt, double rw);
239   extern void     rayclear(RAY *r);
240   extern void     raytrace(RAY *r);
241 + extern void     rayhit(OBJECT *oset, RAY *r);
242   extern void     raycont(RAY *r);
243   extern void     raytrans(RAY *r);
244   extern int      rayshade(RAY *r, int mod);

Diff Legend

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