16 |
|
#include "random.h" |
17 |
|
|
18 |
|
#ifndef WFLUSH |
19 |
< |
#ifdef SPEED |
20 |
< |
#define WFLUSH (5*SPEED) |
21 |
< |
#else |
22 |
< |
#define WFLUSH 100 /* flush after this many rays */ |
19 |
> |
#define WFLUSH 2048 /* flush after this many rays */ |
20 |
|
#endif |
24 |
– |
#endif |
21 |
|
|
22 |
|
#ifdef SMLFLT |
23 |
|
#define sscanvec(s,v) (sscanf(s,"%f %f %f",v,v+1,v+2)==3) |
104 |
|
return(-1); |
105 |
|
} |
106 |
|
if (!direc || ourview.type == VT_PAR) { |
107 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
107 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
108 |
|
if (!localhit(&thisray, &thescene)) { |
109 |
|
error(COMMAND, "not a local object"); |
110 |
|
return(-1); |
118 |
|
VCOPY(vec, thisray.rdir); |
119 |
|
else |
120 |
|
VCOPY(vec, thisray.rop); |
121 |
< |
} else if (direc) |
122 |
< |
for (i = 0; i < 3; i++) |
123 |
< |
vec[i] -= ourview.vp[i]; |
121 |
> |
} else if (direc) { |
122 |
> |
for (i = 0; i < 3; i++) |
123 |
> |
vec[i] -= ourview.vp[i]; |
124 |
> |
if (normalize(vec) == 0.0) { |
125 |
> |
error(COMMAND, "point at view origin"); |
126 |
> |
return(-1); |
127 |
> |
} |
128 |
> |
} |
129 |
|
return(0); |
130 |
|
} |
131 |
|
|
166 |
|
h/hresolu, v/vresolu)) < -FTINY) { |
167 |
|
setcolor(thisray.rcol, 0.0, 0.0, 0.0); |
168 |
|
} else { |
169 |
< |
rayorigin(&thisray, NULL, PRIMARY, 1.0); |
169 |
> |
rayorigin(&thisray, PRIMARY, NULL, NULL); |
170 |
|
samplendx++; |
171 |
|
rayvalue(&thisray); |
172 |
|
} |
387 |
|
{ |
388 |
|
double d; |
389 |
|
FVECT v1; |
390 |
< |
VIEW nv; |
390 |
> |
VIEW nv = ourview; |
391 |
|
register int i; |
392 |
|
|
392 |
– |
VCOPY(nv.vup, ourview.vup); |
393 |
– |
nv.hoff = ourview.hoff; nv.voff = ourview.voff; |
393 |
|
spinvector(nv.vdir, ourview.vdir, ourview.vup, angle*(PI/180.)); |
394 |
|
if (elev != 0.0) { |
395 |
|
fcross(v1, ourview.vup, nv.vdir); |
396 |
|
normalize(v1); |
397 |
|
spinvector(nv.vdir, nv.vdir, v1, elev*(PI/180.)); |
398 |
|
} |
399 |
< |
if ((nv.type = ourview.type) == VT_PAR) { |
400 |
< |
nv.horiz = ourview.horiz / mag; |
401 |
< |
nv.vert = ourview.vert / mag; |
399 |
> |
if (nv.type == VT_PAR) { |
400 |
> |
nv.horiz /= mag; |
401 |
> |
nv.vert /= mag; |
402 |
|
d = 0.0; /* don't move closer */ |
403 |
|
for (i = 0; i < 3; i++) |
404 |
|
d += (vc[i] - ourview.vp[i])*ourview.vdir[i]; |
406 |
– |
nv.vfore = ourview.vfore; |
407 |
– |
nv.vaft = ourview.vaft; |
405 |
|
} else { |
409 |
– |
nv.horiz = ourview.horiz; |
410 |
– |
nv.vert = ourview.vert; |
406 |
|
d = sqrt(dist2(ourview.vp, vc)) / mag; |
407 |
< |
if ((nv.vfore = ourview.vfore) > FTINY) { |
407 |
> |
if (nv.vfore > FTINY) { |
408 |
|
nv.vfore += d - d*mag; |
409 |
|
if (nv.vfore < 0.0) nv.vfore = 0.0; |
410 |
|
} |
411 |
< |
if ((nv.vaft = ourview.vaft) > FTINY) { |
411 |
> |
if (nv.vaft > FTINY) { |
412 |
|
nv.vaft += d - d*mag; |
413 |
|
if (nv.vaft <= nv.vfore) nv.vaft = 0.0; |
414 |
|
} |
415 |
+ |
nv.vdist /= mag; |
416 |
|
} |
417 |
|
for (i = 0; i < 3; i++) |
418 |
|
nv.vp[i] = vc[i] - d*nv.vdir[i]; |