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.18 by greg, Thu May 11 20:17:33 1995 UTC vs.
Revision 1.19 by greg, Fri Oct 27 15:47:18 1995 UTC

# Line 733 | Line 733 | char   **av;
733          static char     *p4ent[5] = {mg_ename[MG_E_POINT],p4[0],p4[1],p4[2]};
734          static char     *n4ent[5] = {mg_ename[MG_E_NORMAL],n4[0],n4[1],n4[2]};
735          static char     *fent[6] = {mg_ename[MG_E_FACE],"_cv1","_cv2","_cv3","_cv4"};
736 +        char    *v1n;
737          register C_VERTEX       *cv1, *cv2;
738          register int    i, j;
739          FVECT   u, v, w;
# Line 748 | Line 749 | char   **av;
749          if ((cv1 = c_getvert(av[1])) == NULL ||
750                          (cv2 = c_getvert(av[3])) == NULL)
751                  return(MG_EUNDEF);
752 +        v1n = av[1];
753          if (!isflt(av[2]) || !isflt(av[4]))
754                  return(MG_ETYPE);
755          rad1 = atof(av[2]);
# Line 766 | Line 768 | char   **av;
768                  cv = cv1;
769                  cv1 = cv2;
770                  cv2 = cv;
771 +                v1n = av[3];
772                  d = rad1;
773                  rad1 = rad2;
774                  rad2 = d;
# Line 799 | Line 802 | char   **av;
802          if ((rv = mg_handle(MG_E_NORMAL, 4, n3ent)) != MG_OK)
803                  return(rv);
804          if (rad1 == 0.) {               /* triangles */
805 <                v1ent[3] = av[1];
805 >                v1ent[3] = v1n;
806                  if ((rv = mg_handle(MG_E_VERTEX, 4, v1ent)) != MG_OK)
807                          return(rv);
808                  for (j = 0; j < 3; j++)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines