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 2.4 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.6 by greg, Tue Mar 11 17:08:55 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   *  o_instance.c - routines for computing ray intersections with octrees.
6   */
7  
8 < /* ====================================================================
9 < * The Radiance Software License, Version 1.0
10 < *
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 < */
8 > #include "copyright.h"
9  
10   #include  "ray.h"
11  
# Line 72 | Line 17 | OBJREC  *o;
17   register RAY  *r;
18   {
19          RAY  rcont;
20 <        register INSTANCE  *in;
20 >        double  d;
21 >        register INSTANCE  *ins;
22          register int  i;
23                                          /* get the octree */
24 <        in = getinstance(o, IO_ALL);
24 >        ins = getinstance(o, IO_ALL);
25                                          /* copy and transform ray */
26          copystruct(&rcont, r);
27 <        multp3(rcont.rorg, r->rorg, in->x.b.xfm);
28 <        multv3(rcont.rdir, r->rdir, in->x.b.xfm);
27 >        multp3(rcont.rorg, r->rorg, ins->x.b.xfm);
28 >        multv3(rcont.rdir, r->rdir, ins->x.b.xfm);
29          for (i = 0; i < 3; i++)
30 <                rcont.rdir[i] /= in->x.b.sca;
31 <        rcont.rmax *= in->x.b.sca;
30 >                rcont.rdir[i] /= ins->x.b.sca;
31 >        rcont.rmax *= ins->x.b.sca;
32                                          /* clear and trace it */
33          rayclear(&rcont);
34 <        if (!localhit(&rcont, &in->obj->scube))
34 >        if (!localhit(&rcont, &ins->obj->scube))
35                  return(0);                      /* missed */
36 <        if (rcont.rot * in->x.f.sca >= r->rot)
36 >        if (rcont.rot * ins->x.f.sca >= r->rot)
37                  return(0);                      /* not close enough */
38  
39          if (o->omod != OVOID) {         /* if we have modifier, use it */
# Line 98 | Line 44 | register RAY  *r;
44                  if (rcont.rox != NULL) {
45                          newrayxf(r);            /* allocate transformation */
46                                          /* NOTE: r->rox may equal rcont.rox! */
47 <                        multmat4(r->rox->f.xfm, rcont.rox->f.xfm, in->x.f.xfm);
48 <                        r->rox->f.sca = rcont.rox->f.sca * in->x.f.sca;
49 <                        multmat4(r->rox->b.xfm, in->x.b.xfm, rcont.rox->b.xfm);
50 <                        r->rox->b.sca = in->x.b.sca * rcont.rox->b.sca;
47 >                        multmat4(r->rox->f.xfm, rcont.rox->f.xfm, ins->x.f.xfm);
48 >                        r->rox->f.sca = rcont.rox->f.sca * ins->x.f.sca;
49 >                        multmat4(r->rox->b.xfm, ins->x.b.xfm, rcont.rox->b.xfm);
50 >                        r->rox->b.sca = ins->x.b.sca * rcont.rox->b.sca;
51                  } else
52 <                        r->rox = &in->x;
52 >                        r->rox = &ins->x;
53          }
54                                          /* transform it back */
55 <        r->rot = rcont.rot * in->x.f.sca;
56 <        multp3(r->rop, rcont.rop, in->x.f.xfm);
57 <        multv3(r->ron, rcont.ron, in->x.f.xfm);
58 <        for (i = 0; i < 3; i++)
59 <                r->ron[i] /= in->x.f.sca;
55 >        r->rot = rcont.rot * ins->x.f.sca;
56 >        multp3(r->rop, rcont.rop, ins->x.f.xfm);
57 >        multv3(r->ron, rcont.ron, ins->x.f.xfm);
58 >        multv3(r->pert, rcont.pert, ins->x.f.xfm);
59 >        d = 1./ins->x.f.sca;
60 >        for (i = 0; i < 3; i++) {
61 >                r->ron[i] *= d;
62 >                r->pert[i] *= d;
63 >        }
64          r->rod = rcont.rod;
65 +        r->uv[0] = rcont.uv[0];
66 +        r->uv[1] = rcont.uv[1];
67                                          /* return hit */
68          return(1);
69   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines