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

Comparing ray/src/rt/t_func.c (file contents):
Revision 2.4 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.8 by greg, Mon Oct 25 22:57:45 2010 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  t_func.c - routine for procedural textures.
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"
66 –
11   #include  "func.h"
12 + #include  "rtotypes.h"
13  
14   /*
15   *      A procedural texture perturbs the surface normal
# Line 83 | Line 28 | static const char      RCSid[] = "$Id$";
28   */
29  
30  
31 < t_func(m, r)                    /* compute texture for ray */
32 < register OBJREC  *m;
33 < register RAY  *r;
31 > extern int
32 > t_func(                 /* compute texture for ray */
33 >        register OBJREC  *m,
34 >        register RAY  *r
35 > )
36   {
37          FVECT  disp;
38          double  d;
# Line 99 | Line 46 | register RAY  *r;
46          errno = 0;
47          for (i = 0; i < 3; i++) {
48                  disp[i] = evalue(mf->ep[i]);
49 <                if (errno) {
49 >                if (errno == EDOM || errno == ERANGE) {
50                          objerror(m, WARNING, "compute error");
51                          return(0);
52                  }
# Line 111 | Line 58 | register RAY  *r;
58                  d = 1.0 / (mf->f->sca * r->rox->f.sca);
59          } else
60                  d = 1.0 / mf->f->sca;
61 <        for (i = 0; i < 3; i++)
115 <                r->pert[i] += disp[i] * d;
61 >        VSUM(r->pert, r->pert, disp, d);
62          return(0);
63   }

Diff Legend

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