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.17 by schorsch, Sun Jun 8 12:03:09 2003 UTC vs.
Revision 2.21 by schorsch, Mon Oct 27 10:26:45 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
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 "platform.h"
14 > #include "rtprocess.h"
15   #include "object.h"
16   #include "color.h"
17   #include "lookup.h"
# Line 263 | 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 288 | 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 428 | 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 533 | 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