| 34 |
|
ofun[OBJ_RING].funp = o_ring; |
| 35 |
|
ofun[OBJ_SOURCE].funp = o_source; |
| 36 |
|
ofun[OBJ_INSTANCE].funp = o_instance; |
| 37 |
+ |
ofun[OBJ_MESH].funp = o_unsupported; |
| 38 |
|
/* assign material types */ |
| 39 |
|
ofun[MAT_TRANS].funp = |
| 40 |
|
ofun[MAT_PLASTIC].funp = |
| 118 |
|
rgl_octlist(fname, cent, radp, nl) /* load scen into display list */ |
| 119 |
|
char *fname; |
| 120 |
|
FVECT cent; /* returned octree center (optional) */ |
| 121 |
< |
FLOAT *radp; /* returned octree size (optional) */ |
| 121 |
> |
RREAL *radp; /* returned octree size (optional) */ |
| 122 |
|
int *nl; /* returned number of lists (optional) */ |
| 123 |
|
{ |
| 124 |
|
double r; |
| 199 |
|
strcpy(sbuf, "EOF"); |
| 200 |
|
fgetword(sbuf, MAXSTR, fp); |
| 201 |
|
ob.omod = 0; /* use ob.os for pointer to material */ |
| 202 |
< |
if (!strcmp(sbuf, VOIDID)) |
| 202 |
> |
if (!strcmp(sbuf, VOIDID) || !strcmp(sbuf, ALIASMOD)) |
| 203 |
|
ob.os = NULL; |
| 204 |
|
else |
| 205 |
|
ob.os = (char *)getmatp(sbuf); |
| 206 |
|
/* get type */ |
| 207 |
|
strcpy(sbuf, "EOF"); |
| 208 |
|
fgetword(sbuf, MAXSTR, fp); |
| 209 |
< |
if (!strcmp(sbuf, ALIASID)) |
| 209 |
< |
ob.otype = -1; |
| 210 |
< |
else if ((ob.otype = otype(sbuf)) < 0) { |
| 209 |
> |
if ((ob.otype = otype(sbuf)) < 0) { |
| 210 |
|
sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf); |
| 211 |
|
error(USER, errmsg); |
| 212 |
|
} |
| 215 |
|
fgetword(sbuf, MAXSTR, fp); |
| 216 |
|
ob.oname = sbuf; |
| 217 |
|
/* get arguments */ |
| 218 |
< |
if (ob.otype == -1) { |
| 218 |
> |
if (ob.otype == MOD_ALIAS) { |
| 219 |
|
char sbuf2[MAXSTR]; /* get alias */ |
| 220 |
|
strcpy(sbuf2, "EOF"); |
| 221 |
|
fgetword(sbuf2, MAXSTR, fp); |
