--- ray/src/gen/genrev.c 1993/11/18 09:33:01 2.3 +++ ray/src/gen/genrev.c 2018/05/04 23:56:49 2.12 @@ -1,9 +1,6 @@ #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: genrev.c,v 2.12 2018/05/04 23:56:49 greg Exp $"; #endif - -/* Copyright (c) 1989 Regents of the University of California */ - /* * genrev.c - program to generate functions of rotation about z * @@ -14,9 +11,16 @@ static char SCCSid[] = "$SunId$ LBL"; * 8/6/86 */ +#include #include +#include #include +#include "rtio.h" +#include "rterror.h" +#include "resolu.h" +#include "calcomp.h" + #define ZNAME "Z`SYS`" /* z function name */ #define RNAME "R`SYS`" /* r function name */ @@ -29,14 +33,65 @@ static char SCCSid[] = "$SunId$ LBL"; #define UP 04 #define DOWN 010 -double funvalue(), l_hermite(), l_bezier(), l_bspline(), argument(); +void +computen(nzp, nrp, z0, r0, z1, r1) /* compute normal */ +double *nzp, *nrp, z0, r0, z1, r1; +{ + double dr, dz, len; + dz = r0 - r1; /* right angle vector */ + dr = z1 - z0; + len = sqrt(dr*dr + dz*dz); + *nzp = dz/len; + *nrp = dr/len; +} + + +double +l_hermite(char *nm) +{ + double t; + + t = argument(5); + return( argument(1)*((2.0*t-3.0)*t*t+1.0) + + argument(2)*(-2.0*t+3.0)*t*t + + argument(3)*((t-2.0)*t+1.0)*t + + argument(4)*(t-1.0)*t*t ); +} + + +double +l_bezier(char *nm) +{ + double t; + + t = argument(5); + return( argument(1) * (1.+t*(-3.+t*(3.-t))) + + argument(2) * 3.*t*(1.+t*(-2.+t)) + + argument(3) * 3.*t*t*(1.-t) + + argument(4) * t*t*t ); +} + + +double +l_bspline(char *nm) +{ + double t; + + t = argument(5); + return( argument(1) * (1./6.+t*(-1./2.+t*(1./2.-1./6.*t))) + + argument(2) * (2./3.+t*t*(-1.+1./2.*t)) + + argument(3) * (1./6.+t*(1./2.+t*(1./2.-1./2.*t))) + + argument(4) * (1./6.*t*t*t) ); +} + + +int main(argc, argv) int argc; char *argv[]; { - extern long eclock; char stmp[256]; char *modname; int smooth = 0; @@ -45,6 +100,8 @@ char *argv[]; int i, nseg; int orient; + esupport |= E_VARIABLE|E_FUNCTION|E_RCONST; + esupport &= ~(E_OUTCHAN|E_INCHAN); varset("PI", ':', PI); funset("hermite", 5, ':', l_hermite); funset("bezier", 5, ':', l_bezier); @@ -56,9 +113,15 @@ char *argv[]; for (i = 6; i < argc; i++) if (!strcmp(argv[i], "-e")) scompile(argv[++i], NULL, 0); - else if (!strcmp(argv[i], "-f")) - fcompile(argv[++i]); - else if (!strcmp(argv[i], "-s")) + else if (!strcmp(argv[i], "-f")) { + char *fpath = getpath(argv[++i], getrlibpath(), 0); + if (fpath == NULL) { + fprintf(stderr, "%s: cannot find file '%s'\n", + argv[0], argv[i]); + quit(1); + } + fcompile(fpath); + } else if (!strcmp(argv[i], "-s")) smooth = 1; else goto userror; @@ -72,7 +135,8 @@ char *argv[]; goto userror; modname = smooth ? "Phong" : argv[1]; - printhead(argc, argv); + fputs("# ", stdout); + printargs(argc, argv, stdout); eclock = 0; lastnz = lastnr = 0.0; @@ -108,13 +172,13 @@ char *argv[]; printf("0\n4\n"); if (orient&(UP|DOWN)) { t = (nextnz - lastnz)/(z - lastz); - printf("\t%15.9g\t%15.9g\n", + printf("\t%18.12g\t%18.12g\n", t, lastnz - t*lastz); } else printf("\t0\t%d\n", orient&IN ? 1 : -1); if (orient&(OUT|IN)) { t = (nextnr - lastnr)/(r - lastr); - printf("\t%15.9g\t%15.9g\n", + printf("\t%18.12g\t%18.12g\n", t, lastnr - t*lastr); } else printf("\t0\t%d\n", orient&UP ? 1 : -1); @@ -124,23 +188,23 @@ char *argv[]; orient&DOWN ? "tube" : "cylinder", argv[2], i); printf("0\n0\n7\n"); - printf("\t0\t0\t%15.9g\n", lastz); - printf("\t0\t0\t%15.9g\n", z); - printf("\t%15.9g\n", r); + printf("\t0\t0\t%18.12g\n", lastz); + printf("\t0\t0\t%18.12g\n", z); + printf("\t%18.12g\n", r); } else if (!(orient&(UP|DOWN))) { printf("\n%s ring %s.%d\n", modname, argv[2], i); printf("0\n0\n8\n"); - printf("\t0\t0\t%15.9g\n", z); - printf("\t0\t0\t%15.9g\n", orient&IN ? 1.0 : -1.0); - printf("\t%15.9g\t%15.9g\n", lastr, r); + printf("\t0\t0\t%18.12g\n", z); + printf("\t0\t0\t%18.12g\n", orient&IN ? 1.0 : -1.0); + printf("\t%18.12g\t%18.12g\n", lastr, r); } else { printf("\n%s %s %s.%d\n", modname, orient&DOWN ? "cup" : "cone", argv[2], i); printf("0\n0\n8\n"); - printf("\t0\t0\t%15.9g\n", lastz); - printf("\t0\t0\t%15.9g\n", z); - printf("\t%15.9g\t%15.9g\n", lastr, r); + printf("\t0\t0\t%18.12g\n", lastz); + printf("\t0\t0\t%18.12g\n", z); + printf("\t%18.12g\t%18.12g\n", lastr, r); } endfor: lastz = z; lastr = r; @@ -148,97 +212,13 @@ char *argv[]; lastnz = nz; lastnr = nr; nz = nextnz; nr = nextnr; } - quit(0); + return 0; userror: fprintf(stderr, "Usage: %s material name z(t) r(t) nseg [-e expr] [-f file] [-s]\n", argv[0]); - quit(1); + return 1; } -computen(nzp, nrp, z0, r0, z1, r1) /* compute normal */ -double *nzp, *nrp, z0, r0, z1, r1; -{ - double dr, dz, len; - - dz = r0 - r1; /* right angle vector */ - dr = z1 - z0; - len = sqrt(dr*dr + dz*dz); - *nzp = dz/len; - *nrp = dr/len; -} - - -eputs(msg) -char *msg; -{ - fputs(msg, stderr); -} - - -wputs(msg) -char *msg; -{ - eputs(msg); -} - - -quit(code) -int code; -{ - exit(code); -} - - -printhead(ac, av) /* print command header */ -register int ac; -register char **av; -{ - putchar('#'); - while (ac--) { - putchar(' '); - fputs(*av++, stdout); - } - putchar('\n'); -} - - -double -l_hermite() -{ - double t; - - t = argument(5); - return( argument(1)*((2.0*t-3.0)*t*t+1.0) + - argument(2)*(-2.0*t+3.0)*t*t + - argument(3)*((t-2.0)*t+1.0)*t + - argument(4)*(t-1.0)*t*t ); -} - - -double -l_bezier() -{ - double t; - - t = argument(5); - return( argument(1) * (1.+t*(-3.+t*(3.-t))) + - argument(2) * 3.*t*(1.+t*(-2.+t)) + - argument(3) * 3.*t*t*(1.-t) + - argument(4) * t*t*t ); -} - - -double -l_bspline() -{ - double t; - - t = argument(5); - return( argument(1) * (1./6.+t*(-1./2.+t*(1./2.-1./6.*t))) + - argument(2) * (2./3.+t*t*(-1.+1./2.*t)) + - argument(3) * (1./6.+t*(1./2.+t*(1./2.-1./2.*t))) + - argument(4) * (1./6.*t*t*t) ); -}