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

Comparing ray/src/rt/preload.c (file contents):
Revision 2.6 by greg, Sat Feb 22 02:07:29 2003 UTC vs.
Revision 2.11 by greg, Fri Feb 18 02:41:55 2011 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   *  External symbols declared in ray.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 "standard.h"
68 < #include "octree.h"
69 < #include "object.h"
12 > #include "ray.h"
13   #include "otypes.h"
14   #include "face.h"
15   #include "cone.h"
16   #include "instance.h"
17 < #include "color.h"
17 > #include "mesh.h"
18   #include "data.h"
19 + #include "func.h"
20 + #include "bsdf.h"
21  
22  
23   /* KEEP THIS ROUTINE CONSISTENT WITH THE DIFFERENT OBJECT FUNCTIONS! */
24  
25  
26 < int
27 < load_os(op)                     /* load associated data for object */
28 < register OBJREC *op;
26 > extern int
27 > load_os(                        /* load associated data for object */
28 >        register OBJREC *op
29 > )
30   {
31          DATARRAY  *dp;
32 +        SDData  *sd;
33  
34          switch (op->otype) {
35          case OBJ_FACE:          /* polygon */
# Line 98 | Line 45 | register OBJREC        *op;
45          case OBJ_INSTANCE:      /* octree instance */
46                  getinstance(op, IO_ALL);
47                  return(1);
48 +        case OBJ_MESH:          /* mesh instance */
49 +                getmeshinst(op, IO_ALL);
50 +                return(1);
51          case PAT_CPICT:         /* color picture */
52                  if (op->oargs.nsargs < 4)
53                          goto sargerr;
# Line 151 | Line 101 | register OBJREC        *op;
101          case MAT_BRTDF:         /* BRDTfunc material */
102                  getfunc(op, 9, 0x3f, 0);
103                  return(1);
104 +        case MAT_BSDF:          /* BSDF material */
105 +                if (op->oargs.nsargs < 6)
106 +                        goto sargerr;
107 +                getfunc(op, 5, 0x1d, 1);
108 +                loadBSDF(op->oargs.sarg[1]);
109 +                return(1);
110          case MAT_PDATA:         /* plastic BRDF data */
111          case MAT_MDATA:         /* metal BRDF data */
112          case MAT_TDATA:         /* trans BRDF data */
# Line 175 | Line 131 | register OBJREC        *op;
131          return(0);
132   sargerr:
133          objerror(op, USER, "too few string arguments");
134 +        return 0; /* pro forma return */
135   }
136  
137  
138 < void
139 < preload_objs()          /* preload object data structures */
138 > extern void
139 > preload_objs(void)              /* preload object data structures */
140   {
141          register OBJECT on;
142                                  /* note that nobjects may change during loop */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines