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

Comparing ray/src/cv/mgflib/parser.c (file contents):
Revision 1.12 by greg, Fri Jul 22 09:58:49 1994 UTC vs.
Revision 1.18 by greg, Thu May 11 20:17:33 1995 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1994 Regents of the University of California */
1 > /* Copyright (c) 1995 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 27 | Line 27 | char   mg_ename[MG_NENTITIES][MG_MAXELEN] = MG_NAMELIST;
27  
28   int     (*mg_ehand[MG_NENTITIES])();
29  
30 +                        /* Handler routine for unknown entities */
31 +
32 + int     (*mg_uhand)() = mg_defuhand;
33 +
34 + unsigned        mg_nunknown;    /* count of unknown entities */
35 +
36                          /* error messages */
37  
38   char    *mg_err[MG_NERRS] = MG_ERRLIST;
# Line 59 | Line 65 | static int     e_any_toss(),           /* discard unneeded entity *
65                  e_ies(),                /* IES luminaire file */
66                  e_include(),            /* include file */
67                  e_sph(),                /* sphere */
68 +                e_cct(),                /* color temperature */
69                  e_cmix(),               /* color mixtures */
70                  e_cspec(),              /* color spectra */
71                  e_cyl(),                /* cylinder */
# Line 88 | Line 95 | mg_init()                      /* initialize alternate entity handlers */
95                  mg_ehand[MG_E_INCLUDE] = e_include;
96          if (mg_ehand[MG_E_SPH] == NULL) {
97                  mg_ehand[MG_E_SPH] = e_sph;
98 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
98 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
99          } else
100 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
100 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
101          if (mg_ehand[MG_E_CYL] == NULL) {
102                  mg_ehand[MG_E_CYL] = e_cyl;
103 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
103 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
104          } else
105 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
105 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
106          if (mg_ehand[MG_E_CONE] == NULL) {
107                  mg_ehand[MG_E_CONE] = e_cone;
108 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
108 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
109          } else
110 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
110 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
111          if (mg_ehand[MG_E_RING] == NULL) {
112                  mg_ehand[MG_E_RING] = e_ring;
113 <                ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
113 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
114          } else
115 <                uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
115 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
116          if (mg_ehand[MG_E_PRISM] == NULL) {
117                  mg_ehand[MG_E_PRISM] = e_prism;
118 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
118 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
119          } else
120 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
120 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
121          if (mg_ehand[MG_E_TORUS] == NULL) {
122                  mg_ehand[MG_E_TORUS] = e_torus;
123 <                ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
123 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
124          } else
125 <                uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
125 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
126          if (mg_ehand[MG_E_COLOR] != NULL) {
127                  if (mg_ehand[MG_E_CMIX] == NULL) {
128                          mg_ehand[MG_E_CMIX] = e_cmix;
129 <                        ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX;
129 >                        ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
130                  }
131                  if (mg_ehand[MG_E_CSPEC] == NULL) {
132                          mg_ehand[MG_E_CSPEC] = e_cspec;
133 <                        ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX;
133 >                        ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
134                  }
135 +                if (mg_ehand[MG_E_CCT] == NULL) {
136 +                        mg_ehand[MG_E_CCT] = e_cct;
137 +                        ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
138 +                }
139          }
140                                          /* check for consistency */
141          if (mg_ehand[MG_E_FACE] != NULL)
142 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
142 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
143          if (mg_ehand[MG_E_CXY] != NULL || mg_ehand[MG_E_CSPEC] != NULL ||
144                          mg_ehand[MG_E_CMIX] != NULL)
145 <                uneed |= 1<<MG_E_COLOR;
145 >                uneed |= 1L<<MG_E_COLOR;
146          if (mg_ehand[MG_E_RD] != NULL || mg_ehand[MG_E_TD] != NULL ||
147 +                        mg_ehand[MG_E_IR] != NULL ||
148                          mg_ehand[MG_E_ED] != NULL ||
149                          mg_ehand[MG_E_RS] != NULL ||
150                          mg_ehand[MG_E_TS] != NULL ||
151                          mg_ehand[MG_E_SIDES] != NULL)
152 <                uneed |= 1<<MG_E_MATERIAL;
152 >                uneed |= 1L<<MG_E_MATERIAL;
153          for (i = 0; i < MG_NENTITIES; i++)
154 <                if (uneed & 1<<i && mg_ehand[i] == NULL) {
154 >                if (uneed & 1L<<i && mg_ehand[i] == NULL) {
155                          fprintf(stderr, "Missing support for \"%s\" entity\n",
156                                          mg_ename[i]);
157                          exit(1);
158                  }
159                                          /* add support as needed */
160 <        if (ineed & 1<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
160 >        if (ineed & 1L<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
161                  e_supp[MG_E_VERTEX] = c_hvertex;
162 <        if (ineed & 1<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
162 >        if (ineed & 1L<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
163                  e_supp[MG_E_POINT] = c_hvertex;
164 <        if (ineed & 1<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
164 >        if (ineed & 1L<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
165                  e_supp[MG_E_NORMAL] = c_hvertex;
166 <        if (ineed & 1<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
166 >        if (ineed & 1L<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
167                  e_supp[MG_E_COLOR] = c_hcolor;
168 <        if (ineed & 1<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
168 >        if (ineed & 1L<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
169                  e_supp[MG_E_CXY] = c_hcolor;
170 <        if (ineed & 1<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
170 >        if (ineed & 1L<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
171                  e_supp[MG_E_CSPEC] = c_hcolor;
172 <        if (ineed & 1<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
172 >        if (ineed & 1L<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
173                  e_supp[MG_E_CMIX] = c_hcolor;
174 +        if (ineed & 1L<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
175 +                e_supp[MG_E_CCT] = c_hcolor;
176                                          /* discard remaining entities */
177          for (i = 0; i < MG_NENTITIES; i++)
178                  if (mg_ehand[i] == NULL)
# Line 166 | Line 180 | mg_init()                      /* initialize alternate entity handlers */
180   }
181  
182  
169 –
183   int
184   mg_entity(name)                 /* get entity number from its name */
185   char    *name;
# Line 196 | Line 209 | char   **av;
209   {
210          int     rv;
211  
212 <        if (en < 0 && (en = mg_entity(av[0])) < 0)
212 >        if (en < 0 && (en = mg_entity(av[0])) < 0) {    /* unknown entity */
213 >                if (mg_uhand != NULL)
214 >                        return((*mg_uhand)(ac, av));
215                  return(MG_EUNK);
216 <        if (e_supp[en] != NULL) {
216 >        }
217 >        if (e_supp[en] != NULL) {                       /* support handler */
218                  if ((rv = (*e_supp[en])(ac, av)) != MG_OK)
219                          return(rv);
220          }
221 <        return((*mg_ehand[en])(ac, av));
221 >        return((*mg_ehand[en])(ac, av));                /* assigned handler */
222   }
223  
224  
# Line 212 | Line 228 | register MG_FCTXT      *ctx;
228   char    *fn;
229   {
230          static int      nfids;
215 –        int     olen;
231          register char   *cp;
232  
233          ctx->fid = ++nfids;
# Line 225 | Line 240 | char   *fn;
240                  return(MG_OK);
241          }
242                                          /* get name relative to this context */
243 <        if (mg_file != NULL &&
229 <                        (cp = strrchr(mg_file->fname, '/')) != NULL)
230 <                olen = cp - mg_file->fname + 1;
231 <        else
232 <                olen = 0;
233 <        if (olen)
243 >        if (mg_file != NULL && (cp = strrchr(mg_file->fname, '/')) != NULL) {
244                  strcpy(ctx->fname, mg_file->fname);
245 <        strcpy(ctx->fname+olen, fn);
245 >                strcpy(ctx->fname+(cp-mg_file->fname+1), fn);
246 >        } else
247 >                strcpy(ctx->fname, fn);
248          ctx->fp = fopen(ctx->fname, "r");
249          if (ctx->fp == NULL)
250                  return(MG_ENOFILE);
# Line 354 | Line 366 | char   *fn;
366   }
367  
368  
369 + int
370 + mg_defuhand(ac, av)             /* default handler for unknown entities */
371 + int     ac;
372 + char    **av;
373 + {
374 +        if (mg_nunknown++ == 0)         /* report first incident */
375 +                fprintf(stderr, "%s: %d: %s: %s\n", mg_file->fname,
376 +                                mg_file->lineno, mg_err[MG_EUNK], av[0]);
377 +        return(MG_OK);
378 + }
379 +
380 +
381   void
382   mg_clear()                      /* clear parser history */
383   {
# Line 383 | Line 407 | char   **av;
407   {
408          char    *xfarg[MG_MAXARGC];
409          MG_FCTXT        ictx;
410 +        XF_SPEC *xf_orig = xf_context;
411          int     rv;
412  
413          if (ac < 2)
# Line 399 | Line 424 | char   **av;
424                  if ((rv = mg_handle(MG_E_XF, ac-1, xfarg)) != MG_OK)
425                          return(rv);
426          }
427 <        while (!feof(mg_file->fp)) {
427 >        do {
428                  while (mg_read())
429                          if ((rv = mg_parse()) != MG_OK) {
430                                  fprintf(stderr, "%s: %d: %s:\n%s", ictx.fname,
# Line 411 | Line 436 | char   **av;
436                  if (ac > 2)
437                          if ((rv = mg_handle(MG_E_XF, 1, xfarg)) != MG_OK)
438                                  return(rv);
439 <        }
439 >        } while (xf_context != xf_orig);
440          mg_close();
441          return(MG_OK);
442   }
# Line 968 | Line 993 | char   **av;
993  
994  
995   static int
996 < e_cspec(ac, av)                 /* handle spectral color */
972 < int     ac;
973 < char    **av;
996 > put_cxy()                       /* put out current xy chromaticities */
997   {
998          static char     xbuf[24], ybuf[24];
999          static char     *ccom[4] = {mg_ename[MG_E_CXY], xbuf, ybuf};
1000          int     rv;
1001  
1002 +        sprintf(xbuf, "%.4f", c_ccolor->cx);
1003 +        sprintf(ybuf, "%.4f", c_ccolor->cy);
1004 +        if ((rv = mg_handle(MG_E_CXY, 3, ccom)) != MG_OK)
1005 +                return(rv);
1006 +        return(MG_OK);
1007 + }
1008 +
1009 +
1010 + static int
1011 + put_cspec()                     /* put out current color spectrum */
1012 + {
1013 +        char    wl[2][6], vbuf[C_CNSS][24];
1014 +        char    *newav[C_CNSS+4];
1015 +        double  sf;
1016 +        register int    i;
1017 +
1018 +        if (mg_ehand[MG_E_CSPEC] != c_hcolor) {
1019 +                sprintf(wl[0], "%d", C_CMINWL);
1020 +                sprintf(wl[1], "%d", C_CMAXWL);
1021 +                newav[0] = mg_ename[MG_E_CSPEC];
1022 +                newav[1] = wl[0];
1023 +                newav[2] = wl[1];
1024 +                sf = (double)C_CNSS / c_ccolor->ssum;
1025 +                for (i = 0; i < C_CNSS; i++) {
1026 +                        sprintf(vbuf[i], "%.4f", sf*c_ccolor->ssamp[i]);
1027 +                        newav[i+3] = vbuf[i];
1028 +                }
1029 +                newav[C_CNSS+3] = NULL;
1030 +                if ((i = mg_handle(MG_E_CSPEC, C_CNSS+3, newav)) != MG_OK)
1031 +                        return(i);
1032 +        }
1033 +        return(MG_OK);
1034 + }
1035 +
1036 +
1037 + static int
1038 + e_cspec(ac, av)                 /* handle spectral color */
1039 + int     ac;
1040 + char    **av;
1041 + {
1042 +                                /* convert to xy chromaticity */
1043          c_ccvt(c_ccolor, C_CSXY);
1044                                  /* if it's really their handler, use it */
1045 <        if (mg_ehand[MG_E_CXY] != c_hcolor) {
1046 <                sprintf(xbuf, "%.4f", c_ccolor->cx);
983 <                sprintf(ybuf, "%.4f", c_ccolor->cy);
984 <                if ((rv = mg_handle(MG_E_CXY, 3, ccom)) != MG_OK)
985 <                        return(rv);
986 <        }
1045 >        if (mg_ehand[MG_E_CXY] != c_hcolor)
1046 >                return(put_cxy());
1047          return(MG_OK);
1048   }
1049  
# Line 993 | Line 1053 | e_cmix(ac, av)                 /* handle mixing of colors */
1053   int     ac;
1054   char    **av;
1055   {
996 –        char    wl[2][6], vbuf[C_CNSS][24];
997 –        char    *newav[C_CNSS+4];
998 –        int     rv;
999 –        register int    i;
1056          /*
1057           * Contorted logic works as follows:
1058           *      1. the colors are already mixed in c_hcolor() support function
# Line 1007 | Line 1063 | char   **av;
1063           */
1064          if (mg_ehand[MG_E_CSPEC] == e_cspec)
1065                  c_ccvt(c_ccolor, C_CSXY);
1066 <        else if (c_ccolor->flags & C_CDSPEC) {
1067 <                if (mg_ehand[MG_E_CSPEC] != c_hcolor) {
1068 <                        sprintf(wl[0], "%d", C_CMINWL);
1069 <                        sprintf(wl[1], "%d", C_CMAXWL);
1070 <                        newav[0] = mg_ename[MG_E_CSPEC];
1071 <                        newav[1] = wl[0];
1072 <                        newav[2] = wl[1];
1073 <                        for (i = 0; i < C_CNSS; i++) {
1074 <                                sprintf(vbuf[i], "%.6f",
1075 <                                                (double)c_ccolor->ssamp[i] /
1076 <                                                c_ccolor->ssum);
1077 <                                newav[i+3] = vbuf[i];
1078 <                        }
1079 <                        newav[C_CNSS+3] = NULL;
1080 <                        if ((rv = mg_handle(MG_E_CSPEC, C_CNSS+3, newav)) != MG_OK)
1081 <                                return(rv);
1082 <                }
1083 <                return(MG_OK);
1084 <        }
1085 <        if (mg_ehand[MG_E_CXY] != c_hcolor) {
1086 <                sprintf(vbuf[0], "%.4f", c_ccolor->cx);
1087 <                sprintf(vbuf[1], "%.4f", c_ccolor->cy);
1088 <                newav[0] = mg_ename[MG_E_CXY];
1089 <                newav[1] = vbuf[0];
1034 <                newav[2] = vbuf[1];
1035 <                newav[3] = NULL;
1036 <                if ((rv = mg_handle(MG_E_CXY, 3, newav)) != MG_OK)
1037 <                        return(rv);
1038 <        }
1066 >        else if (c_ccolor->flags & C_CDSPEC)
1067 >                return(put_cspec());
1068 >        if (mg_ehand[MG_E_CXY] != c_hcolor)
1069 >                return(put_cxy());
1070 >        return(MG_OK);
1071 > }
1072 >
1073 >
1074 > static int
1075 > e_cct(ac, av)                   /* handle color temperature */
1076 > int     ac;
1077 > char    **av;
1078 > {
1079 >        /*
1080 >         * Logic is similar to e_cmix here.  Support handler has already
1081 >         * converted temperature to spectral color.  Put it out as such
1082 >         * if they support it, otherwise convert to xy chromaticity and
1083 >         * put it out if they handle it.
1084 >         */
1085 >        if (mg_ehand[MG_E_CSPEC] != e_cspec)
1086 >                return(put_cspec());
1087 >        c_ccvt(c_ccolor, C_CSXY);
1088 >        if (mg_ehand[MG_E_CXY] != c_hcolor)
1089 >                return(put_cxy());
1090          return(MG_OK);
1091   }

Diff Legend

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