--- ray/src/gen/xform.c 1995/12/08 18:29:06 2.10 +++ ray/src/gen/xform.c 2003/10/27 10:27:25 2.34 @@ -1,9 +1,6 @@ -/* Copyright (c) 1995 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: xform.c,v 2.34 2003/10/27 10:27:25 schorsch Exp $"; #endif - /* * xform.c - program to transform object files. * Transformations must preserve aspect ratio. @@ -12,12 +9,13 @@ static char SCCSid[] = "$SunId$ LBL"; * 11/6/86 Finally added error checking! */ -#include "standard.h" - #include +#include "platform.h" +#include "rtmath.h" +#include "rtprocess.h" /* win_popen() */ +#include "paths.h" #include "object.h" - #include "otypes.h" int xac; /* global xform argument count */ @@ -27,23 +25,24 @@ 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 = 0; /* 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 */ +short tinvers[NUMOTYPE]; /* inverse types for surfaces */ -FUN ofun[NUMTYPES] = INIT_OTYPE; /* default types and actions */ +int nrept = 1; /* number of array repetitions */ -short tinvers[NUMOTYPE]; /* inverse types for surfaces */ +int stdinused = 0; /* stdin has been used by -f option? */ -extern char *malloc(), *fgetword(); +char mainfn[PATH_MAX]; /* main file name */ +FILE *mainfp = NULL; /* main file pointer */ #define progname (xav[0]) @@ -52,29 +51,58 @@ main(argc, argv) /* get transform options and transfo int argc; char *argv[]; { - FILE *fopen(); - FILE *fp; + int mal_prefix = 0; + char *fname; 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]) + break; + expand = 0; + continue; case 'e': if (argv[a][2]) break; @@ -83,7 +111,7 @@ char *argv[]; case 'I': if (argv[a][2]) break; - invert = 1; + invert = !invert; continue; } break; @@ -94,7 +122,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; @@ -112,23 +140,135 @@ char *argv[]; printf(" %s", xav[a]); putchar('\n'); /* transform input */ - if (xac == argc) - xform("standard input", stdin); - else + 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 for (a = xac; a < argc; a++) { - if ((fp = fopen(argv[a], "r")) == NULL) { - fprintf(stderr, "%s: cannot open \"%s\"\n", - progname, argv[a]); - exit(1); - } - xform(argv[a], fp); - fclose(fp); + openmain(argv[a]); + xform(mainfn, mainfp); } + if (mal_prefix) + free((void *)idprefix); return(0); } +doargf(ac, av, fi) /* take argument list from file */ +char **av; +int ac, fi; +{ + int inquote; + char *newav[256], **avp; + char argbuf[1024]; + 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); +} + + doarray(ac, av, ai) /* make array */ char **av; int ac, ai; @@ -136,8 +276,13 @@ int ac, ai; char *newav[256], **avp; char newid[128], repts[32]; char *oldid = NULL; - int i, err; + 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++) @@ -157,7 +302,7 @@ int ac, ai; ac += 2; } err = 0; - for (i = 0; i < atoi(av[ai+1]); i++) { + for (i = 0; i < n; i++) { if (oldid == NULL) sprintf(newid, "a%d", i); else @@ -206,8 +351,6 @@ xfcomm(fname, fin) /* transform a command */ char *fname; FILE *fin; { - FILE *popen(); - char *fgetline(); FILE *pin; char buf[512]; int i; @@ -224,9 +367,10 @@ FILE *fin; } else { printf("\n%s", buf); if (xac > 1) { - printf(" | %s -e", 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'); } @@ -237,7 +381,6 @@ xfobject(fname, fin) /* transform an object */ char *fname; FILE *fin; { - extern char *strcpy(); char typ[16], nam[MAXSTR]; int fn; /* modifier and type */ @@ -279,8 +422,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 */ @@ -314,8 +459,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 */ @@ -340,20 +487,6 @@ FILE *fin; } -int -otype(ofname) /* get object function number from its name */ -register char *ofname; -{ - 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; { @@ -408,15 +541,39 @@ m_mist(fin) /* transform arguments for mist */ FILE *fin; { FUNARGS fa; + int i; if (readfargs(&fa, fin) != 1) return(-1); - if (fa.nsargs != 0 || fa.nfargs != 4) + if (fa.nfargs > 7) return(-1); - printf("0\n0\n4"); - printf(" %18.12g %18.12g %18.12g", fa.farg[0]/tot.sca, - fa.farg[1]/tot.sca, fa.farg[2]/tot.sca); - printf(" %18.12g\n", fa.farg[3]); + printf("%d", fa.nsargs); + if (idprefix == NULL) + for (i = 0; i < fa.nsargs; i++) + printf(" %s", fa.sarg[i]); + else + for (i = 0; i < fa.nsargs; i++) { + char sname[256], *sp; + register char *cp1, *cp2 = sname; + /* add idprefix */ + for (sp = fa.sarg[i]; *sp; sp = cp1) { + for (cp1 = idprefix; *cp1; ) + *cp2++ = *cp1++; + *cp2++ = '.'; + for (cp1 = sp; *cp1 && + (*cp2++ = *cp1++) != '>'; ) + ; + } + *cp2 = '\0'; + printf(" %s", sname); + } + printf("\n0\n%d", fa.nfargs); + if (fa.nfargs > 2) + printf(" %12.6g %12.6g %12.6g", fa.farg[0]/tot.sca, + fa.farg[1]/tot.sca, fa.farg[2]/tot.sca); + for (i = 3; i < fa.nfargs; i++) + printf(" %12.6g", fa.farg[i]); + printf("\n"); freefargs(&fa); return(0); } @@ -432,11 +589,11 @@ FILE *fin; if (fa.nsargs != 0 || fa.nfargs != 5) return(-1); printf("0\n0\n5"); - printf(" %18.12g %18.12g %18.12g", + printf(" %12.6g %12.6g %12.6g", pow(fa.farg[0], 1.0/tot.sca), pow(fa.farg[1], 1.0/tot.sca), pow(fa.farg[2], 1.0/tot.sca)); - printf(" %18.12g %18.12g\n", fa.farg[3], fa.farg[4]); + printf(" %12.6g %12.6g\n", fa.farg[3], fa.farg[4]); freefargs(&fa); return(0); } @@ -452,16 +609,16 @@ FILE *fin; if (fa.nsargs != 0 || fa.nfargs != 8) return(-1); printf("0\n0\n8\n"); - printf("%18.12g %18.12g %18.12g", + printf("%12.6g %12.6g %12.6g", pow(fa.farg[0], 1.0/tot.sca), pow(fa.farg[1], 1.0/tot.sca), pow(fa.farg[2], 1.0/tot.sca)); - printf(" %18.12g\n", fa.farg[3]); - printf("%18.12g %18.12g %18.12g", + printf(" %12.6g\n", fa.farg[3]); + printf("%12.6g %12.6g %12.6g", pow(fa.farg[4], 1.0/tot.sca), pow(fa.farg[5], 1.0/tot.sca), pow(fa.farg[6], 1.0/tot.sca)); - printf(" %18.12g\n", fa.farg[7]); + printf(" %12.6g\n", fa.farg[7]); freefargs(&fa); return(0); } @@ -480,8 +637,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); @@ -664,11 +823,8 @@ initotypes() /* initialize ofun[] array */ 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 */ @@ -681,7 +837,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; @@ -690,7 +847,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; @@ -703,3 +860,115 @@ initotypes() /* initialize ofun[] array */ tinvers[OBJ_TUBE] = OBJ_CYLINDER; tinvers[OBJ_INSTANCE] = OBJ_INSTANCE; /* oh, well */ } + + +#ifdef OLDXFORM +openmain(fname) +char *fname; +{ + if (fname == NULL) { + strcpy(mainfn, "standard input"); + mainfp = stdin; + return; + } + if (mainfp != NULL) { + if (!strcmp(fname, mainfn)) { + rewind(mainfp); + return; + } + fclose(mainfp); + } + if ((mainfp = fopen(fname, "r")) == NULL) { + fprintf(stderr, "%s: cannot open file \"%s\"\n", + progname, fname); + exit(1); + } + strcpy(mainfn, fname); +} +#else +openmain(iname) /* open input, changing directory for file */ +char *iname; +{ + static char origdir[PATH_MAX]; + static char curfn[PATH_MAX]; + static int diffdir; + register char *fpath; + + if (iname == NULL) { /* standard input */ + if (mainfp == NULL) { + register int c; + strcpy(mainfn, "standard input"); + if (nrept <= 1) { + mainfp = stdin; + return; /* just read once */ + } + /* else copy */ + if ((mainfp = tmpfile()) == NULL) { + fprintf(stderr, + "%s: cannot create temporary file\n", + progname); + exit(1); + } + while ((c = getc(stdin)) != EOF) + putc(c, mainfp); + } + rewind(mainfp); /* rewind copy */ + return; + } + if (mainfp == NULL) { /* first call, initialize */ + getcwd(origdir, sizeof(origdir)); + } else if (!strcmp(iname, curfn)) { /* just need to rewind? */ + rewind(mainfp); + return; + } else { /* else close old stream */ + fclose(mainfp); + mainfp = NULL; + if (diffdir) { /* return to our directory */ + chdir(origdir); + diffdir = 0; + } + } + 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, iname); + exit(1); + } + if (fpath[0] == '.' && ISDIRSEP(fpath[1])) /* remove leading ./ */ + fpath += 2; + /* record path name */ + strcpy(mainfn, fpath); + if (expand) { /* change to local directory */ + register char *cp = fpath + strlen(fpath); /* get dir. */ + while (cp > fpath) { + cp--; + if (ISDIRSEP(*cp)) { + if (cp == fpath) + cp++; /* root special case */ + break; + } + } + *cp = '\0'; + if (fpath[0]) { /* change to new directory? */ + if (chdir(fpath) < 0) { + fprintf(stderr, + "%s: cannot change directory to \"%s\"\n", + progname, fpath); + exit(1); + } + diffdir++; + } + /* get final path component */ + for (fpath = iname+strlen(iname); + fpath > iname && !ISDIRSEP(fpath[-1]); fpath--) + ; + } + /* finally, open the file */ + if ((mainfp = fopen(fpath, "r")) == NULL) { + fprintf(stderr, "%s: cannot open file \"%s\"\n", + progname, mainfn); + exit(1); + } +} +#endif