--- ray/src/gen/xform.c 1997/05/30 18:24:32 2.15 +++ ray/src/gen/xform.c 2004/07/02 16:45:32 2.37 @@ -1,9 +1,6 @@ -/* Copyright (c) 1996 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: xform.c,v 2.37 2004/07/02 16:45:32 greg Exp $"; #endif - /* * xform.c - program to transform object files. * Transformations must preserve aspect ratio. @@ -12,14 +9,14 @@ static char SCCSid[] = "$SunId$ LBL"; * 11/6/86 Finally added error checking! */ -#include "standard.h" - -#include "paths.h" - #include +#include "platform.h" +#include "paths.h" +#include "rtprocess.h" /* win_popen() */ +#include "rtio.h" +#include "rtmath.h" #include "object.h" - #include "otypes.h" int xac; /* global xform argument count */ @@ -29,57 +26,89 @@ int xfa; /* start of xf arguments */ XF tot; /* total transformation */ int reverse; /* boolean true if scene mirrored */ -int invert = 0; /* boolean true to invert surfaces */ +int invert; /* boolean true to invert surfaces */ -int expand = 1; /* boolean true to expand commands */ +int expand; /* boolean true to expand commands */ -char *newmod = NULL; /* new modifier for surfaces */ +char *newmod; /* new modifier for surfaces */ -char *idprefix = NULL; /* prefix for object identifiers */ +char *idprefix; /* prefix for object identifiers */ -#define ALIAS NUMOTYPE /* put alias at end of array */ +FUN ofun[NUMOTYPE] = INIT_OTYPE; /* default types and actions */ -#define NUMTYPES (NUMOTYPE+1) /* total number of object types */ - -FUN ofun[NUMTYPES] = INIT_OTYPE; /* default types and actions */ - short tinvers[NUMOTYPE]; /* inverse types for surfaces */ int nrept = 1; /* number of array repetitions */ -extern char *malloc(), *fgetword(); +int stdinused = 0; /* stdin has been used by -f option? */ -char mainfn[MAXPATH]; /* main file name */ +char mainfn[PATH_MAX]; /* main file name */ FILE *mainfp = NULL; /* main file pointer */ #define progname (xav[0]) +static int doargf(int ac, char **av, int fi); +static int doarray(int ac, char **av, int ai); +static void xform(char *name, FILE *fin); +static void xfcomm(char *fname, FILE *fin); +static void xfobject(char *fname, FILE *fin); +static int addxform(FILE *fin); +static int alias(FILE *fin); +void initotypes(void); /* XXX conflict with otypes.h */ +static void openmain(char *iname); -main(argc, argv) /* get transform options and transform file */ -int argc; -char *argv[]; + +int +main( /* get transform options and transform file */ + int argc, + char *argv[] +) { - char *fname; + int mal_prefix = 0; int a; - /* check for array */ + /* check for argument list file */ for (a = 1; a < argc; a++) + if (!strcmp(argv[a], "-f")) + return(doargf(argc, argv, a)); + /* check for regular array */ + for (a = 1; a < argc; a++) if (!strcmp(argv[a], "-a")) return(doarray(argc, argv, a)); - initotypes(); + initotypes(); /* initialize */ + invert = 0; + expand = 1; + newmod = NULL; + idprefix = NULL; for (a = 1; a < argc; a++) { if (argv[a][0] == '-') switch (argv[a][1]) { case 'm': - if (argv[a][2] || a+1 >= argc) + if (argv[a][2] | (a+1 >= argc)) break; - newmod = argv[++a]; + a++; + if (newmod == NULL) + newmod = argv[a]; continue; case 'n': - if (argv[a][2] || a+1 >= argc) + if (argv[a][2] | (a+1 >= argc)) break; - idprefix = argv[++a]; + a++; + if (idprefix == NULL) + idprefix = argv[a]; + else { + register char *newp; + newp = (char *)malloc(strlen(idprefix)+ + strlen(argv[a])+2); + if (newp == NULL) + exit(2); + sprintf(newp, "%s.%s", + idprefix, argv[a]); + if (mal_prefix++) + free((void *)idprefix); + idprefix = newp; + } continue; case 'c': if (argv[a][2]) @@ -94,7 +123,7 @@ char *argv[]; case 'I': if (argv[a][2]) break; - invert = 1; + invert = !invert; continue; } break; @@ -105,7 +134,7 @@ char *argv[]; a += xf(&tot, argc-a, argv+a); - if (reverse = tot.sca < 0.0) + if ( (reverse = tot.sca < 0.0) ) tot.sca = -tot.sca; if (invert) reverse = !reverse; @@ -124,6 +153,11 @@ char *argv[]; putchar('\n'); /* transform input */ if (xac == argc) { + if (stdinused) { + fprintf(stderr, "%s: cannot use stdin more than once\n", + argv[0]); + exit(1); + } openmain(NULL); xform(mainfn, mainfp); } else @@ -132,19 +166,141 @@ char *argv[]; xform(mainfn, mainfp); } + if (mal_prefix) + free((void *)idprefix); return(0); } -doarray(ac, av, ai) /* make array */ -char **av; -int ac, ai; +int +doargf( /* take argument list from file */ + int ac, + char **av, + int fi +) { + int inquote; char *newav[256], **avp; + char argbuf[2048]; + char newid[128]; + char *oldid; + register char *cp; + FILE *argfp; + int n, i, k, newac, err; + + if (fi >= ac-1 || (av[fi+1][0] == '-' && av[fi+1][1] != '\0')) { + fprintf(stderr, "%s: missing file for -f option\n", av[0]); + exit(1); + } + if (av[fi+1][0] == '-' && av[fi+1][1] == '\0') { + if (stdinused++) { + fprintf(stderr, + "%s: cannot use stdin more than once\n", + av[0]); + exit(1); + } + argfp = stdin; + n = 100; /* we just don't know! */ + } else { + if ((argfp = fopen(av[fi+1], "r")) == NULL) { + fprintf(stderr, + "%s: cannot open argument file \"%s\"\n", + av[0], av[fi+1]); + exit(1); + } + n = 0; /* count number of lines in file */ + while (fgetline(argbuf,sizeof(argbuf),argfp) != NULL) + n += argbuf[0] && argbuf[0] != '#'; + if (!n) { + fprintf(stderr, "%s: empty argument file \"%s\"\n", + av[0], av[fi+1]); + exit(1); + } + nrept *= n; + rewind(argfp); + } + err = 0; k = 0; /* read each arg list and call main */ + while (fgetline(argbuf,sizeof(argbuf),argfp) != NULL) { + if (!argbuf[0] || argbuf[0] == '#') + continue; + avp = newav+2; + avp[0] = av[0]; + for (i = 1; i < fi; i++) + avp[i] = av[i]; + newac = i; + cp = argbuf; /* parse new words */ + if (*cp == '!') cp++; + if (!strncmp(cp, "xform ", 6)) cp += 6; + inquote = 0; + for ( ; ; ) { + skipspaces: + while (isspace(*cp)) /* nullify spaces */ + *cp++ = '\0'; + if ((*cp == '"') | (*cp == '\'')) + inquote = *cp++; + if (!*cp) /* all done? */ + break; + if (cp[0] == '\\' && cp[1]) + if (*++cp == '\n') + goto skipspaces; + avp[newac++] = cp; /* add argument to list */ + if (inquote) { + while (*++cp) + if (*cp == inquote) { + *cp++ = '\0'; + break; + } + } else { + while (*++cp && !isspace(*cp)) + ; + } + } + for (i = fi+2; i < ac; i++) + avp[newac++] = av[i]; + avp[newac] = NULL; + oldid = NULL; + for (i = 2; i < newac; i++) + if (!strcmp(avp[i-1], "-n")) { + oldid = avp[i]; + avp[i] = newid; + break; + } + if (oldid == NULL) { + newav[0] = av[0]; + newav[1] = "-n"; + newav[2] = newid; + avp = newav; + newac += 2; + } + if (oldid == NULL) + sprintf(newid, "i%d", k); + else + sprintf(newid, "%s.%d", oldid, k); + err |= main(newac, avp); + k++; + } + fclose(argfp); + return(err); +} + + +int +doarray( /* make array */ + int ac, + char **av, + int ai +) +{ + char *newav[256], **avp; char newid[128], repts[32]; char *oldid = NULL; int n, i, err; + if (ai >= ac-1 || (n = atoi(av[ai+1])) <= 0) { + fprintf(stderr, "%s: missing count for -a option\n", av[0]); + exit(1); + } + nrept *= n; avp = newav+2; avp[0] = av[0]; for (i = 1; i < ac; i++) @@ -163,7 +319,6 @@ int ac, ai; avp = newav; ac += 2; } - nrept *= n = atoi(av[ai+1]); err = 0; for (i = 0; i < n; i++) { if (oldid == NULL) @@ -177,9 +332,11 @@ int ac, ai; } -xform(name, fin) /* transform stream by tot.xfm */ -char *name; -register FILE *fin; +void +xform( /* transform stream by tot.xfm */ + char *name, + register FILE *fin +) { int nobjs = 0; register int c; @@ -210,12 +367,12 @@ register FILE *fin; } -xfcomm(fname, fin) /* transform a command */ -char *fname; -FILE *fin; +void +xfcomm( /* transform a command */ + char *fname, + FILE *fin +) { - extern FILE *popen(); - extern char *fgetline(); FILE *pin; char buf[512]; int i; @@ -232,20 +389,22 @@ FILE *fin; } else { printf("\n%s", buf); if (xac > 1) { - printf(" | %s", xav[0]); + printf(" | %s -e", xav[0]); /* expand next time */ for (i = 1; i < xac; i++) - printf(" %s", xav[i]); + if (i >= xfa || strcmp(xav[i], "-c")) + printf(" %s", xav[i]); } putchar('\n'); } } -xfobject(fname, fin) /* transform an object */ -char *fname; -FILE *fin; +void +xfobject( /* transform an object */ + char *fname, + FILE *fin +) { - extern char *strcpy(); char typ[16], nam[MAXSTR]; int fn; /* modifier and type */ @@ -277,8 +436,10 @@ FILE *fin; } -o_default(fin) /* pass on arguments unchanged */ -FILE *fin; +int +o_default( /* pass on arguments unchanged */ + FILE *fin +) { register int i; FUNARGS fa; @@ -287,8 +448,10 @@ FILE *fin; return(-1); /* string arguments */ printf("%d", fa.nsargs); - for (i = 0; i < fa.nsargs; i++) - printf(" %s", fa.sarg[i]); + for (i = 0; i < fa.nsargs; i++) { + fputc(' ', stdout); + fputword(fa.sarg[i], stdout); + } printf("\n"); #ifdef IARGS /* integer arguments */ @@ -309,8 +472,10 @@ FILE *fin; } -addxform(fin) /* add xf arguments to strings */ -FILE *fin; +int +addxform( /* add xf arguments to strings */ + FILE *fin +) { register int i; int resetarr = 0; @@ -322,8 +487,10 @@ FILE *fin; if (xac > xfa && strcmp(xav[xfa], "-i")) resetarr = 2; printf("%d", fa.nsargs + resetarr + xac-xfa); - for (i = 0; i < fa.nsargs; i++) - printf(" %s", fa.sarg[i]); + for (i = 0; i < fa.nsargs; i++) { + fputc(' ', stdout); + fputword(fa.sarg[i], stdout); + } if (resetarr) printf(" -i 1"); for (i = xfa; i < xac; i++) /* add xf arguments */ @@ -349,22 +516,10 @@ FILE *fin; int -otype(ofname) /* get object function number from its name */ -register char *ofname; +alias( /* transfer alias */ + FILE *fin +) { - register int i; - - for (i = 0; i < NUMTYPES; i++) - if (!strcmp(ofun[i].funame, ofname)) - return(i); - - return(-1); /* not found */ -} - - -alias(fin) /* transfer alias */ -FILE *fin; -{ char aliasnm[MAXSTR]; if (fgetword(aliasnm, MAXSTR, fin) == NULL) @@ -374,8 +529,10 @@ FILE *fin; } -m_glow(fin) /* transform arguments for proximity light */ -FILE *fin; +int +m_glow( /* transform arguments for proximity light */ + FILE *fin +) { FUNARGS fa; @@ -392,8 +549,10 @@ FILE *fin; } -m_spot(fin) /* transform arguments for spotlight */ -FILE *fin; +int +m_spot( /* transform arguments for spotlight */ + FILE *fin +) { FVECT v; FUNARGS fa; @@ -412,8 +571,10 @@ FILE *fin; } -m_mist(fin) /* transform arguments for mist */ -FILE *fin; +int +m_mist( /* transform arguments for mist */ + FILE *fin +) { FUNARGS fa; int i; @@ -454,8 +615,10 @@ FILE *fin; } -m_dielectric(fin) /* transform arguments for dielectric */ -FILE *fin; +int +m_dielectric( /* transform arguments for dielectric */ + FILE *fin +) { FUNARGS fa; @@ -474,8 +637,10 @@ FILE *fin; } -m_interface(fin) /* transform arguments for interface */ -FILE *fin; +int +m_interface( /* transform arguments for interface */ + FILE *fin +) { FUNARGS fa; @@ -499,8 +664,10 @@ FILE *fin; } -text(fin) /* transform text arguments */ -FILE *fin; +int +text( /* transform text arguments */ + FILE *fin +) { int i; FVECT v; @@ -512,8 +679,10 @@ FILE *fin; return(-1); /* string arguments */ printf("%d", fa.nsargs); - for (i = 0; i < fa.nsargs; i++) - printf(" %s", fa.sarg[i]); + for (i = 0; i < fa.nsargs; i++) { + fputc(' ', stdout); + fputword(fa.sarg[i], stdout); + } printf("\n0\n%d\n", fa.nfargs); /* anchor point */ multp3(v, fa.farg, tot.xfm); @@ -536,8 +705,10 @@ FILE *fin; } -o_source(fin) /* transform source arguments */ -FILE *fin; +int +o_source( /* transform source arguments */ + FILE *fin +) { FVECT dv; FUNARGS fa; @@ -557,8 +728,10 @@ FILE *fin; } -o_sphere(fin) /* transform sphere arguments */ -FILE *fin; +int +o_sphere( /* transform sphere arguments */ + FILE *fin +) { FVECT cent; double rad; @@ -581,8 +754,10 @@ FILE *fin; } -o_face(fin) /* transform face arguments */ -FILE *fin; +int +o_face( /* transform face arguments */ + FILE *fin +) { FVECT p; register int i; @@ -607,8 +782,10 @@ FILE *fin; } -o_cone(fin) /* transform cone and cup arguments */ -FILE *fin; +int +o_cone( /* transform cone and cup arguments */ + FILE *fin +) { FVECT p0, p1; double r0, r1; @@ -634,8 +811,10 @@ FILE *fin; } -o_cylinder(fin) /* transform cylinder and tube arguments */ -FILE *fin; +int +o_cylinder( /* transform cylinder and tube arguments */ + FILE *fin +) { FVECT p0, p1; double rad; @@ -659,8 +838,10 @@ FILE *fin; } -o_ring(fin) /* transform ring arguments */ -FILE *fin; +int +o_ring( /* transform ring arguments */ + FILE *fin +) { FVECT p0, pd; double r0, r1; @@ -690,17 +871,15 @@ FILE *fin; } -initotypes() /* initialize ofun[] array */ +void +initotypes(void) /* initialize ofun[] array */ { register int i; if (ofun[OBJ_SOURCE].funp == o_source) return; /* done already */ - /* alias is additional */ - ofun[ALIAS].funame = ALIASID; - ofun[ALIAS].flags = 0; /* functions get new transform */ - for (i = 0; i < NUMTYPES; i++) + for (i = 0; i < NUMOTYPE; i++) if (hasfunc(i)) ofun[i].funp = addxform; /* special cases */ @@ -713,7 +892,8 @@ initotypes() /* initialize ofun[] array */ ofun[OBJ_CYLINDER].funp = ofun[OBJ_TUBE].funp = o_cylinder; ofun[OBJ_RING].funp = o_ring; - ofun[OBJ_INSTANCE].funp = addxform; + ofun[OBJ_INSTANCE].funp = + ofun[OBJ_MESH].funp = addxform; ofun[MAT_GLOW].funp = m_glow; ofun[MAT_SPOT].funp = m_spot; ofun[MAT_DIELECTRIC].funp = m_dielectric; @@ -722,7 +902,7 @@ initotypes() /* initialize ofun[] array */ ofun[PAT_CTEXT].funp = ofun[PAT_BTEXT].funp = ofun[MIX_TEXT].funp = text; - ofun[ALIAS].funp = alias; + ofun[MOD_ALIAS].funp = alias; /* surface inverses */ tinvers[OBJ_FACE] = OBJ_FACE; tinvers[OBJ_SOURCE] = OBJ_SOURCE; @@ -738,8 +918,10 @@ initotypes() /* initialize ofun[] array */ #ifdef OLDXFORM -openmain(fname) -char *fname; +void +openmain( + char *fname +) { if (fname == NULL) { strcpy(mainfn, "standard input"); @@ -761,17 +943,17 @@ char *fname; strcpy(mainfn, fname); } #else -openmain(fname) /* open fname for input, changing to its directory */ -char *fname; +void +openmain( /* open input, changing directory for file */ + char *iname +) { - extern FILE *tmpfile(); - extern char *getlibpath(), *getpath(); - static char origdir[MAXPATH]; - static char curfn[MAXPATH]; + static char origdir[PATH_MAX]; + static char curfn[PATH_MAX]; static int diffdir; register char *fpath; - if (fname == NULL) { /* standard input */ + if (iname == NULL) { /* standard input */ if (mainfp == NULL) { register int c; strcpy(mainfn, "standard input"); @@ -788,28 +970,28 @@ char *fname; } while ((c = getc(stdin)) != EOF) putc(c, mainfp); - fclose(stdin); } rewind(mainfp); /* rewind copy */ return; } if (mainfp == NULL) { /* first call, initialize */ - getwd(origdir); - } else if (!strcmp(fname, curfn)) { /* just need to rewind? */ + getcwd(origdir, sizeof(origdir)); + } else if (!strcmp(iname, curfn)) { /* just need to rewind? */ rewind(mainfp); return; } else { /* else close old stream */ fclose(mainfp); - if (diffdir) { + mainfp = NULL; + if (diffdir) { /* return to our directory */ chdir(origdir); diffdir = 0; } } - strcpy(curfn, fname); /* remember file name */ - /* get full path */ - if ((fpath = getpath(fname, getlibpath(), R_OK)) == NULL) { + strcpy(curfn, iname); /* remember input name */ + /* get full path for file */ + if ((fpath = getpath(iname, getrlibpath(), R_OK)) == NULL) { fprintf(stderr, "%s: cannot find file \"%s\"\n", - progname, fname); + progname, iname); exit(1); } if (fpath[0] == '.' && ISDIRSEP(fpath[1])) /* remove leading ./ */ @@ -837,11 +1019,11 @@ char *fname; diffdir++; } /* get final path component */ - for (fpath = fname+strlen(fname); - fpath > fname && !ISDIRSEP(fpath[-1]); fpath--) + for (fpath = iname+strlen(iname); + fpath > iname && !ISDIRSEP(fpath[-1]); fpath--) ; } - /* open the file */ + /* finally, open the file */ if ((mainfp = fopen(fpath, "r")) == NULL) { fprintf(stderr, "%s: cannot open file \"%s\"\n", progname, mainfn);