--- ray/src/ot/oconv.c 1990/08/29 21:56:17 1.11 +++ ray/src/ot/oconv.c 1991/12/19 15:06:31 2.2 @@ -18,6 +18,10 @@ static char SCCSid[] = "$SunId$ LBL"; #include "otypes.h" +#ifndef DEFPATH +#define DEFPATH ":/usr/local/lib/ray" +#endif + #define OMARGIN (10*FTINY) /* margin around global cube */ #define MAXOBJFIL 63 /* maximum number of scene files */ @@ -46,8 +50,7 @@ main(argc, argv) /* convert object files to an octree int argc; char **argv; { - char *getenv(); - double atof(); + extern char *getenv(); FVECT bbmin, bbmax; char *infile = NULL; int outflags = IO_ALL; @@ -57,8 +60,10 @@ char **argv; progname = argv[0]; if ((libpath = getenv("RAYPATH")) == NULL) - libpath = ":/usr/local/lib/ray"; + libpath = DEFPATH; + initotypes(); + for (i = 1; i < argc && argv[i][0] == '-'; i++) switch (argv[i][1]) { case '\0': /* scene from stdin */ @@ -101,6 +106,7 @@ breakopt: } printargs(argc, argv, stdout); /* info. header */ + fputformat(OCTFMT, stdout); printf("\n"); startobj = nobjects; /* previous objects already converted */