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.16 by greg, Sat Feb 22 02:07:23 2003 UTC vs.
Revision 2.19 by greg, Sat Aug 16 15:54:30 2003 UTC

# Line 8 | Line 8 | static const char      RCSid[] = "$Id$";
8   #include "standard.h"
9   #include <ctype.h>
10   #include <string.h>
11 + #include <stdio.h>
12 +
13 + #include "platform.h"
14   #include "object.h"
15   #include "color.h"
16   #include "lookup.h"
# Line 260 | Line 263 | char   *id;
263                  *cp2++ = 'O';
264          }
265          for (cp = id; cp < end; *cp2++ = *cp++) {
266 <                if (*cp < '!' | *cp > '~')      /* limit to visible chars */
266 >                if ((*cp < '!') | (*cp > '~'))  /* limit to visible chars */
267                          *cp = '?';
268                  diff += *cp != *cp2;
269          }
# Line 285 | Line 288 | init()                 /* initialize dispatch table and output */
288          add2dispatch("tube", o_cylinder);
289          add2dispatch("ring", o_ring);
290          add2dispatch("instance", o_instance);
291 +        add2dispatch("mesh", o_instance);
292          add2dispatch("plastic", o_plastic);
293          add2dispatch("plastic2", o_plastic);
294          add2dispatch("metal", o_metal);
# Line 425 | Line 429 | FUNARGS        *fa;
429          register char   *cp;
430          register int    i;
431  
432 <        if (fa->nfargs < 9 | fa->nfargs % 3)
432 >        if ((fa->nfargs < 9) | (fa->nfargs % 3))
433                  return(-1);
434          setmat(mod);
435          setobj(id);
# Line 530 | Line 534 | register FUNARGS       *fa;
534  
535  
536   int
537 < o_instance(mod, typ, id, fa)    /* convert an instance */
537 > o_instance(mod, typ, id, fa)    /* convert an instance (or mesh) */
538   char    *mod, *typ, *id;
539   FUNARGS *fa;
540   {

Diff Legend

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