| 1 |
< |
/* Copyright (c) 1991 Regents of the University of California */ |
| 1 |
> |
/* Copyright (c) 1994 Regents of the University of California */ |
| 2 |
|
|
| 3 |
|
#ifndef lint |
| 4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
| 91 |
|
RAY *r; |
| 92 |
|
{ |
| 93 |
|
extern int (*trace)(); |
| 94 |
+ |
int gotmat; |
| 95 |
|
|
| 96 |
|
if (localhit(r, &thescene)) |
| 97 |
< |
raycont(r); |
| 97 |
> |
gotmat = raycont(r); |
| 98 |
|
else if (sourcehit(r)) |
| 99 |
< |
rayshade(r, r->ro->omod); |
| 99 |
> |
gotmat = rayshade(r, r->ro->omod); |
| 100 |
|
|
| 101 |
+ |
if (r->ro != NULL && !gotmat) |
| 102 |
+ |
objerror(r->ro, USER, "material not found"); |
| 103 |
+ |
|
| 104 |
|
if (trace != NULL) |
| 105 |
|
(*trace)(r); /* trace execution */ |
| 106 |
|
} |
| 110 |
|
register RAY *r; |
| 111 |
|
{ |
| 112 |
|
if ((r->clipset != NULL && inset(r->clipset, r->ro->omod)) || |
| 113 |
< |
r->ro->omod == OVOID) |
| 113 |
> |
r->ro->omod == OVOID) { |
| 114 |
|
raytrans(r); |
| 115 |
< |
else |
| 116 |
< |
rayshade(r, r->ro->omod); |
| 115 |
> |
return(1); |
| 116 |
> |
} |
| 117 |
> |
return(rayshade(r, r->ro->omod)); |
| 118 |
|
} |
| 119 |
|
|
| 120 |
|
|
| 137 |
|
int mod; |
| 138 |
|
{ |
| 139 |
|
static int depth = 0; |
| 140 |
+ |
int gotmat; |
| 141 |
|
register OBJREC *m; |
| 142 |
|
/* check for infinite loop */ |
| 143 |
|
if (depth++ >= MAXLOOP) |
| 144 |
|
objerror(r->ro, USER, "possible modifier loop"); |
| 145 |
|
r->rt = r->rot; /* set effective ray length */ |
| 146 |
< |
for ( ; mod != OVOID; mod = m->omod) { |
| 146 |
> |
for (gotmat = 0; !gotmat && mod != OVOID; mod = m->omod) { |
| 147 |
|
m = objptr(mod); |
| 148 |
|
/****** unnecessary test since modifier() is always called |
| 149 |
|
if (!ismodifier(m->otype)) { |
| 161 |
|
if (!islight(m->otype)) |
| 162 |
|
m = &Lamb; |
| 163 |
|
} |
| 164 |
< |
(*ofun[m->otype].funp)(m, r); /* execute function */ |
| 165 |
< |
if (ismaterial(m->otype)) { /* materials call raytexture */ |
| 160 |
< |
depth--; |
| 161 |
< |
return; /* we're done */ |
| 162 |
< |
} |
| 164 |
> |
/* materials call raytexture */ |
| 165 |
> |
gotmat = (*ofun[m->otype].funp)(m, r); |
| 166 |
|
} |
| 167 |
< |
objerror(r->ro, USER, "material not found"); |
| 167 |
> |
depth--; |
| 168 |
> |
return(gotmat); |
| 169 |
|
} |
| 170 |
|
|
| 171 |
|
|
| 181 |
|
/* execute textures and patterns */ |
| 182 |
|
for ( ; mod != OVOID; mod = m->omod) { |
| 183 |
|
m = objptr(mod); |
| 184 |
< |
if (!istexture(m->otype)) { |
| 184 |
> |
/****** unnecessary test since modifier() is always called |
| 185 |
> |
if (!ismodifier(m->otype)) { |
| 186 |
|
sprintf(errmsg, "illegal modifier \"%s\"", m->oname); |
| 187 |
|
error(USER, errmsg); |
| 188 |
|
} |
| 189 |
< |
(*ofun[m->otype].funp)(m, r); |
| 189 |
> |
******/ |
| 190 |
> |
if ((*ofun[m->otype].funp)(m, r)) |
| 191 |
> |
objerror(r->ro, USER, "conflicting materials"); |
| 192 |
|
} |
| 193 |
|
depth--; /* end here */ |
| 194 |
|
} |
| 199 |
|
OBJECT fore, back; |
| 200 |
|
double coef; |
| 201 |
|
{ |
| 202 |
< |
FVECT curpert, forepert, backpert; |
| 203 |
< |
COLOR curpcol, forepcol, backpcol; |
| 202 |
> |
RAY fr, br; |
| 203 |
> |
int foremat, backmat; |
| 204 |
|
register int i; |
| 205 |
|
/* clip coefficient */ |
| 206 |
|
if (coef > 1.0) |
| 207 |
|
coef = 1.0; |
| 208 |
|
else if (coef < 0.0) |
| 209 |
|
coef = 0.0; |
| 210 |
< |
/* save current mods */ |
| 211 |
< |
VCOPY(curpert, r->pert); |
| 212 |
< |
copycolor(curpcol, r->pcol); |
| 213 |
< |
/* compute new mods */ |
| 207 |
< |
/* foreground */ |
| 208 |
< |
r->pert[0] = r->pert[1] = r->pert[2] = 0.0; |
| 209 |
< |
setcolor(r->pcol, 1.0, 1.0, 1.0); |
| 210 |
> |
/* compute foreground and background */ |
| 211 |
> |
foremat = backmat = -1; |
| 212 |
> |
/* foreground */ |
| 213 |
> |
copystruct(&fr, r); |
| 214 |
|
if (fore != OVOID && coef > FTINY) |
| 215 |
< |
raytexture(r, fore); |
| 216 |
< |
VCOPY(forepert, r->pert); |
| 217 |
< |
copycolor(forepcol, r->pcol); |
| 214 |
< |
/* background */ |
| 215 |
< |
r->pert[0] = r->pert[1] = r->pert[2] = 0.0; |
| 216 |
< |
setcolor(r->pcol, 1.0, 1.0, 1.0); |
| 215 |
> |
foremat = rayshade(&fr, fore); |
| 216 |
> |
/* background */ |
| 217 |
> |
copystruct(&br, r); |
| 218 |
|
if (back != OVOID && coef < 1.0-FTINY) |
| 219 |
< |
raytexture(r, back); |
| 220 |
< |
VCOPY(backpert, r->pert); |
| 221 |
< |
copycolor(backpcol, r->pcol); |
| 222 |
< |
/* sum perturbations */ |
| 219 |
> |
backmat = rayshade(&br, back); |
| 220 |
> |
/* check */ |
| 221 |
> |
if (foremat < 0) |
| 222 |
> |
if (backmat < 0) |
| 223 |
> |
foremat = backmat = 0; |
| 224 |
> |
else |
| 225 |
> |
foremat = backmat; |
| 226 |
> |
else if (backmat < 0) |
| 227 |
> |
backmat = foremat; |
| 228 |
> |
if ((foremat==0) != (backmat==0)) |
| 229 |
> |
objerror(r->ro, USER, "mixing material with non-material"); |
| 230 |
> |
/* mix perturbations */ |
| 231 |
|
for (i = 0; i < 3; i++) |
| 232 |
< |
r->pert[i] = curpert[i] + coef*forepert[i] + |
| 233 |
< |
(1.0-coef)*backpert[i]; |
| 234 |
< |
/* multiply colors */ |
| 235 |
< |
setcolor(r->pcol, coef*colval(forepcol,RED) + |
| 236 |
< |
(1.0-coef)*colval(backpcol,RED), |
| 237 |
< |
coef*colval(forepcol,GRN) + |
| 238 |
< |
(1.0-coef)*colval(backpcol,GRN), |
| 239 |
< |
coef*colval(forepcol,BLU) + |
| 240 |
< |
(1.0-coef)*colval(backpcol,BLU)); |
| 241 |
< |
multcolor(r->pcol, curpcol); |
| 232 |
> |
r->pert[i] = coef*fr.pert[i] + (1.0-coef)*br.pert[i]; |
| 233 |
> |
/* mix pattern colors */ |
| 234 |
> |
scalecolor(fr.pcol, coef); |
| 235 |
> |
scalecolor(br.pcol, 1.0-coef); |
| 236 |
> |
copycolor(r->pcol, fr.pcol); |
| 237 |
> |
addcolor(r->pcol, br.pcol); |
| 238 |
> |
/* mix returned ray values */ |
| 239 |
> |
if (foremat) { |
| 240 |
> |
scalecolor(fr.rcol, coef); |
| 241 |
> |
scalecolor(br.rcol, 1.0-coef); |
| 242 |
> |
copycolor(r->rcol, fr.rcol); |
| 243 |
> |
addcolor(r->rcol, br.rcol); |
| 244 |
> |
r->rt = bright(fr.rcol) > bright(br.rcol) ? fr.rt : br.rt; |
| 245 |
> |
} |
| 246 |
> |
/* return value tells if material */ |
| 247 |
> |
return(foremat); |
| 248 |
|
} |
| 249 |
|
|
| 250 |
|
|