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

Comparing ray/src/rt/o_instance.c (file contents):
Revision 1.6 by greg, Tue Oct 24 13:58:45 1989 UTC vs.
Revision 2.4 by greg, Sat Feb 22 02:07:29 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1988 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   *  o_instance.c - routines for computing ray intersections with octrees.
6 + */
7 +
8 + /* ====================================================================
9 + * The Radiance Software License, Version 1.0
10   *
11 < *     11/11/88
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   */
64  
65   #include  "ray.h"
# Line 19 | Line 71 | o_instance(o, r)               /* compute ray intersection with oct
71   OBJREC  *o;
72   register RAY  *r;
73   {
22        extern long  nrays;
74          RAY  rcont;
75          register INSTANCE  *in;
76          register int  i;
77                                          /* get the octree */
78          in = getinstance(o, IO_ALL);
79 <                                        /* copy old ray */
80 <        bcopy(r, &rcont, sizeof(RAY));
81 <                                        /* transform it */
82 <        rcont.rno = nrays;
32 <        rcont.ro = NULL;
33 <        rcont.rot = FHUGE;
34 <        multp3(rcont.rorg, r->rorg, in->b.xfm);
35 <        multv3(rcont.rdir, r->rdir, in->b.xfm);
79 >                                        /* copy and transform ray */
80 >        copystruct(&rcont, r);
81 >        multp3(rcont.rorg, r->rorg, in->x.b.xfm);
82 >        multv3(rcont.rdir, r->rdir, in->x.b.xfm);
83          for (i = 0; i < 3; i++)
84 <                rcont.rdir[i] /= in->b.sca;
85 <                                        /* trace it */
84 >                rcont.rdir[i] /= in->x.b.sca;
85 >        rcont.rmax *= in->x.b.sca;
86 >                                        /* clear and trace it */
87 >        rayclear(&rcont);
88          if (!localhit(&rcont, &in->obj->scube))
89 <                return(0);              /* missed */
90 <        if (rcont.rot * in->f.sca >= r->rot)
91 <                return(0);              /* not close enough */
89 >                return(0);                      /* missed */
90 >        if (rcont.rot * in->x.f.sca >= r->rot)
91 >                return(0);                      /* not close enough */
92  
93          if (o->omod != OVOID) {         /* if we have modifier, use it */
94                  r->ro = o;
95 <                r->rofs = 1.0; setident4(r->rofx);
47 <                r->robs = 1.0; setident4(r->robx);
95 >                r->rox = NULL;
96          } else {                        /* else use theirs */
97                  r->ro = rcont.ro;
98 <                multmat4(r->rofx, rcont.rofx, in->f.xfm);
99 <                r->rofs = rcont.rofs * in->f.sca;
100 <                multmat4(r->robx, in->b.xfm, rcont.robx);
101 <                r->robs = in->b.sca * rcont.robs;
98 >                if (rcont.rox != NULL) {
99 >                        newrayxf(r);            /* allocate transformation */
100 >                                        /* NOTE: r->rox may equal rcont.rox! */
101 >                        multmat4(r->rox->f.xfm, rcont.rox->f.xfm, in->x.f.xfm);
102 >                        r->rox->f.sca = rcont.rox->f.sca * in->x.f.sca;
103 >                        multmat4(r->rox->b.xfm, in->x.b.xfm, rcont.rox->b.xfm);
104 >                        r->rox->b.sca = in->x.b.sca * rcont.rox->b.sca;
105 >                } else
106 >                        r->rox = &in->x;
107          }
108                                          /* transform it back */
109 <        r->rot = rcont.rot * in->f.sca;
110 <        multp3(r->rop, rcont.rop, in->f.xfm);
111 <        multv3(r->ron, rcont.ron, in->f.xfm);
109 >        r->rot = rcont.rot * in->x.f.sca;
110 >        multp3(r->rop, rcont.rop, in->x.f.xfm);
111 >        multv3(r->ron, rcont.ron, in->x.f.xfm);
112          for (i = 0; i < 3; i++)
113 <                r->ron[i] /= in->f.sca;
113 >                r->ron[i] /= in->x.f.sca;
114          r->rod = rcont.rod;
115                                          /* return hit */
116          return(1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines