--- ray/src/gen/genrev.c 1990/03/07 11:14:40 1.5 +++ ray/src/gen/genrev.c 1991/11/12 17:05:00 2.1 @@ -16,8 +16,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include -#define ZNAME "Z_" /* z function name */ -#define RNAME "R_" /* r function name */ +#define ZNAME "Z`SYS`" /* z function name */ +#define RNAME "R`SYS`" /* r function name */ #define PI 3.14159265358979323846 @@ -35,6 +35,7 @@ main(argc, argv) int argc; char *argv[]; { + extern long eclock; char stmp[256]; char *modname; int smooth = 0; @@ -43,17 +44,17 @@ char *argv[]; int i, nseg; int orient; - varset("PI", PI); - funset("hermite", 5, l_hermite); - funset("bezier", 5, l_bezier); - funset("bspline", 5, l_bspline); + varset("PI", ':', PI); + funset("hermite", 5, ':', l_hermite); + funset("bezier", 5, ':', l_bezier); + funset("bspline", 5, ':', l_bspline); if (argc < 6) goto userror; for (i = 6; i < argc; i++) if (!strcmp(argv[i], "-e")) - scompile(NULL, argv[++i]); + scompile(argv[++i], NULL, 0); else if (!strcmp(argv[i], "-f")) fcompile(argv[++i]); else if (!strcmp(argv[i], "-s")) @@ -62,15 +63,16 @@ char *argv[]; goto userror; sprintf(stmp, "%s(t)=%s;", ZNAME, argv[3]); - scompile(NULL, stmp); + scompile(stmp, NULL, 0); sprintf(stmp, "%s(t)=%s;", RNAME, argv[4]); - scompile(NULL, stmp); + scompile(stmp, NULL, 0); nseg = atoi(argv[5]); if (nseg <= 0) goto userror; modname = smooth ? "Phong" : argv[1]; printhead(argc, argv); + eclock = 0; lastnz = lastnr = 0.0; t = 0.0;