1 |
– |
/* Copyright (c) 1992 Regents of the University of California */ |
2 |
– |
|
1 |
|
#ifndef lint |
2 |
< |
static char SCCSid[] = "$SunId$ LBL"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
6 |
– |
|
4 |
|
/* |
5 |
|
* Shading functions for anisotropic materials. |
6 |
|
*/ |
7 |
|
|
8 |
< |
#include "ray.h" |
8 |
> |
#include "copyright.h" |
9 |
|
|
10 |
+ |
#include "ray.h" |
11 |
+ |
#include "ambient.h" |
12 |
|
#include "otypes.h" |
13 |
< |
|
13 |
> |
#include "rtotypes.h" |
14 |
> |
#include "source.h" |
15 |
|
#include "func.h" |
16 |
– |
|
16 |
|
#include "random.h" |
17 |
|
|
18 |
< |
extern double specthresh; /* specular sampling threshold */ |
19 |
< |
extern double specjitter; /* specular sampling jitter */ |
18 |
> |
#ifndef MAXITER |
19 |
> |
#define MAXITER 10 /* maximum # specular ray attempts */ |
20 |
> |
#endif |
21 |
|
|
22 |
– |
extern int backvis; /* back faces visible? */ |
23 |
– |
|
24 |
– |
static agaussamp(), getacoords(); |
25 |
– |
|
22 |
|
/* |
23 |
|
* This routine implements the anisotropic Gaussian |
24 |
|
* model described by Ward in Siggraph `92 article. |
60 |
|
double pdot; /* perturbed dot product */ |
61 |
|
} ANISODAT; /* anisotropic material data */ |
62 |
|
|
63 |
+ |
static srcdirf_t diraniso; |
64 |
+ |
static void getacoords(RAY *r, ANISODAT *np); |
65 |
+ |
static void agaussamp(RAY *r, ANISODAT *np); |
66 |
|
|
67 |
< |
diraniso(cval, np, ldir, omega) /* compute source contribution */ |
68 |
< |
COLOR cval; /* returned coefficient */ |
69 |
< |
register ANISODAT *np; /* material data */ |
70 |
< |
FVECT ldir; /* light source direction */ |
71 |
< |
double omega; /* light source size */ |
67 |
> |
|
68 |
> |
static void |
69 |
> |
diraniso( /* compute source contribution */ |
70 |
> |
COLOR cval, /* returned coefficient */ |
71 |
> |
void *nnp, /* material data */ |
72 |
> |
FVECT ldir, /* light source direction */ |
73 |
> |
double omega /* light source size */ |
74 |
> |
) |
75 |
|
{ |
76 |
+ |
register ANISODAT *np = nnp; |
77 |
|
double ldot; |
78 |
|
double dtmp, dtmp1, dtmp2; |
79 |
|
FVECT h; |
94 |
|
* modified by the color of the material. |
95 |
|
*/ |
96 |
|
copycolor(ctmp, np->mcolor); |
97 |
< |
dtmp = ldot * omega * np->rdiff / PI; |
97 |
> |
dtmp = ldot * omega * np->rdiff * (1.0/PI); |
98 |
|
scalecolor(ctmp, dtmp); |
99 |
|
addcolor(cval, ctmp); |
100 |
|
} |
101 |
|
if (ldot > FTINY && (np->specfl&(SP_REFL|SP_BADU)) == SP_REFL) { |
102 |
|
/* |
103 |
|
* Compute specular reflection coefficient using |
104 |
< |
* anisotropic gaussian distribution model. |
104 |
> |
* anisotropic Gaussian distribution model. |
105 |
|
*/ |
106 |
|
/* add source width if flat */ |
107 |
|
if (np->specfl & SP_FLAT) |
108 |
< |
au2 = av2 = omega/(4.0*PI); |
108 |
> |
au2 = av2 = omega * (0.25/PI); |
109 |
|
else |
110 |
|
au2 = av2 = 0.0; |
111 |
|
au2 += np->u_alpha*np->u_alpha; |
119 |
|
dtmp1 *= dtmp1 / au2; |
120 |
|
dtmp2 = DOT(np->v, h); |
121 |
|
dtmp2 *= dtmp2 / av2; |
122 |
< |
/* gaussian */ |
122 |
> |
/* new W-G-M-D model */ |
123 |
|
dtmp = DOT(np->pnorm, h); |
124 |
< |
dtmp = (dtmp1 + dtmp2) / (dtmp*dtmp); |
125 |
< |
dtmp = exp(-dtmp) * (0.25/PI) |
126 |
< |
* sqrt(ldot/(np->pdot*au2*av2)); |
124 |
> |
dtmp *= dtmp; |
125 |
> |
dtmp1 = (dtmp1 + dtmp2) / dtmp; |
126 |
> |
dtmp = exp(-dtmp1) * DOT(h,h) / |
127 |
> |
(PI * dtmp*dtmp * sqrt(au2*av2)); |
128 |
|
/* worth using? */ |
129 |
|
if (dtmp > FTINY) { |
130 |
|
copycolor(ctmp, np->scolor); |
131 |
< |
dtmp *= omega; |
131 |
> |
dtmp *= ldot * omega; |
132 |
|
scalecolor(ctmp, dtmp); |
133 |
|
addcolor(cval, ctmp); |
134 |
|
} |
138 |
|
* Compute diffuse transmission. |
139 |
|
*/ |
140 |
|
copycolor(ctmp, np->mcolor); |
141 |
< |
dtmp = -ldot * omega * np->tdiff / PI; |
141 |
> |
dtmp = -ldot * omega * np->tdiff * (1.0/PI); |
142 |
|
scalecolor(ctmp, dtmp); |
143 |
|
addcolor(cval, ctmp); |
144 |
|
} |
148 |
|
* is always modified by material color. |
149 |
|
*/ |
150 |
|
/* roughness + source */ |
151 |
< |
au2 = av2 = omega / PI; |
151 |
> |
au2 = av2 = omega * (1.0/PI); |
152 |
|
au2 += np->u_alpha*np->u_alpha; |
153 |
|
av2 += np->v_alpha*np->v_alpha; |
154 |
|
/* "half vector" */ |
168 |
|
} |
169 |
|
} else |
170 |
|
dtmp = 0.0; |
171 |
< |
/* gaussian */ |
172 |
< |
dtmp = exp(-dtmp) * (1.0/PI) |
169 |
< |
* sqrt(-ldot/(np->pdot*au2*av2)); |
171 |
> |
/* Gaussian */ |
172 |
> |
dtmp = exp(-dtmp) * (1.0/PI) * sqrt(-ldot/(np->pdot*au2*av2)); |
173 |
|
/* worth using? */ |
174 |
|
if (dtmp > FTINY) { |
175 |
|
copycolor(ctmp, np->mcolor); |
181 |
|
} |
182 |
|
|
183 |
|
|
184 |
< |
m_aniso(m, r) /* shade ray that hit something anisotropic */ |
185 |
< |
register OBJREC *m; |
186 |
< |
register RAY *r; |
184 |
> |
extern int |
185 |
> |
m_aniso( /* shade ray that hit something anisotropic */ |
186 |
> |
register OBJREC *m, |
187 |
> |
register RAY *r |
188 |
> |
) |
189 |
|
{ |
190 |
|
ANISODAT nd; |
191 |
|
COLOR ctmp; |
196 |
|
|
197 |
|
if (m->oargs.nfargs != (m->otype == MAT_TRANS2 ? 8 : 6)) |
198 |
|
objerror(m, USER, "bad number of real arguments"); |
199 |
+ |
/* check for back side */ |
200 |
+ |
if (r->rod < 0.0) { |
201 |
+ |
if (!backvis && m->otype != MAT_TRANS2) { |
202 |
+ |
raytrans(r); |
203 |
+ |
return(1); |
204 |
+ |
} |
205 |
+ |
raytexture(r, m->omod); |
206 |
+ |
flipsurface(r); /* reorient if backvis */ |
207 |
+ |
} else |
208 |
+ |
raytexture(r, m->omod); |
209 |
+ |
/* get material color */ |
210 |
|
nd.mp = m; |
211 |
|
nd.rp = r; |
196 |
– |
/* get material color */ |
212 |
|
setcolor(nd.mcolor, m->oargs.farg[0], |
213 |
|
m->oargs.farg[1], |
214 |
|
m->oargs.farg[2]); |
216 |
|
nd.specfl = 0; |
217 |
|
nd.u_alpha = m->oargs.farg[4]; |
218 |
|
nd.v_alpha = m->oargs.farg[5]; |
219 |
< |
if (nd.u_alpha < FTINY || nd.v_alpha <= FTINY) |
219 |
> |
if (nd.u_alpha <= FTINY || nd.v_alpha <= FTINY) |
220 |
|
objerror(m, USER, "roughness too small"); |
221 |
< |
/* check for back side */ |
207 |
< |
if (r->rod < 0.0) { |
208 |
< |
if (!backvis && m->otype != MAT_TRANS2) { |
209 |
< |
raytrans(r); |
210 |
< |
return(1); |
211 |
< |
} |
212 |
< |
flipsurface(r); /* reorient if backvis */ |
213 |
< |
} |
214 |
< |
/* get modifiers */ |
215 |
< |
raytexture(r, m->omod); |
221 |
> |
|
222 |
|
nd.pdot = raynormal(nd.pnorm, r); /* perturb normal */ |
223 |
|
if (nd.pdot < .001) |
224 |
|
nd.pdot = .001; /* non-zero for diraniso() */ |
236 |
|
if (specthresh >= nd.rspec-FTINY) |
237 |
|
nd.specfl |= SP_RBLT; |
238 |
|
/* compute refl. direction */ |
239 |
< |
for (i = 0; i < 3; i++) |
234 |
< |
nd.vrefl[i] = r->rdir[i] + 2.0*nd.pdot*nd.pnorm[i]; |
239 |
> |
VSUM(nd.vrefl, r->rdir, nd.pnorm, 2.0*nd.pdot); |
240 |
|
if (DOT(nd.vrefl, r->ron) <= FTINY) /* penetration? */ |
241 |
< |
for (i = 0; i < 3; i++) /* safety measure */ |
237 |
< |
nd.vrefl[i] = r->rdir[i] + 2.*r->rod*r->ron[i]; |
241 |
> |
VSUM(nd.vrefl, r->rdir, r->ron, 2.0*r->rod); |
242 |
|
} |
243 |
|
/* compute transmission */ |
244 |
|
if (m->otype == MAT_TRANS2) { |
276 |
|
agaussamp(r, &nd); |
277 |
|
|
278 |
|
if (nd.rdiff > FTINY) { /* ambient from this side */ |
279 |
< |
ambient(ctmp, r); |
280 |
< |
if (nd.specfl & SP_RBLT) |
281 |
< |
scalecolor(ctmp, 1.0-nd.trans); |
282 |
< |
else |
283 |
< |
scalecolor(ctmp, nd.rdiff); |
280 |
< |
multcolor(ctmp, nd.mcolor); /* modified by material color */ |
279 |
> |
copycolor(ctmp, nd.mcolor); /* modified by material color */ |
280 |
> |
scalecolor(ctmp, nd.rdiff); |
281 |
> |
if (nd.specfl & SP_RBLT) /* add in specular as well? */ |
282 |
> |
addcolor(ctmp, nd.scolor); |
283 |
> |
multambient(ctmp, r, nd.pnorm); |
284 |
|
addcolor(r->rcol, ctmp); /* add to returned color */ |
285 |
|
} |
286 |
|
if (nd.tdiff > FTINY) { /* ambient from other side */ |
287 |
+ |
FVECT bnorm; |
288 |
+ |
|
289 |
|
flipsurface(r); |
290 |
< |
ambient(ctmp, r); |
290 |
> |
bnorm[0] = -nd.pnorm[0]; |
291 |
> |
bnorm[1] = -nd.pnorm[1]; |
292 |
> |
bnorm[2] = -nd.pnorm[2]; |
293 |
> |
copycolor(ctmp, nd.mcolor); /* modified by color */ |
294 |
|
if (nd.specfl & SP_TBLT) |
295 |
|
scalecolor(ctmp, nd.trans); |
296 |
|
else |
297 |
|
scalecolor(ctmp, nd.tdiff); |
298 |
< |
multcolor(ctmp, nd.mcolor); /* modified by color */ |
298 |
> |
multambient(ctmp, r, bnorm); |
299 |
|
addcolor(r->rcol, ctmp); |
300 |
|
flipsurface(r); |
301 |
|
} |
306 |
|
} |
307 |
|
|
308 |
|
|
309 |
< |
static |
310 |
< |
getacoords(r, np) /* set up coordinate system */ |
311 |
< |
RAY *r; |
312 |
< |
register ANISODAT *np; |
309 |
> |
static void |
310 |
> |
getacoords( /* set up coordinate system */ |
311 |
> |
RAY *r, |
312 |
> |
register ANISODAT *np |
313 |
> |
) |
314 |
|
{ |
315 |
|
register MFUNC *mf; |
316 |
|
register int i; |
320 |
|
errno = 0; |
321 |
|
for (i = 0; i < 3; i++) |
322 |
|
np->u[i] = evalue(mf->ep[i]); |
323 |
< |
if (errno) { |
323 |
> |
if (errno == EDOM || errno == ERANGE) { |
324 |
|
objerror(np->mp, WARNING, "compute error"); |
325 |
|
np->specfl |= SP_BADU; |
326 |
|
return; |
337 |
|
} |
338 |
|
|
339 |
|
|
340 |
< |
static |
341 |
< |
agaussamp(r, np) /* sample anisotropic gaussian specular */ |
342 |
< |
RAY *r; |
343 |
< |
register ANISODAT *np; |
340 |
> |
static void |
341 |
> |
agaussamp( /* sample anisotropic Gaussian specular */ |
342 |
> |
RAY *r, |
343 |
> |
register ANISODAT *np |
344 |
> |
) |
345 |
|
{ |
346 |
|
RAY sr; |
347 |
|
FVECT h; |
348 |
|
double rv[2]; |
349 |
|
double d, sinp, cosp; |
350 |
+ |
COLOR scol; |
351 |
+ |
int maxiter, ntrials, nstarget, nstaken; |
352 |
|
register int i; |
353 |
|
/* compute reflection */ |
354 |
|
if ((np->specfl & (SP_REFL|SP_RBLT)) == SP_REFL && |
355 |
< |
rayorigin(&sr, r, SPECULAR, np->rspec) == 0) { |
356 |
< |
dimlist[ndims++] = (int)np->mp; |
357 |
< |
d = urand(ilhash(dimlist,ndims)+samplendx); |
358 |
< |
multisamp(rv, 2, d); |
359 |
< |
d = 2.0*PI * rv[0]; |
360 |
< |
cosp = cos(d) * np->u_alpha; |
361 |
< |
sinp = sin(d) * np->v_alpha; |
362 |
< |
d = sqrt(cosp*cosp + sinp*sinp); |
363 |
< |
cosp /= d; |
364 |
< |
sinp /= d; |
365 |
< |
rv[1] = 1.0 - specjitter*rv[1]; |
366 |
< |
if (rv[1] <= FTINY) |
367 |
< |
d = 1.0; |
368 |
< |
else |
369 |
< |
d = sqrt(-log(rv[1]) / |
370 |
< |
(cosp*cosp/(np->u_alpha*np->u_alpha) + |
371 |
< |
sinp*sinp/(np->v_alpha*np->v_alpha))); |
372 |
< |
for (i = 0; i < 3; i++) |
373 |
< |
h[i] = np->pnorm[i] + |
374 |
< |
d*(cosp*np->u[i] + sinp*np->v[i]); |
375 |
< |
d = -2.0 * DOT(h, r->rdir) / (1.0 + d*d); |
376 |
< |
for (i = 0; i < 3; i++) |
377 |
< |
sr.rdir[i] = r->rdir[i] + d*h[i]; |
378 |
< |
if (DOT(sr.rdir, r->ron) <= FTINY) /* penetration? */ |
379 |
< |
VCOPY(sr.rdir, np->vrefl); /* jitter no good */ |
380 |
< |
rayvalue(&sr); |
381 |
< |
multcolor(sr.rcol, np->scolor); |
382 |
< |
addcolor(r->rcol, sr.rcol); |
355 |
> |
rayorigin(&sr, SPECULAR, r, np->scolor) == 0) { |
356 |
> |
nstarget = 1; |
357 |
> |
if (specjitter > 1.5) { /* multiple samples? */ |
358 |
> |
nstarget = specjitter*r->rweight + .5; |
359 |
> |
if (sr.rweight <= minweight*nstarget) |
360 |
> |
nstarget = sr.rweight/minweight; |
361 |
> |
if (nstarget > 1) { |
362 |
> |
d = 1./nstarget; |
363 |
> |
scalecolor(sr.rcoef, d); |
364 |
> |
sr.rweight *= d; |
365 |
> |
} else |
366 |
> |
nstarget = 1; |
367 |
> |
} |
368 |
> |
setcolor(scol, 0., 0., 0.); |
369 |
> |
dimlist[ndims++] = (int)(size_t)np->mp; |
370 |
> |
maxiter = MAXITER*nstarget; |
371 |
> |
for (nstaken = ntrials = 0; nstaken < nstarget && |
372 |
> |
ntrials < maxiter; ntrials++) { |
373 |
> |
if (ntrials) |
374 |
> |
d = frandom(); |
375 |
> |
else |
376 |
> |
d = urand(ilhash(dimlist,ndims)+samplendx); |
377 |
> |
multisamp(rv, 2, d); |
378 |
> |
d = 2.0*PI * rv[0]; |
379 |
> |
cosp = tcos(d) * np->u_alpha; |
380 |
> |
sinp = tsin(d) * np->v_alpha; |
381 |
> |
d = 1./sqrt(cosp*cosp + sinp*sinp); |
382 |
> |
cosp *= d; |
383 |
> |
sinp *= d; |
384 |
> |
if ((0. <= specjitter) & (specjitter < 1.)) |
385 |
> |
rv[1] = 1.0 - specjitter*rv[1]; |
386 |
> |
if (rv[1] <= FTINY) |
387 |
> |
d = 1.0; |
388 |
> |
else |
389 |
> |
d = sqrt(-log(rv[1]) / |
390 |
> |
(cosp*cosp/(np->u_alpha*np->u_alpha) + |
391 |
> |
sinp*sinp/(np->v_alpha*np->v_alpha))); |
392 |
> |
for (i = 0; i < 3; i++) |
393 |
> |
h[i] = np->pnorm[i] + |
394 |
> |
d*(cosp*np->u[i] + sinp*np->v[i]); |
395 |
> |
d = -2.0 * DOT(h, r->rdir) / (1.0 + d*d); |
396 |
> |
VSUM(sr.rdir, r->rdir, h, d); |
397 |
> |
/* sample rejection test */ |
398 |
> |
if ((d = DOT(sr.rdir, r->ron)) <= FTINY) |
399 |
> |
continue; |
400 |
> |
checknorm(sr.rdir); |
401 |
> |
if (nstarget > 1) { /* W-G-M-D adjustment */ |
402 |
> |
if (nstaken) rayclear(&sr); |
403 |
> |
rayvalue(&sr); |
404 |
> |
d = 2./(1. + r->rod/d); |
405 |
> |
scalecolor(sr.rcol, d); |
406 |
> |
addcolor(scol, sr.rcol); |
407 |
> |
} else { |
408 |
> |
rayvalue(&sr); |
409 |
> |
multcolor(sr.rcol, sr.rcoef); |
410 |
> |
addcolor(r->rcol, sr.rcol); |
411 |
> |
} |
412 |
> |
++nstaken; |
413 |
> |
} |
414 |
> |
if (nstarget > 1) { /* final W-G-M-D weighting */ |
415 |
> |
multcolor(scol, sr.rcoef); |
416 |
> |
d = (double)nstarget/ntrials; |
417 |
> |
scalecolor(scol, d); |
418 |
> |
addcolor(r->rcol, scol); |
419 |
> |
} |
420 |
|
ndims--; |
421 |
|
} |
422 |
|
/* compute transmission */ |
423 |
+ |
copycolor(sr.rcoef, np->mcolor); /* modify by material color */ |
424 |
+ |
scalecolor(sr.rcoef, np->tspec); |
425 |
|
if ((np->specfl & (SP_TRAN|SP_TBLT)) == SP_TRAN && |
426 |
< |
rayorigin(&sr, r, SPECULAR, np->tspec) == 0) { |
427 |
< |
dimlist[ndims++] = (int)np->mp; |
428 |
< |
d = urand(ilhash(dimlist,ndims)+1823+samplendx); |
429 |
< |
multisamp(rv, 2, d); |
430 |
< |
d = 2.0*PI * rv[0]; |
431 |
< |
cosp = cos(d) * np->u_alpha; |
432 |
< |
sinp = sin(d) * np->v_alpha; |
433 |
< |
d = sqrt(cosp*cosp + sinp*sinp); |
434 |
< |
cosp /= d; |
435 |
< |
sinp /= d; |
436 |
< |
rv[1] = 1.0 - specjitter*rv[1]; |
437 |
< |
if (rv[1] <= FTINY) |
438 |
< |
d = 1.0; |
439 |
< |
else |
440 |
< |
d = sqrt(-log(rv[1]) / |
441 |
< |
(cosp*cosp/(np->u_alpha*np->u_alpha) + |
442 |
< |
sinp*sinp/(np->v_alpha*np->u_alpha))); |
443 |
< |
for (i = 0; i < 3; i++) |
444 |
< |
sr.rdir[i] = np->prdir[i] + |
445 |
< |
d*(cosp*np->u[i] + sinp*np->v[i]); |
446 |
< |
if (DOT(sr.rdir, r->ron) < -FTINY) |
447 |
< |
normalize(sr.rdir); /* OK, normalize */ |
448 |
< |
else |
449 |
< |
VCOPY(sr.rdir, np->prdir); /* else no jitter */ |
450 |
< |
rayvalue(&sr); |
451 |
< |
scalecolor(sr.rcol, np->tspec); |
452 |
< |
multcolor(sr.rcol, np->mcolor); /* modify by color */ |
453 |
< |
addcolor(r->rcol, sr.rcol); |
426 |
> |
rayorigin(&sr, SPECULAR, r, sr.rcoef) == 0) { |
427 |
> |
nstarget = 1; |
428 |
> |
if (specjitter > 1.5) { /* multiple samples? */ |
429 |
> |
nstarget = specjitter*r->rweight + .5; |
430 |
> |
if (sr.rweight <= minweight*nstarget) |
431 |
> |
nstarget = sr.rweight/minweight; |
432 |
> |
if (nstarget > 1) { |
433 |
> |
d = 1./nstarget; |
434 |
> |
scalecolor(sr.rcoef, d); |
435 |
> |
sr.rweight *= d; |
436 |
> |
} else |
437 |
> |
nstarget = 1; |
438 |
> |
} |
439 |
> |
dimlist[ndims++] = (int)(size_t)np->mp; |
440 |
> |
maxiter = MAXITER*nstarget; |
441 |
> |
for (nstaken = ntrials = 0; nstaken < nstarget && |
442 |
> |
ntrials < maxiter; ntrials++) { |
443 |
> |
if (ntrials) |
444 |
> |
d = frandom(); |
445 |
> |
else |
446 |
> |
d = urand(ilhash(dimlist,ndims)+1823+samplendx); |
447 |
> |
multisamp(rv, 2, d); |
448 |
> |
d = 2.0*PI * rv[0]; |
449 |
> |
cosp = tcos(d) * np->u_alpha; |
450 |
> |
sinp = tsin(d) * np->v_alpha; |
451 |
> |
d = 1./sqrt(cosp*cosp + sinp*sinp); |
452 |
> |
cosp *= d; |
453 |
> |
sinp *= d; |
454 |
> |
if ((0. <= specjitter) & (specjitter < 1.)) |
455 |
> |
rv[1] = 1.0 - specjitter*rv[1]; |
456 |
> |
if (rv[1] <= FTINY) |
457 |
> |
d = 1.0; |
458 |
> |
else |
459 |
> |
d = sqrt(-log(rv[1]) / |
460 |
> |
(cosp*cosp/(np->u_alpha*np->u_alpha) + |
461 |
> |
sinp*sinp/(np->v_alpha*np->v_alpha))); |
462 |
> |
for (i = 0; i < 3; i++) |
463 |
> |
sr.rdir[i] = np->prdir[i] + |
464 |
> |
d*(cosp*np->u[i] + sinp*np->v[i]); |
465 |
> |
if (DOT(sr.rdir, r->ron) >= -FTINY) |
466 |
> |
continue; |
467 |
> |
normalize(sr.rdir); /* OK, normalize */ |
468 |
> |
if (nstaken) /* multi-sampling */ |
469 |
> |
rayclear(&sr); |
470 |
> |
rayvalue(&sr); |
471 |
> |
multcolor(sr.rcol, sr.rcoef); |
472 |
> |
addcolor(r->rcol, sr.rcol); |
473 |
> |
++nstaken; |
474 |
> |
} |
475 |
|
ndims--; |
476 |
|
} |
477 |
|
} |