griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bug fix #1838

Browse Source 
AO option "Use sky" or "Use tex" now also take option "Use distances" into
account, so you can control shades of AO better then.
This commit is contained in:
Ton Roosendaal
2004-11-21 22:37:06 +00:00
parent b4f035e9dc
commit 87048d0901
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/render/intern/source/ray.c
View File

@@ -1950,7 +1950,7 @@ void ray_ao(ShadeInput *shi, World *wrld, float *shadfac)
Isect isec;
float *vec, *nrm, div, bias, sh=0;
float maxdist = wrld->aodist;
int j=0, tot, actual=0;
int j=0, tot, actual=0, skyadded=0;
isec.vlrorig= shi->vlr;
isec.mode= DDA_SHADOW;
@@ -2031,19 +2031,21 @@ void ray_ao(ShadeInput *shi, World *wrld, float *shadfac)
shadfac[1]+= skycol[1];
shadfac[2]+= skycol[2];
}
skyadded++;
}
}
// samples
vec+= 3;
}
div= 1.0/(float)(actual);
shadfac[3] = 1.0 - (sh*div);
shadfac[3] = 1.0 - sh/((float)actual);
if(wrld->aocolor!=WO_AOPLAIN) {
shadfac[0] *= div;
shadfac[1] *= div;
shadfac[2] *= div;
div= shadfac[3]/((float)skyadded);
shadfac[0]*= div; // average color times distances/hits formula
shadfac[1]*= div; // average color times distances/hits formula
shadfac[2]*= div; // average color times distances/hits formula
}
}