1 |
< |
/* Copyright (c) 1986 Regents of the University of California */ |
1 |
> |
/* Copyright (c) 1991 Regents of the University of California */ |
2 |
|
|
3 |
|
#ifndef lint |
4 |
|
static char SCCSid[] = "$SunId$ LBL"; |
14 |
|
|
15 |
|
#include "octree.h" |
16 |
|
|
17 |
– |
#include "source.h" |
18 |
– |
|
17 |
|
#include "otypes.h" |
18 |
|
|
19 |
< |
#include "cone.h" |
19 |
> |
#include "source.h" |
20 |
|
|
21 |
< |
#include "face.h" |
21 |
> |
/* |
22 |
> |
* Structures used by direct() |
23 |
> |
*/ |
24 |
|
|
25 |
< |
#include "random.h" |
25 |
> |
typedef struct { |
26 |
> |
int sno; /* source number */ |
27 |
> |
FVECT dir; /* source direction */ |
28 |
> |
COLOR coef; /* material coefficient */ |
29 |
> |
COLOR val; /* contribution */ |
30 |
> |
} CONTRIB; /* direct contribution */ |
31 |
|
|
32 |
+ |
typedef struct { |
33 |
+ |
int sndx; /* source index (to CONTRIB array) */ |
34 |
+ |
float brt; /* brightness (for comparison) */ |
35 |
+ |
} CNTPTR; /* contribution pointer */ |
36 |
|
|
37 |
< |
extern double dstrsrc; /* source distribution amount */ |
38 |
< |
extern double shadthresh; /* relative shadow threshold */ |
39 |
< |
extern double shadcert; /* shadow testing certainty */ |
37 |
> |
static CONTRIB *srccnt; /* source contributions in direct() */ |
38 |
> |
static CNTPTR *cntord; /* source ordering in direct() */ |
39 |
> |
static int maxcntr = 0; /* size of contribution arrays */ |
40 |
|
|
32 |
– |
SRCREC *source = NULL; /* our list of sources */ |
33 |
– |
int nsources = 0; /* the number of sources */ |
41 |
|
|
35 |
– |
|
42 |
|
marksources() /* find and mark source objects */ |
43 |
|
{ |
44 |
+ |
int i; |
45 |
|
register OBJREC *o, *m; |
46 |
< |
register int i; |
47 |
< |
|
46 |
> |
register int ns; |
47 |
> |
/* initialize dispatch table */ |
48 |
> |
initstypes(); |
49 |
> |
/* find direct sources */ |
50 |
|
for (i = 0; i < nobjects; i++) { |
51 |
|
|
52 |
|
o = objptr(i); |
53 |
|
|
54 |
< |
if (o->omod == OVOID) |
54 |
> |
if (!issurface(o->otype) || o->omod == OVOID) |
55 |
|
continue; |
56 |
|
|
57 |
|
m = objptr(o->omod); |
58 |
|
|
59 |
< |
if (m->otype != MAT_LIGHT && |
51 |
< |
m->otype != MAT_ILLUM && |
52 |
< |
m->otype != MAT_GLOW && |
53 |
< |
m->otype != MAT_SPOT) |
59 |
> |
if (!islight(m->otype)) |
60 |
|
continue; |
61 |
|
|
62 |
|
if (m->oargs.nfargs != (m->otype == MAT_GLOW ? 4 : |
68 |
|
m->oargs.farg[3] <= FTINY) |
69 |
|
continue; /* don't bother */ |
70 |
|
|
71 |
< |
if (source == NULL) |
72 |
< |
source = (SRCREC *)malloc(sizeof(SRCREC)); |
73 |
< |
else |
68 |
< |
source = (SRCREC *)realloc((char *)source, |
69 |
< |
(unsigned)(nsources+1)*sizeof(SRCREC)); |
70 |
< |
if (source == NULL) |
71 |
< |
error(SYSTEM, "out of memory in marksources"); |
71 |
> |
if (sfun[o->otype].of == NULL || |
72 |
> |
sfun[o->otype].of->setsrc == NULL) |
73 |
> |
objerror(o, USER, "illegal material"); |
74 |
|
|
75 |
< |
newsource(&source[nsources], o); |
75 |
> |
if ((ns = newsource()) < 0) |
76 |
> |
goto memerr; |
77 |
|
|
78 |
+ |
setsource(&source[ns], o); |
79 |
+ |
|
80 |
|
if (m->otype == MAT_GLOW) { |
81 |
< |
source[nsources].sflags |= SPROX; |
82 |
< |
source[nsources].sl.prox = m->oargs.farg[3]; |
81 |
> |
source[ns].sflags |= SPROX; |
82 |
> |
source[ns].sl.prox = m->oargs.farg[3]; |
83 |
|
if (o->otype == OBJ_SOURCE) |
84 |
< |
source[nsources].sflags |= SSKIP; |
84 |
> |
source[ns].sflags |= SSKIP; |
85 |
|
} else if (m->otype == MAT_SPOT) { |
86 |
< |
source[nsources].sflags |= SSPOT; |
87 |
< |
source[nsources].sl.s = makespot(m); |
86 |
> |
source[ns].sflags |= SSPOT; |
87 |
> |
if ((source[ns].sl.s = makespot(m)) == NULL) |
88 |
> |
goto memerr; |
89 |
> |
if (source[ns].sflags & SFLAT && |
90 |
> |
!checkspot(source[ns].sl.s,source[ns].snorm)) { |
91 |
> |
objerror(o, WARNING, |
92 |
> |
"invalid spotlight direction"); |
93 |
> |
source[ns].sflags |= SSKIP; |
94 |
> |
} |
95 |
|
} |
84 |
– |
nsources++; |
96 |
|
} |
97 |
< |
} |
98 |
< |
|
99 |
< |
|
89 |
< |
newsource(src, so) /* add a source to the array */ |
90 |
< |
register SRCREC *src; |
91 |
< |
register OBJREC *so; |
92 |
< |
{ |
93 |
< |
double cos(), tan(), sqrt(); |
94 |
< |
double theta; |
95 |
< |
FACE *f; |
96 |
< |
CONE *co; |
97 |
< |
int j; |
98 |
< |
register int i; |
99 |
< |
|
100 |
< |
src->sflags = 0; |
101 |
< |
src->nhits = 1; src->ntests = 2; /* start probability = 1/2 */ |
102 |
< |
src->so = so; |
103 |
< |
|
104 |
< |
switch (so->otype) { |
105 |
< |
case OBJ_SOURCE: |
106 |
< |
if (so->oargs.nfargs != 4) |
107 |
< |
objerror(so, USER, "bad arguments"); |
108 |
< |
src->sflags |= SDISTANT; |
109 |
< |
VCOPY(src->sloc, so->oargs.farg); |
110 |
< |
if (normalize(src->sloc) == 0.0) |
111 |
< |
objerror(so, USER, "zero direction"); |
112 |
< |
theta = PI/180.0/2.0 * so->oargs.farg[3]; |
113 |
< |
if (theta <= FTINY) |
114 |
< |
objerror(so, USER, "zero size"); |
115 |
< |
src->ss = theta >= PI/4 ? 1.0 : tan(theta); |
116 |
< |
src->ss2 = 2.0*PI * (1.0 - cos(theta)); |
117 |
< |
break; |
118 |
< |
case OBJ_SPHERE: |
119 |
< |
VCOPY(src->sloc, so->oargs.farg); |
120 |
< |
src->ss = so->oargs.farg[3]; |
121 |
< |
src->ss2 = PI * src->ss * src->ss; |
122 |
< |
break; |
123 |
< |
case OBJ_FACE: |
124 |
< |
/* get the face */ |
125 |
< |
f = getface(so); |
126 |
< |
/* find the center */ |
127 |
< |
for (j = 0; j < 3; j++) { |
128 |
< |
src->sloc[j] = 0.0; |
129 |
< |
for (i = 0; i < f->nv; i++) |
130 |
< |
src->sloc[j] += VERTEX(f,i)[j]; |
131 |
< |
src->sloc[j] /= f->nv; |
132 |
< |
} |
133 |
< |
if (!inface(src->sloc, f)) |
134 |
< |
objerror(so, USER, "cannot hit center"); |
135 |
< |
src->ss = sqrt(f->area / PI); |
136 |
< |
src->ss2 = f->area; |
137 |
< |
break; |
138 |
< |
case OBJ_RING: |
139 |
< |
/* get the ring */ |
140 |
< |
co = getcone(so, 0); |
141 |
< |
VCOPY(src->sloc, CO_P0(co)); |
142 |
< |
if (CO_R0(co) > 0.0) |
143 |
< |
objerror(so, USER, "cannot hit center"); |
144 |
< |
src->ss = CO_R1(co); |
145 |
< |
src->ss2 = PI * src->ss * src->ss; |
146 |
< |
break; |
147 |
< |
default: |
148 |
< |
objerror(so, USER, "illegal material"); |
97 |
> |
if (nsources <= 0) { |
98 |
> |
error(WARNING, "no light sources found"); |
99 |
> |
return; |
100 |
|
} |
101 |
+ |
markvirtuals(); /* find and add virtual sources */ |
102 |
+ |
/* allocate our contribution arrays */ |
103 |
+ |
maxcntr = nsources + MAXSPART*2; /* start with this many */ |
104 |
+ |
srccnt = (CONTRIB *)malloc(maxcntr*sizeof(CONTRIB)); |
105 |
+ |
cntord = (CNTPTR *)malloc(maxcntr*sizeof(CNTPTR)); |
106 |
+ |
if (srccnt == NULL || cntord == NULL) |
107 |
+ |
goto memerr; |
108 |
+ |
return; |
109 |
+ |
memerr: |
110 |
+ |
error(SYSTEM, "out of memory in marksources"); |
111 |
|
} |
112 |
|
|
113 |
|
|
114 |
< |
SPOT * |
154 |
< |
makespot(m) /* make a spotlight */ |
155 |
< |
register OBJREC *m; |
156 |
< |
{ |
157 |
< |
extern double cos(); |
158 |
< |
register SPOT *ns; |
159 |
< |
|
160 |
< |
if ((ns = (SPOT *)malloc(sizeof(SPOT))) == NULL) |
161 |
< |
error(SYSTEM, "out of memory in makespot"); |
162 |
< |
ns->siz = 2.0*PI * (1.0 - cos(PI/180.0/2.0 * m->oargs.farg[3])); |
163 |
< |
VCOPY(ns->aim, m->oargs.farg+4); |
164 |
< |
if ((ns->flen = normalize(ns->aim)) == 0.0) |
165 |
< |
objerror(m, USER, "zero focus vector"); |
166 |
< |
return(ns); |
167 |
< |
} |
168 |
< |
|
169 |
< |
|
170 |
< |
double |
171 |
< |
srcray(sr, r, sn) /* send a ray to a source, return domega */ |
114 |
> |
srcray(sr, r, si) /* send a ray to a source, return domega */ |
115 |
|
register RAY *sr; /* returned source ray */ |
116 |
|
RAY *r; /* ray which hit object */ |
117 |
< |
register int sn; /* source number */ |
117 |
> |
SRCINDEX *si; /* source sample index */ |
118 |
|
{ |
119 |
< |
register double *norm = NULL; /* plane normal */ |
120 |
< |
double ddot; /* (distance times) cosine */ |
121 |
< |
FVECT vd; |
122 |
< |
double d; |
180 |
< |
register int i; |
119 |
> |
double d; /* distance to source */ |
120 |
> |
FVECT vd; |
121 |
> |
register SRCREC *srcp; |
122 |
> |
register int i; |
123 |
|
|
124 |
< |
if (source[sn].sflags & SSKIP) |
183 |
< |
return(0.0); /* skip this source */ |
124 |
> |
rayorigin(sr, r, SHADOW, 1.0); /* ignore limits */ |
125 |
|
|
126 |
< |
rayorigin(sr, r, SHADOW, 1.0); /* ignore limits */ |
127 |
< |
|
128 |
< |
sr->rsrc = sn; /* remember source */ |
129 |
< |
/* get source direction */ |
130 |
< |
if (source[sn].sflags & SDISTANT) |
190 |
< |
/* constant direction */ |
191 |
< |
VCOPY(sr->rdir, source[sn].sloc); |
192 |
< |
else { /* compute direction */ |
193 |
< |
for (i = 0; i < 3; i++) |
194 |
< |
sr->rdir[i] = source[sn].sloc[i] - sr->rorg[i]; |
195 |
< |
|
196 |
< |
if (source[sn].so->otype == OBJ_FACE) |
197 |
< |
norm = getface(source[sn].so)->norm; |
198 |
< |
else if (source[sn].so->otype == OBJ_RING) |
199 |
< |
norm = getcone(source[sn].so,0)->ad; |
200 |
< |
|
201 |
< |
if (norm != NULL && (ddot = -DOT(sr->rdir, norm)) <= FTINY) |
202 |
< |
return(0.0); /* behind surface! */ |
203 |
< |
} |
204 |
< |
if (dstrsrc > FTINY) { |
205 |
< |
/* distribute source direction */ |
206 |
< |
for (i = 0; i < 3; i++) |
207 |
< |
vd[i] = dstrsrc * source[sn].ss * (1.0 - 2.0*frandom()); |
208 |
< |
|
209 |
< |
if (norm != NULL) { /* project offset */ |
210 |
< |
d = DOT(vd, norm); |
126 |
> |
while ((d = nextssamp(sr, si)) != 0.0) { |
127 |
> |
sr->rsrc = si->sn; /* remember source */ |
128 |
> |
srcp = source + si->sn; |
129 |
> |
if (srcp->sflags & SDISTANT) { |
130 |
> |
if (srcp->sflags & SSPOT) { /* check location */ |
131 |
|
for (i = 0; i < 3; i++) |
132 |
< |
vd[i] -= d * norm[i]; |
132 |
> |
vd[i] = srcp->sl.s->aim[i] - sr->rorg[i]; |
133 |
> |
d = DOT(sr->rdir,vd); |
134 |
> |
if (d <= FTINY) |
135 |
> |
continue; |
136 |
> |
d = DOT(vd,vd) - d*d; |
137 |
> |
if (PI*d > srcp->sl.s->siz) |
138 |
> |
continue; |
139 |
|
} |
140 |
< |
for (i = 0; i < 3; i++) /* offset source direction */ |
141 |
< |
sr->rdir[i] += vd[i]; |
142 |
< |
|
217 |
< |
} else if (source[sn].sflags & SDISTANT) |
218 |
< |
/* already normalized */ |
219 |
< |
return(source[sn].ss2); |
220 |
< |
|
221 |
< |
if ((d = normalize(sr->rdir)) == 0.0) |
222 |
< |
/* at source! */ |
223 |
< |
return(0.0); |
224 |
< |
|
225 |
< |
if (source[sn].sflags & SDISTANT) |
226 |
< |
/* domega constant */ |
227 |
< |
return(source[sn].ss2); |
228 |
< |
|
229 |
< |
else { |
140 |
> |
return(1); /* sample OK */ |
141 |
> |
} |
142 |
> |
/* local source */ |
143 |
|
/* check proximity */ |
144 |
< |
if (source[sn].sflags & SPROX && |
145 |
< |
d > source[sn].sl.prox) |
233 |
< |
return(0.0); |
234 |
< |
|
235 |
< |
if (norm != NULL) |
236 |
< |
ddot /= d; |
237 |
< |
else |
238 |
< |
ddot = 1.0; |
144 |
> |
if (srcp->sflags & SPROX && d > srcp->sl.prox) |
145 |
> |
continue; |
146 |
|
/* check angle */ |
147 |
< |
if (source[sn].sflags & SSPOT) { |
148 |
< |
if (source[sn].sl.s->siz < 2.0*PI * |
149 |
< |
(1.0 + DOT(source[sn].sl.s->aim,sr->rdir))) |
150 |
< |
return(0.0); |
151 |
< |
d += source[sn].sl.s->flen; |
152 |
< |
} |
153 |
< |
/* return domega */ |
154 |
< |
return(ddot*source[sn].ss2/(d*d)); |
147 |
> |
if (srcp->sflags & SSPOT) { |
148 |
> |
if (srcp->sl.s->siz < 2.0*PI * |
149 |
> |
(1.0 + DOT(srcp->sl.s->aim,sr->rdir))) |
150 |
> |
continue; |
151 |
> |
/* adjust solid angle */ |
152 |
> |
si->dom *= d*d; |
153 |
> |
d += srcp->sl.s->flen; |
154 |
> |
si->dom /= d*d; |
155 |
|
} |
156 |
+ |
return(1); /* sample OK */ |
157 |
+ |
} |
158 |
+ |
return(0); /* no more samples */ |
159 |
|
} |
160 |
|
|
161 |
|
|
162 |
< |
sourcehit(r) /* check to see if ray hit distant source */ |
163 |
< |
register RAY *r; |
162 |
> |
srcvalue(r) /* punch ray to source and compute value */ |
163 |
> |
RAY *r; |
164 |
|
{ |
165 |
< |
int first, last; |
256 |
< |
register int i; |
165 |
> |
register SRCREC *sp; |
166 |
|
|
167 |
< |
if (r->rsrc >= 0) { /* check only one if aimed */ |
168 |
< |
first = last = r->rsrc; |
169 |
< |
} else { /* otherwise check all */ |
170 |
< |
first = 0; last = nsources-1; |
167 |
> |
sp = &source[r->rsrc]; |
168 |
> |
if (sp->sflags & SVIRTUAL) { /* virtual source */ |
169 |
> |
/* check intersection */ |
170 |
> |
if (!(*ofun[sp->so->otype].funp)(sp->so, r)) |
171 |
> |
return; |
172 |
> |
raycont(r); /* compute contribution */ |
173 |
> |
return; |
174 |
|
} |
175 |
< |
for (i = first; i <= last; i++) |
176 |
< |
if (source[i].sflags & SDISTANT) |
177 |
< |
/* |
178 |
< |
* Check to see if ray is within |
179 |
< |
* solid angle of source. |
180 |
< |
*/ |
181 |
< |
if (2.0*PI * (1.0 - DOT(source[i].sloc,r->rdir)) |
270 |
< |
<= source[i].ss2) { |
271 |
< |
r->ro = source[i].so; |
272 |
< |
if (!(source[i].sflags & SSKIP)) |
273 |
< |
break; |
274 |
< |
} |
275 |
< |
|
276 |
< |
if (r->ro != NULL) { |
277 |
< |
for (i = 0; i < 3; i++) |
278 |
< |
r->ron[i] = -r->rdir[i]; |
279 |
< |
r->rod = 1.0; |
280 |
< |
r->rofs = 1.0; setident4(r->rofx); |
281 |
< |
r->robs = 1.0; setident4(r->robx); |
282 |
< |
return(1); |
175 |
> |
/* compute intersection */ |
176 |
> |
if (sp->sflags & SDISTANT ? sourcehit(r) : |
177 |
> |
(*ofun[sp->so->otype].funp)(sp->so, r)) { |
178 |
> |
if (sp->sa.success >= 0) |
179 |
> |
sp->sa.success++; |
180 |
> |
raycont(r); /* compute contribution */ |
181 |
> |
return; |
182 |
|
} |
183 |
< |
return(0); |
183 |
> |
if (sp->sa.success < 0) |
184 |
> |
return; /* bitched already */ |
185 |
> |
sp->sa.success -= AIMREQT; |
186 |
> |
if (sp->sa.success >= 0) |
187 |
> |
return; /* leniency */ |
188 |
> |
sprintf(errmsg, "aiming failure for light source \"%s\"", |
189 |
> |
sp->so->oname); |
190 |
> |
error(WARNING, errmsg); /* issue warning */ |
191 |
|
} |
192 |
|
|
193 |
|
|
208 |
|
int (*f)(); /* direct component coefficient function */ |
209 |
|
char *p; /* data for f */ |
210 |
|
{ |
211 |
+ |
extern int (*trace)(); |
212 |
|
extern double pow(); |
213 |
|
register int sn; |
214 |
< |
register CONTRIB *srccnt; |
308 |
< |
register CNTPTR *cntord; |
214 |
> |
SRCINDEX si; |
215 |
|
int nshadcheck, ncnts; |
216 |
< |
double prob, ourthresh, hwt, test2, hit2; |
216 |
> |
int nhits; |
217 |
> |
double prob, ourthresh, hwt; |
218 |
|
RAY sr; |
219 |
< |
|
219 |
> |
/* NOTE: srccnt and cntord global so no recursion */ |
220 |
|
if (nsources <= 0) |
221 |
< |
return; |
315 |
< |
srccnt = (CONTRIB *)malloc(nsources*sizeof(CONTRIB)); |
316 |
< |
cntord = (CNTPTR *)malloc(nsources*sizeof(CNTPTR)); |
317 |
< |
if (srccnt == NULL || cntord == NULL) |
318 |
< |
error(SYSTEM, "out of memory in direct"); |
319 |
< |
/* compute number to check */ |
320 |
< |
nshadcheck = pow((double)nsources, shadcert) + .5; |
321 |
< |
/* modify threshold */ |
322 |
< |
ourthresh = shadthresh / r->rweight; |
221 |
> |
return; /* no sources?! */ |
222 |
|
/* potential contributions */ |
223 |
< |
for (sn = 0; sn < nsources; sn++) { |
224 |
< |
cntord[sn].sno = sn; |
225 |
< |
cntord[sn].brt = 0.0; |
226 |
< |
/* get source ray */ |
227 |
< |
if ((srccnt[sn].dom = srcray(&sr, r, sn)) == 0.0) |
228 |
< |
continue; |
229 |
< |
VCOPY(srccnt[sn].dir, sr.rdir); |
223 |
> |
initsrcindex(&si); |
224 |
> |
for (sn = 0; srcray(&sr, r, &si); sn++) { |
225 |
> |
if (sn >= maxcntr) { |
226 |
> |
maxcntr = sn + MAXSPART; |
227 |
> |
srccnt = (CONTRIB *)realloc((char *)srccnt, |
228 |
> |
maxcntr*sizeof(CONTRIB)); |
229 |
> |
cntord = (CNTPTR *)realloc((char *)cntord, |
230 |
> |
maxcntr*sizeof(CNTPTR)); |
231 |
> |
if (srccnt == NULL || cntord == NULL) |
232 |
> |
error(SYSTEM, "out of memory in direct"); |
233 |
> |
} |
234 |
> |
cntord[sn].sndx = sn; |
235 |
> |
srccnt[sn].sno = sr.rsrc; |
236 |
|
/* compute coefficient */ |
237 |
< |
(*f)(srccnt[sn].val, p, srccnt[sn].dir, srccnt[sn].dom); |
238 |
< |
cntord[sn].brt = bright(srccnt[sn].val); |
237 |
> |
(*f)(srccnt[sn].coef, p, sr.rdir, si.dom); |
238 |
> |
cntord[sn].brt = bright(srccnt[sn].coef); |
239 |
|
if (cntord[sn].brt <= 0.0) |
240 |
|
continue; |
241 |
< |
/* compute intersection */ |
242 |
< |
if (!( source[sn].sflags & SDISTANT ? |
243 |
< |
sourcehit(&sr) : |
244 |
< |
(*ofun[source[sn].so->otype].funp) |
245 |
< |
(source[sn].so, &sr) )) |
246 |
< |
continue; |
342 |
< |
/* compute contribution */ |
343 |
< |
raycont(&sr); |
344 |
< |
multcolor(srccnt[sn].val, sr.rcol); |
241 |
> |
VCOPY(srccnt[sn].dir, sr.rdir); |
242 |
> |
/* compute potential */ |
243 |
> |
sr.revf = srcvalue; |
244 |
> |
rayvalue(&sr); |
245 |
> |
copycolor(srccnt[sn].val, sr.rcol); |
246 |
> |
multcolor(srccnt[sn].val, srccnt[sn].coef); |
247 |
|
cntord[sn].brt = bright(srccnt[sn].val); |
248 |
|
} |
249 |
|
/* sort contributions */ |
250 |
< |
qsort(cntord, nsources, sizeof(CNTPTR), cntcmp); |
250 |
> |
qsort(cntord, sn, sizeof(CNTPTR), cntcmp); |
251 |
|
{ /* find last */ |
252 |
|
register int l, m; |
253 |
|
|
254 |
< |
sn = 0; ncnts = l = nsources; |
254 |
> |
ncnts = l = sn; |
255 |
> |
sn = 0; |
256 |
|
while ((m = (sn + ncnts) >> 1) != l) { |
257 |
|
if (cntord[m].brt > 0.0) |
258 |
|
sn = m; |
264 |
|
/* accumulate tail */ |
265 |
|
for (sn = ncnts-1; sn > 0; sn--) |
266 |
|
cntord[sn-1].brt += cntord[sn].brt; |
267 |
< |
/* start with prob=.5 */ |
268 |
< |
hit2 = 0.5; test2 = 1.0; |
267 |
> |
/* compute number to check */ |
268 |
> |
nshadcheck = pow((double)ncnts, shadcert) + .5; |
269 |
> |
/* modify threshold */ |
270 |
> |
ourthresh = shadthresh / r->rweight; |
271 |
|
/* test for shadows */ |
272 |
+ |
nhits = 0; |
273 |
|
for (sn = 0; sn < ncnts; sn++) { |
274 |
|
/* check threshold */ |
275 |
|
if ((sn+nshadcheck>=ncnts ? cntord[sn].brt : |
276 |
< |
cntord[sn].brt-cntord[sn+nshadcheck].brt) < |
277 |
< |
ourthresh*bright(r->rcol)) |
276 |
> |
cntord[sn].brt-cntord[sn+nshadcheck].brt) |
277 |
> |
< ourthresh*bright(r->rcol)) |
278 |
|
break; |
373 |
– |
/* get statistics */ |
374 |
– |
hwt = (double)source[cntord[sn].sno].nhits / |
375 |
– |
(double)source[cntord[sn].sno].ntests; |
376 |
– |
test2 += hwt; |
377 |
– |
source[cntord[sn].sno].ntests++; |
279 |
|
/* test for hit */ |
280 |
|
rayorigin(&sr, r, SHADOW, 1.0); |
281 |
< |
VCOPY(sr.rdir, srccnt[cntord[sn].sno].dir); |
282 |
< |
sr.rsrc = cntord[sn].sno; |
281 |
> |
VCOPY(sr.rdir, srccnt[cntord[sn].sndx].dir); |
282 |
> |
sr.rsrc = srccnt[cntord[sn].sndx].sno; |
283 |
> |
source[sr.rsrc].ntests++; /* keep statistics */ |
284 |
|
if (localhit(&sr, &thescene) && |
285 |
< |
sr.ro != source[cntord[sn].sno].so) { |
286 |
< |
/* check for transmission */ |
285 |
> |
( sr.ro != source[sr.rsrc].so || |
286 |
> |
source[sr.rsrc].sflags & SFOLLOW )) { |
287 |
> |
/* follow entire path */ |
288 |
|
raycont(&sr); |
289 |
+ |
if (trace != NULL) |
290 |
+ |
(*trace)(&sr); /* trace execution */ |
291 |
|
if (bright(sr.rcol) <= FTINY) |
292 |
|
continue; /* missed! */ |
293 |
< |
(*f)(srccnt[cntord[sn].sno].val, p, |
294 |
< |
srccnt[cntord[sn].sno].dir, |
295 |
< |
srccnt[cntord[sn].sno].dom); |
391 |
< |
multcolor(srccnt[cntord[sn].sno].val, sr.rcol); |
293 |
> |
copycolor(srccnt[cntord[sn].sndx].val, sr.rcol); |
294 |
> |
multcolor(srccnt[cntord[sn].sndx].val, |
295 |
> |
srccnt[cntord[sn].sndx].coef); |
296 |
|
} |
297 |
|
/* add contribution if hit */ |
298 |
< |
addcolor(r->rcol, srccnt[cntord[sn].sno].val); |
299 |
< |
hit2 += hwt; |
300 |
< |
source[cntord[sn].sno].nhits++; |
298 |
> |
addcolor(r->rcol, srccnt[cntord[sn].sndx].val); |
299 |
> |
nhits++; |
300 |
> |
source[sr.rsrc].nhits++; |
301 |
|
} |
302 |
< |
/* weighted hit rate */ |
303 |
< |
hwt = hit2 / test2; |
302 |
> |
/* surface hit rate */ |
303 |
> |
if (sn > 0) |
304 |
> |
hwt = (double)nhits / (double)sn; |
305 |
> |
else |
306 |
> |
hwt = 0.5; |
307 |
|
#ifdef DEBUG |
308 |
|
sprintf(errmsg, "%d tested, %d untested, %f hit rate\n", |
309 |
|
sn, ncnts-sn, hwt); |
311 |
|
#endif |
312 |
|
/* add in untested sources */ |
313 |
|
for ( ; sn < ncnts; sn++) { |
314 |
< |
prob = hwt * (double)source[cntord[sn].sno].nhits / |
315 |
< |
(double)source[cntord[sn].sno].ntests; |
316 |
< |
scalecolor(srccnt[cntord[sn].sno].val, prob); |
317 |
< |
addcolor(r->rcol, srccnt[cntord[sn].sno].val); |
314 |
> |
sr.rsrc = srccnt[cntord[sn].sndx].sno; |
315 |
> |
prob = hwt * (double)source[sr.rsrc].nhits / |
316 |
> |
(double)source[sr.rsrc].ntests; |
317 |
> |
scalecolor(srccnt[cntord[sn].sndx].val, prob); |
318 |
> |
addcolor(r->rcol, srccnt[cntord[sn].sndx].val); |
319 |
|
} |
412 |
– |
|
413 |
– |
free((char *)srccnt); |
414 |
– |
free((char *)cntord); |
320 |
|
} |
416 |
– |
|
417 |
– |
|
418 |
– |
#define wrongsource(m, r) (m->otype!=MAT_ILLUM && \ |
419 |
– |
r->rsrc>=0 && \ |
420 |
– |
source[r->rsrc].so!=r->ro) |
421 |
– |
|
422 |
– |
#define badambient(m, r) ((r->crtype&(AMBIENT|SHADOW))==AMBIENT && \ |
423 |
– |
!(r->rtype&REFLECTED) && /* hack! */\ |
424 |
– |
!(m->otype==MAT_GLOW&&r->rot>m->oargs.farg[3])) |
425 |
– |
|
426 |
– |
#define passillum(m, r) (m->otype==MAT_ILLUM && \ |
427 |
– |
!(r->rsrc>=0&&source[r->rsrc].so==r->ro)) |
428 |
– |
|
429 |
– |
|
430 |
– |
m_light(m, r) /* ray hit a light source */ |
431 |
– |
register OBJREC *m; |
432 |
– |
register RAY *r; |
433 |
– |
{ |
434 |
– |
/* check for over-counting */ |
435 |
– |
if (wrongsource(m, r) || badambient(m, r)) |
436 |
– |
return; |
437 |
– |
/* check for passed illum */ |
438 |
– |
if (passillum(m, r)) { |
439 |
– |
|
440 |
– |
if (m->oargs.nsargs < 1 || !strcmp(m->oargs.sarg[0], VOIDID)) |
441 |
– |
raytrans(r); |
442 |
– |
else |
443 |
– |
rayshade(r, modifier(m->oargs.sarg[0])); |
444 |
– |
|
445 |
– |
/* otherwise treat as source */ |
446 |
– |
} else { |
447 |
– |
/* check for behind */ |
448 |
– |
if (r->rod < 0.0) |
449 |
– |
return; |
450 |
– |
/* get distribution pattern */ |
451 |
– |
raytexture(r, m->omod); |
452 |
– |
/* get source color */ |
453 |
– |
setcolor(r->rcol, m->oargs.farg[0], |
454 |
– |
m->oargs.farg[1], |
455 |
– |
m->oargs.farg[2]); |
456 |
– |
/* modify value */ |
457 |
– |
multcolor(r->rcol, r->pcol); |
458 |
– |
/* assign distance */ |
459 |
– |
r->rt = r->rot; |
460 |
– |
} |
461 |
– |
} |
462 |
– |
|
463 |
– |
|
464 |
– |
o_source() {} /* intersection with a source is done elsewhere */ |