| 68 |
|
|
| 69 |
|
static void trace_contrib(RAY *r); /* our trace callback */ |
| 70 |
|
|
| 71 |
< |
static void mcfree(void *p) { epfree((*(MODCONT *)p).binv); free(p); } |
| 71 |
> |
static void mcfree(void *p) { epfree((*(MODCONT *)p).binv,1); free(p); } |
| 72 |
|
|
| 73 |
|
LUTAB modconttab = LU_SINIT(NULL,mcfree); /* modifier lookup table */ |
| 74 |
|
|
| 75 |
|
/************************** INITIALIZATION ROUTINES ***********************/ |
| 76 |
|
|
| 77 |
< |
char * |
| 77 |
> |
const char * |
| 78 |
|
formstr( /* return format identifier */ |
| 79 |
|
int f |
| 80 |
|
) |
| 83 |
|
case 'a': return("ascii"); |
| 84 |
|
case 'f': return("float"); |
| 85 |
|
case 'd': return("double"); |
| 86 |
< |
case 'c': return(COLRFMT); |
| 86 |
> |
case 'c': return(NCSAMP==3 ? COLRFMT : SPECFMT); |
| 87 |
|
} |
| 88 |
|
return("unknown"); |
| 89 |
|
} |
| 102 |
|
sprintf(errmsg, "duplicate modifier '%s'", modn); |
| 103 |
|
error(USER, errmsg); |
| 104 |
|
} |
| 105 |
– |
if (nmods >= MAXMODLIST) { |
| 106 |
– |
sprintf(errmsg, "too many modifiers (%d limit)", MAXMODLIST); |
| 107 |
– |
error(INTERNAL, errmsg); |
| 108 |
– |
} |
| 105 |
|
if (!strcmp(modn, VOIDID)) { |
| 106 |
|
sprintf(errmsg, "cannot track '%s' modifier", VOIDID); |
| 107 |
|
error(USER, errmsg); |
| 108 |
|
} |
| 109 |
+ |
if (nmods >= modasiz) { /* need bigger modifier array */ |
| 110 |
+ |
modasiz += modasiz/2 + 64; |
| 111 |
+ |
if (modname == NULL) |
| 112 |
+ |
modname = (char **)malloc(modasiz*sizeof(char *)); |
| 113 |
+ |
else |
| 114 |
+ |
modname = (char **)realloc(modname, modasiz*sizeof(char *)); |
| 115 |
+ |
if (modname == NULL) |
| 116 |
+ |
error(SYSTEM, "Out of memory in addmodifier()"); |
| 117 |
+ |
} |
| 118 |
|
modname[nmods++] = modn; /* XXX assumes static string */ |
| 119 |
|
lep->key = modn; /* XXX assumes static string */ |
| 120 |
|
if (binv == NULL) |
| 134 |
|
error(USER, errmsg); |
| 135 |
|
} |
| 136 |
|
/* initialize results holder */ |
| 137 |
< |
mp = (MODCONT *)malloc(sizeof(MODCONT)+sizeof(DCOLOR)*(bincnt-1)); |
| 137 |
> |
mp = (MODCONT *)malloc(mcsize(bincnt)); |
| 138 |
|
if (mp == NULL) |
| 139 |
|
error(SYSTEM, "out of memory in addmodifier"); |
| 140 |
|
mp->outspec = outf; /* XXX assumes static string */ |
| 143 |
|
mp->binv = ebinv; |
| 144 |
|
mp->bin0 = 0; |
| 145 |
|
mp->nbins = bincnt; |
| 146 |
< |
memset(mp->cbin, 0, sizeof(DCOLOR)*bincnt); |
| 146 |
> |
memset(mp->cbin, 0, DCOLORSIZ*bincnt); |
| 147 |
|
/* figure out starting bin */ |
| 148 |
|
while (!getostream(mp->outspec, mp->modname, mp->bin0, 1)) |
| 149 |
|
mp->bin0++; |
| 159 |
|
void |
| 160 |
|
addmodfile(char *fname, char *outf, char *prms, char *binv, int bincnt) |
| 161 |
|
{ |
| 162 |
< |
char *mname[MAXMODLIST]; |
| 163 |
< |
int i; |
| 164 |
< |
/* find the file & store strings */ |
| 165 |
< |
i = wordfile(mname, MAXMODLIST, getpath(fname, getrlibpath(), R_OK)); |
| 166 |
< |
if (i < 0) { |
| 167 |
< |
sprintf(errmsg, "cannot find modifier file '%s'", fname); |
| 162 |
> |
char *path = getpath(fname, getrlibpath(), R_OK); |
| 163 |
> |
char mod[MAXSTR]; |
| 164 |
> |
FILE *fp; |
| 165 |
> |
|
| 166 |
> |
if (path == NULL || (fp = fopen(path, "r")) == NULL) { |
| 167 |
> |
if (path == NULL) |
| 168 |
> |
sprintf(errmsg, "cannot find modifier file '%s'", fname); |
| 169 |
> |
else |
| 170 |
> |
sprintf(errmsg, "cannot load modifier file '%s'", path); |
| 171 |
|
error(SYSTEM, errmsg); |
| 172 |
|
} |
| 173 |
< |
if (i >= MAXMODLIST-1) { |
| 174 |
< |
sprintf(errmsg, "too many modifiers (%d limit) in file '%s'", |
| 175 |
< |
MAXMODLIST-1, fname); |
| 168 |
< |
error(INTERNAL, errmsg); |
| 169 |
< |
} |
| 170 |
< |
for (i = 0; mname[i]; i++) /* add each one */ |
| 171 |
< |
addmodifier(mname[i], outf, prms, binv, bincnt); |
| 173 |
> |
while (fgetword(mod, sizeof(mod), fp) != NULL) |
| 174 |
> |
addmodifier(savqstr(mod), outf, prms, binv, bincnt); |
| 175 |
> |
fclose(fp); |
| 176 |
|
} |
| 177 |
|
|
| 178 |
|
|
| 191 |
|
if (!total_rays) { |
| 192 |
|
total_rays = raysleft; |
| 193 |
|
tstart = tnow; |
| 194 |
+ |
} else { |
| 195 |
+ |
sprintf(errmsg, "%.2f%% done after %.3f hours\n", |
| 196 |
+ |
100.-100.*raysleft/total_rays, |
| 197 |
+ |
(1./3600.)*(tnow - tstart)); |
| 198 |
+ |
eputs(errmsg); |
| 199 |
|
} |
| 191 |
– |
sprintf(errmsg, "%.2f%% done after %.3f hours", |
| 192 |
– |
100.-100.*raysleft/total_rays, |
| 193 |
– |
(1./3600.)*(tnow - tstart)); |
| 194 |
– |
eputs(errmsg); |
| 200 |
|
last_report = tnow; |
| 201 |
|
} |
| 202 |
|
return(--raysleft); |
| 273 |
|
MODCONT *mp; |
| 274 |
|
double bval; |
| 275 |
|
int bn; |
| 276 |
< |
RREAL contr[3]; |
| 276 |
> |
SCOLOR contr; |
| 277 |
> |
DCOLORV *dvp; |
| 278 |
> |
int i; |
| 279 |
|
|
| 280 |
|
if (r->ro == NULL || r->ro->omod == OVOID) |
| 281 |
|
return; |
| 299 |
|
} |
| 300 |
|
raycontrib(contr, r, PRIMARY); /* compute coefficient */ |
| 301 |
|
if (contrib) |
| 302 |
< |
multcolor(contr, r->rcol); /* -> contribution */ |
| 303 |
< |
addcolor(mp->cbin[bn], contr); |
| 302 |
> |
smultscolor(contr, r->rcol); /* -> contribution */ |
| 303 |
> |
dvp = mcbin(mp, bn); |
| 304 |
> |
for (i = 0; i < NCSAMP; i++) /* add it in */ |
| 305 |
> |
*dvp++ += contr[i]; |
| 306 |
|
} |
| 307 |
|
|
| 308 |
|
|
| 356 |
|
for (i = 0; i < nmods; i++) { /* output records & clear */ |
| 357 |
|
mp = (MODCONT *)lu_find(&modconttab,modname[i])->data; |
| 358 |
|
mod_output(mp); |
| 359 |
< |
memset(mp->cbin, 0, sizeof(DCOLOR)*mp->nbins); |
| 359 |
> |
memset(mp->cbin, 0, DCOLORSIZ*mp->nbins); |
| 360 |
|
} |
| 361 |
|
end_record(); /* end lines & flush if time */ |
| 362 |
|
|
