--- ray/src/rt/data.h 1989/02/02 10:41:13 1.1 +++ ray/src/rt/data.h 1995/06/30 16:07:42 2.2 @@ -8,19 +8,19 @@ * 6/4/86 */ -#define MAXDIM 8 /* maximum dimensions for data array */ +#define MAXDDIM 8 /* maximum dimensions for data array */ #define DATATYPE float /* single precision to save space */ +#define DATATY 'f' /* format for DATATYPE */ -#define DSCANF "%f" /* scan format for DATATYPE */ - typedef struct datarray { char *name; /* name of our data */ int nd; /* number of dimensions */ struct { double org, siz; /* coordinate domain */ int ne; /* number of elements */ - } dim[MAXDIM]; /* dimension specifications */ + double *p; /* point locations */ + } dim[MAXDDIM]; /* dimension specifications */ DATATYPE *arr; /* the data */ struct datarray *next; /* next array in list */ } DATARRAY; /* a data array */