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.16 by greg, Tue Apr 18 15:53:26 1995 UTC vs.
Revision 1.17 by greg, Tue May 9 14:38:22 1995 UTC

# Line 89 | Line 89 | mg_init()                      /* initialize alternate entity handlers */
89                  mg_ehand[MG_E_INCLUDE] = e_include;
90          if (mg_ehand[MG_E_SPH] == NULL) {
91                  mg_ehand[MG_E_SPH] = e_sph;
92 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
92 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
93          } else
94 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
94 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
95          if (mg_ehand[MG_E_CYL] == NULL) {
96                  mg_ehand[MG_E_CYL] = e_cyl;
97 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
97 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
98          } else
99 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
99 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
100          if (mg_ehand[MG_E_CONE] == NULL) {
101                  mg_ehand[MG_E_CONE] = e_cone;
102 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
102 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
103          } else
104 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
104 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
105          if (mg_ehand[MG_E_RING] == NULL) {
106                  mg_ehand[MG_E_RING] = e_ring;
107 <                ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
107 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
108          } else
109 <                uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
109 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
110          if (mg_ehand[MG_E_PRISM] == NULL) {
111                  mg_ehand[MG_E_PRISM] = e_prism;
112 <                ineed |= 1<<MG_E_POINT|1<<MG_E_VERTEX;
112 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX;
113          } else
114 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
114 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
115          if (mg_ehand[MG_E_TORUS] == NULL) {
116                  mg_ehand[MG_E_TORUS] = e_torus;
117 <                ineed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX;
117 >                ineed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX;
118          } else
119 <                uneed |= 1<<MG_E_POINT|1<<MG_E_NORMAL|1<<MG_E_VERTEX|1<<MG_E_XF;
119 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_NORMAL|1L<<MG_E_VERTEX|1L<<MG_E_XF;
120          if (mg_ehand[MG_E_COLOR] != NULL) {
121                  if (mg_ehand[MG_E_CMIX] == NULL) {
122                          mg_ehand[MG_E_CMIX] = e_cmix;
123 <                        ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
123 >                        ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
124                  }
125                  if (mg_ehand[MG_E_CSPEC] == NULL) {
126                          mg_ehand[MG_E_CSPEC] = e_cspec;
127 <                        ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
127 >                        ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
128                  }
129                  if (mg_ehand[MG_E_CCT] == NULL) {
130                          mg_ehand[MG_E_CCT] = e_cct;
131 <                        ineed |= 1<<MG_E_COLOR|1<<MG_E_CXY|1<<MG_E_CSPEC|1<<MG_E_CMIX|1<<MG_E_CCT;
131 >                        ineed |= 1L<<MG_E_COLOR|1L<<MG_E_CXY|1L<<MG_E_CSPEC|1L<<MG_E_CMIX|1L<<MG_E_CCT;
132                  }
133          }
134                                          /* check for consistency */
135          if (mg_ehand[MG_E_FACE] != NULL)
136 <                uneed |= 1<<MG_E_POINT|1<<MG_E_VERTEX|1<<MG_E_XF;
136 >                uneed |= 1L<<MG_E_POINT|1L<<MG_E_VERTEX|1L<<MG_E_XF;
137          if (mg_ehand[MG_E_CXY] != NULL || mg_ehand[MG_E_CSPEC] != NULL ||
138                          mg_ehand[MG_E_CMIX] != NULL)
139 <                uneed |= 1<<MG_E_COLOR;
139 >                uneed |= 1L<<MG_E_COLOR;
140          if (mg_ehand[MG_E_RD] != NULL || mg_ehand[MG_E_TD] != NULL ||
141                          mg_ehand[MG_E_IR] != NULL ||
142                          mg_ehand[MG_E_ED] != NULL ||
143                          mg_ehand[MG_E_RS] != NULL ||
144                          mg_ehand[MG_E_TS] != NULL ||
145                          mg_ehand[MG_E_SIDES] != NULL)
146 <                uneed |= 1<<MG_E_MATERIAL;
146 >                uneed |= 1L<<MG_E_MATERIAL;
147          for (i = 0; i < MG_NENTITIES; i++)
148 <                if (uneed & 1<<i && mg_ehand[i] == NULL) {
148 >                if (uneed & 1L<<i && mg_ehand[i] == NULL) {
149                          fprintf(stderr, "Missing support for \"%s\" entity\n",
150                                          mg_ename[i]);
151                          exit(1);
152                  }
153                                          /* add support as needed */
154 <        if (ineed & 1<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
154 >        if (ineed & 1L<<MG_E_VERTEX && mg_ehand[MG_E_VERTEX] != c_hvertex)
155                  e_supp[MG_E_VERTEX] = c_hvertex;
156 <        if (ineed & 1<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
156 >        if (ineed & 1L<<MG_E_POINT && mg_ehand[MG_E_POINT] != c_hvertex)
157                  e_supp[MG_E_POINT] = c_hvertex;
158 <        if (ineed & 1<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
158 >        if (ineed & 1L<<MG_E_NORMAL && mg_ehand[MG_E_NORMAL] != c_hvertex)
159                  e_supp[MG_E_NORMAL] = c_hvertex;
160 <        if (ineed & 1<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
160 >        if (ineed & 1L<<MG_E_COLOR && mg_ehand[MG_E_COLOR] != c_hcolor)
161                  e_supp[MG_E_COLOR] = c_hcolor;
162 <        if (ineed & 1<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
162 >        if (ineed & 1L<<MG_E_CXY && mg_ehand[MG_E_CXY] != c_hcolor)
163                  e_supp[MG_E_CXY] = c_hcolor;
164 <        if (ineed & 1<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
164 >        if (ineed & 1L<<MG_E_CSPEC && mg_ehand[MG_E_CSPEC] != c_hcolor)
165                  e_supp[MG_E_CSPEC] = c_hcolor;
166 <        if (ineed & 1<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
166 >        if (ineed & 1L<<MG_E_CMIX && mg_ehand[MG_E_CMIX] != c_hcolor)
167                  e_supp[MG_E_CMIX] = c_hcolor;
168 <        if (ineed & 1<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
168 >        if (ineed & 1L<<MG_E_CCT && mg_ehand[MG_E_CCT] != c_hcolor)
169                  e_supp[MG_E_CCT] = c_hcolor;
170                                          /* discard remaining entities */
171          for (i = 0; i < MG_NENTITIES; i++)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines