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

Comparing ray/src/cv/rad2mgf.c (file contents):
Revision 2.15 by gwlarson, Wed Oct 14 14:48:04 1998 UTC vs.
Revision 2.21 by schorsch, Mon Oct 27 10:26:45 2003 UTC

# Line 1 | Line 1
1 – /* Copyright (c) 1995 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   * Convert Radiance scene description to MGF
6   */
7  
8 + #include "platform.h"
9   #include "standard.h"
10   #include <ctype.h>
11   #include <string.h>
12 + #include <stdio.h>
13 +
14 + #include "rtprocess.h"
15   #include "object.h"
16   #include "color.h"
17   #include "lookup.h"
# Line 22 | Line 23 | int    o_instance(), o_illum();
23   int     o_plastic(), o_metal(), o_glass(), o_dielectric(),
24          o_mirror(), o_trans(), o_light();
25  
25 – extern int      free();
26 –
26   LUTAB   rmats = LU_SINIT(free,NULL);            /* defined material table */
27  
28   LUTAB   rdispatch = LU_SINIT(NULL,NULL);        /* function dispatch table */
# Line 265 | Line 264 | char   *id;
264                  *cp2++ = 'O';
265          }
266          for (cp = id; cp < end; *cp2++ = *cp++) {
267 <                if (*cp < '!' | *cp > '~')      /* limit to visible chars */
267 >                if ((*cp < '!') | (*cp > '~'))  /* limit to visible chars */
268                          *cp = '?';
269                  diff += *cp != *cp2;
270          }
# Line 290 | Line 289 | init()                 /* initialize dispatch table and output */
289          add2dispatch("tube", o_cylinder);
290          add2dispatch("ring", o_ring);
291          add2dispatch("instance", o_instance);
292 +        add2dispatch("mesh", o_instance);
293          add2dispatch("plastic", o_plastic);
294          add2dispatch("plastic2", o_plastic);
295          add2dispatch("metal", o_metal);
# Line 430 | Line 430 | FUNARGS        *fa;
430          register char   *cp;
431          register int    i;
432  
433 <        if (fa->nfargs < 9 | fa->nfargs % 3)
433 >        if ((fa->nfargs < 9) | (fa->nfargs % 3))
434                  return(-1);
435          setmat(mod);
436          setobj(id);
# Line 535 | Line 535 | register FUNARGS       *fa;
535  
536  
537   int
538 < o_instance(mod, typ, id, fa)    /* convert an instance */
538 > o_instance(mod, typ, id, fa)    /* convert an instance (or mesh) */
539   char    *mod, *typ, *id;
540   FUNARGS *fa;
541   {

Diff Legend

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