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

Comparing ray/src/rt/ambio.c (file contents):
Revision 2.4 by greg, Sat Feb 22 02:07:28 2003 UTC vs.
Revision 2.13 by greg, Tue May 14 17:39:10 2019 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  Declarations of external symbols in ambient.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"
68
13   #include "ambient.h"
14  
15  
16 < #define  putvec(v,fp)   putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
16 > #define  badflt(x)      (((x) < -FHUGE) | ((x) > FHUGE))
17  
18 < #define  getvec(v,fp)   (v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
18 > #define  badvec(v)      (badflt((v)[0]) | badflt((v)[1]) | badflt((v)[2]))
19  
76 #define  badflt(x)      ((x) < -FHUGE || (x) > FHUGE)
20  
78 #define  badvec(v)      (badflt((v)[0]) || badflt((v)[1]) || badflt((v)[2]))
79
80
81
21   void
22   putambmagic(fp)                 /* write out ambient value magic number */
23   FILE  *fp;
24   {
25 <        putint((long)AMBMAGIC, 2, fp);
25 >        putint(AMBMAGIC, 2, fp);
26   }
27  
28  
# Line 91 | Line 30 | int
30   hasambmagic(fp)                 /* read in and check validity of magic # */
31   FILE  *fp;
32   {
33 <        register int  magic;
33 >        int  magic;
34  
35          magic = getint(2, fp);
36          if (feof(fp))
# Line 100 | Line 39 | FILE  *fp;
39   }
40  
41  
42 + #define  putpos(v,fp)   putflt((v)[0],fp);putflt((v)[1],fp);putflt((v)[2],fp)
43 +
44 + #define  getpos(v,fp)   (v)[0]=getflt(fp);(v)[1]=getflt(fp);(v)[2]=getflt(fp)
45 +
46 + #define  putv2(v2,fp)   putflt((v2)[0],fp);putflt((v2)[1],fp)
47 +
48 + #define  getv2(v2,fp)   (v2)[0]=getflt(fp);(v2)[1]=getflt(fp)
49 +
50   int
51 < writambval(av, fp)              /* write ambient value to stream */
52 < register AMBVAL  *av;
53 < FILE  *fp;
51 > writambval(                     /* write ambient value to stream */
52 >        AMBVAL  *av,
53 >        FILE  *fp
54 > )
55   {
56 <        COLR  col;
56 >        COLR  clr;
57  
58 <        putint((long)av->lvl, 1, fp);
58 >        putint(av->lvl, 1, fp);
59          putflt(av->weight, fp);
60 <        putvec(av->pos, fp);
61 <        putvec(av->dir, fp);
62 <        setcolr(col, colval(av->val,RED),
60 >        putpos(av->pos, fp);
61 >        putint(av->ndir, sizeof(av->ndir), fp);
62 >        putint(av->udir, sizeof(av->udir), fp);
63 >        setcolr(clr, colval(av->val,RED),
64                          colval(av->val,GRN), colval(av->val,BLU));
65 <        fwrite((char *)col, sizeof(col), 1, fp);
66 <        putflt(av->rad, fp);
67 <        putvec(av->gpos, fp);
68 <        putvec(av->gdir, fp);
65 >        putbinary((char *)clr, sizeof(clr), 1, fp);
66 >        putv2(av->rad, fp);
67 >        putv2(av->gpos, fp);
68 >        putv2(av->gdir, fp);
69 >        putint(av->corral, sizeof(av->corral), fp);
70          return(ferror(fp) ? -1 : 0);
71   }
72  
73  
74   int
75 < ambvalOK(av)                    /* check consistency of ambient value */
76 < register AMBVAL  *av;
75 > ambvalOK(                       /* check consistency of ambient value */
76 >        AMBVAL  *av
77 > )
78   {
79          double  d;
80  
81          if (badvec(av->pos)) return(0);
82 <        if (badvec(av->dir)) return(0);
83 <        d = DOT(av->dir,av->dir);
84 <        if (d < 0.9999 || d > 1.0001) return(0);
85 <        if (av->lvl < 0 || av->lvl > 100) return(0);
86 <        if (av->weight <= 0. || av->weight > 1.) return(0);
87 <        if (av->rad <= 0. || av->rad >= FHUGE) return(0);
88 <        if (colval(av->val,RED) < 0. ||
89 <                        colval(av->val,RED) > FHUGE ||
90 <                        colval(av->val,GRN) < 0. ||
91 <                        colval(av->val,GRN) > FHUGE ||
92 <                        colval(av->val,BLU) < 0. ||
93 <                        colval(av->val,BLU) > FHUGE) return(0);
143 <        if (badvec(av->gpos)) return(0);
144 <        if (badvec(av->gdir)) return(0);
82 >        if (!av->ndir | !av->udir) return(0);
83 >        if ((av->weight <= 0.) | (av->weight > 1.)) return(0);
84 >        if ((av->rad[0] <= 0.) | (av->rad[0] >= FHUGE)) return(0);
85 >        if ((av->rad[1] <= 0.) | (av->rad[1] >= FHUGE)) return(0);
86 >        if ((colval(av->val,RED) < 0.) |
87 >                        (colval(av->val,RED) >= FHUGE) |
88 >                        (colval(av->val,GRN) < 0.) |
89 >                        (colval(av->val,GRN) >= FHUGE) |
90 >                        (colval(av->val,BLU) < 0.) |
91 >                        (colval(av->val,BLU) >= FHUGE)) return(0);
92 >        if (badflt(av->gpos[0]) || badflt(av->gpos[1])) return(0);
93 >        if (badflt(av->gdir[0]) || badflt(av->gdir[1])) return(0);
94          return(1);
95   }
96  
97  
98   int
99 < readambval(av, fp)              /* read ambient value from stream */
100 < register AMBVAL  *av;
101 < FILE  *fp;
99 > readambval(                     /* read ambient value from stream */
100 >        AMBVAL  *av,
101 >        FILE  *fp
102 > )
103   {
104 <        COLR  col;
104 >        COLR  clr;
105  
106 <        av->lvl = getint(1, fp);
106 >        av->lvl = getint(1, fp) & 0xff;
107          if (feof(fp))
108                  return(0);
109          av->weight = getflt(fp);
110 <        getvec(av->pos, fp);
111 <        getvec(av->dir, fp);
112 <        if (fread((char *)col, sizeof(col), 1, fp) != 1)
110 >        getpos(av->pos, fp);
111 >        av->ndir = getint(sizeof(av->ndir), fp);
112 >        av->udir = getint(sizeof(av->udir), fp);
113 >        if (getbinary((char *)clr, sizeof(clr), 1, fp) != 1)
114                  return(0);
115 <        colr_color(av->val, col);
116 <        av->rad = getflt(fp);
117 <        getvec(av->gpos, fp);
118 <        getvec(av->gdir, fp);
115 >        colr_color(av->val, clr);
116 >        getv2(av->rad, fp);
117 >        getv2(av->gpos, fp);
118 >        getv2(av->gdir, fp);
119 >        av->corral = (uint32)getint(sizeof(av->corral), fp);
120          return(feof(fp) ? 0 : ambvalOK(av));
121   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines