ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/common/mgf_parser.c

Comparing ray/src/common/mgf_parser.c (file contents):
Revision 3.1 by greg, Fri Feb 18 00:40:25 2011 UTC vs.
Revision 3.2 by greg, Thu Mar 12 17:22:33 2020 UTC

#	Line 858 | Line 858 | e_cone(                        /* turn a cone into polygons */
858		make_axes(u, v, w);
859		for (j = 0; j < 3; j++) {
860		sprintf(p3[j], FLTFMT, cv2->p[j] + rad2*u[j]);
861	<	if (n2off <= -FHUGE)
861	>	if (n2off <= -FHUGE*.99)
862		sprintf(n3[j], FLTFMT, -w[j]);
863		else
864		sprintf(n3[j], FLTFMT, u[j] + w[j]*n2off);
#	Line 884 | Line 884 | e_cone(                        /* turn a cone into polygons */
884		for (j = 0; j < 3; j++) {
885		d = u[j]*cos(theta) + v[j]*sin(theta);
886		sprintf(p3[j], FLTFMT, cv2->p[j] + rad2*d);
887	<	if (n2off > -FHUGE)
887	>	if (n2off > -FHUGE*.99)
888		sprintf(n3[j], FLTFMT, d + w[j]*n2off);
889		}
890		if ((rv = mg_handle(MG_E_VERTEX, 2, v3ent)) != MG_OK)
891		return(rv);
892		if ((rv = mg_handle(MG_E_POINT, 4, p3ent)) != MG_OK)
893		return(rv);
894	<	if (n2off > -FHUGE &&
894	>	if (n2off > -FHUGE*.99 &&
895		(rv = mg_handle(MG_E_NORMAL, 4, n3ent)) != MG_OK)
896		return(rv);
897		if ((rv = mg_handle(MG_E_FACE, 4, fent)) != MG_OK)
#	Line 908 | Line 908 | e_cone(                        /* turn a cone into polygons */
908		}
909		for (j = 0; j < 3; j++) {
910		sprintf(p4[j], FLTFMT, cv1->p[j] + rad1*u[j]);
911	<	if (n1off >= FHUGE)
911	>	if (n1off >= FHUGE*.99)
912		sprintf(n4[j], FLTFMT, w[j]);
913		else
914		sprintf(n4[j], FLTFMT, u[j] + w[j]*n1off);
#	Line 928 | Line 928 | e_cone(                        /* turn a cone into polygons */
928		for (j = 0; j < 3; j++) {
929		d = u[j]*cos(theta) + v[j]*sin(theta);
930		sprintf(p3[j], FLTFMT, cv2->p[j] + rad2*d);
931	<	if (n2off > -FHUGE)
931	>	if (n2off > -FHUGE*.99)
932		sprintf(n3[j], FLTFMT, d + w[j]*n2off);
933		sprintf(p4[j], FLTFMT, cv1->p[j] + rad1*d);
934	<	if (n1off < FHUGE)
934	>	if (n1off < FHUGE*.99)
935		sprintf(n4[j], FLTFMT, d + w[j]*n1off);
936		}
937		if ((rv = mg_handle(MG_E_VERTEX, 2, v3ent)) != MG_OK)
938		return(rv);
939		if ((rv = mg_handle(MG_E_POINT, 4, p3ent)) != MG_OK)
940		return(rv);
941	<	if (n2off > -FHUGE &&
941	>	if (n2off > -FHUGE*.99 &&
942		(rv = mg_handle(MG_E_NORMAL, 4, n3ent)) != MG_OK)
943		return(rv);
944		if ((rv = mg_handle(MG_E_VERTEX, 2, v4ent)) != MG_OK)
945		return(rv);
946		if ((rv = mg_handle(MG_E_POINT, 4, p4ent)) != MG_OK)
947		return(rv);
948	<	if (n1off < FHUGE &&
948	>	if (n1off < FHUGE*.99 &&
949		(rv = mg_handle(MG_E_NORMAL, 4, n4ent)) != MG_OK)
950		return(rv);
951		if ((rv = mg_handle(MG_E_FACE, 5, fent)) != MG_OK)

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)