diff options
author | Ton Roosendaal <ton@blender.org> | 2004-11-13 21:30:07 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2004-11-13 21:30:07 +0300 |
commit | 59f08429ab8e33fee6a66d3f80b769dcc48eee37 (patch) | |
tree | 1ad8cdffb20690b003253968189e15b9556a3ffa | |
parent | b236448386df9ae4145ead2e901e3132ef3ed75a (diff) |
Fix for bug #1791
- onlyshadow material defaulted to black when no shadow calc was used, is
now 100% transparent
- AO 'shadows' were not included in onlyshadow material
- alpha render appeared to be wrong since 2.32... it was gamma corrected
giving difference in OSA render with 'Gamma' on
That alpha issue i am going to tackle once, it is not well functioning, and
might be combined with new 'transmission' colors idea
-rw-r--r-- | source/blender/render/intern/source/rendercore.c | 119 |
1 files changed, 73 insertions, 46 deletions
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index d2687116302..296acc796a5 100644 --- a/source/blender/render/intern/source/rendercore.c +++ b/source/blender/render/intern/source/rendercore.c @@ -1906,65 +1906,91 @@ void shade_lamp_loop(ShadeInput *shi, ShadeResult *shr) if(ma->mode & MA_ONLYSHADOW) { float ir; - shadfac[3]= ir= 0.0; - for(a=0; a<R.totlamp; a++) { - lar= R.la[a]; - /* yafray: ignore shading by photonlights, not used in Blender */ - if (lar->type==LA_YF_PHOTON) continue; + if(R.r.mode & R_SHADOW) { - if(lar->mode & LA_LAYER) if((lar->lay & vlr->lay)==0) continue; - - lv[0]= shi->co[0]-lar->co[0]; - lv[1]= shi->co[1]-lar->co[1]; - lv[2]= shi->co[2]-lar->co[2]; + shadfac[3]= ir= 0.0; + for(a=0; a<R.totlamp; a++) { + lar= R.la[a]; + /* yafray: ignore shading by photonlights, not used in Blender */ + if (lar->type==LA_YF_PHOTON) continue; + + if(lar->mode & LA_LAYER) if((lar->lay & vlr->lay)==0) continue; + + lv[0]= shi->co[0]-lar->co[0]; + lv[1]= shi->co[1]-lar->co[1]; + lv[2]= shi->co[2]-lar->co[2]; - if(lar->type==LA_SPOT) { - /* only test within spotbundel */ - if(lar->shb || (lar->mode & LA_SHAD_RAY)) { + if(lar->type==LA_SPOT) { + /* only test within spotbundel */ + if(lar->shb || (lar->mode & LA_SHAD_RAY)) { - Normalise(lv); - inpr= lv[0]*lar->vec[0]+lv[1]*lar->vec[1]+lv[2]*lar->vec[2]; - if(inpr>lar->spotsi) { - - inp= vn[0]*lv[0] + vn[1]*lv[1] + vn[2]*lv[2]; - - if(lar->shb) i = testshadowbuf(lar->shb, shi->co, inp); - else { - float shad[4]; - ray_shadow(shi, lar, shad); - i= shad[3]; + Normalise(lv); + inpr= lv[0]*lar->vec[0]+lv[1]*lar->vec[1]+lv[2]*lar->vec[2]; + if(inpr>lar->spotsi) { + + inp= vn[0]*lv[0] + vn[1]*lv[1] + vn[2]*lv[2]; + + if(lar->shb) i = testshadowbuf(lar->shb, shi->co, inp); + else { + float shad[4]; + ray_shadow(shi, lar, shad); + i= shad[3]; + } + + t= inpr - lar->spotsi; + if(t<lar->spotbl && lar->spotbl!=0.0) { + t/= lar->spotbl; + t*= t; + i= t*i+(1.0-t); + } + + shadfac[3]+= i; + ir+= 1.0; } - - t= inpr - lar->spotsi; - if(t<lar->spotbl && lar->spotbl!=0.0) { - t/= lar->spotbl; - t*= t; - i= t*i+(1.0-t); + else { + shadfac[3]+= 1.0; + ir+= 1.0; } - - shadfac[3]+= i; - ir+= 1.0; } - else { - shadfac[3]+= 1.0; + } + else if(lar->mode & LA_SHAD_RAY) { + float shad[4]; + + /* single sided? */ + if( vlr->n[0]*lv[0] + vlr->n[1]*lv[1] + vlr->n[2]*lv[2] > -0.01) { + ray_shadow(shi, lar, shad); + shadfac[3]+= shad[3]; ir+= 1.0; } } + } - else if(lar->mode & LA_SHAD_RAY) { - float shad[4]; - - /* single sided? */ - if( vlr->n[0]*lv[0] + vlr->n[1]*lv[1] + vlr->n[2]*lv[2] > -0.01) { - ray_shadow(shi, lar, shad); - shadfac[3]+= shad[3]; - ir+= 1.0; - } + if(ir>0.0) { + shadfac[3]/= ir; + shr->alpha= (shi->mat->alpha)*(1.0-shadfac[3]); } + } + + if((R.wrld.mode & WO_AMB_OCC) && (R.r.mode & R_RAYTRACE) && shi->matren->amb!=0.0) { + float f; + ray_ao(shi, &R.wrld, shadfac); // shadfac==0: full light + shadfac[3]= 1.0-shadfac[3]; + + f= R.wrld.aoenergy*shadfac[3]*shi->matren->amb; + + if(R.wrld.aomix==WO_AOADD) { + shr->alpha += f; + shr->alpha *= f; + } + else if(R.wrld.aomix==WO_AOSUB) { + shr->alpha += f; + } + else { + shr->alpha *= f; + shr->alpha += f; + } } - if(ir>0.0) shadfac[3]/= ir; - shr->alpha= (shi->mat->alpha)*(1.0-shadfac[3]); return; } @@ -2856,6 +2882,7 @@ void shadepixel_short(float x, float y, int vlaknr, int mask, unsigned short *sh shortcol[0]= igamtab2[ shortcol[0] ]; shortcol[1]= igamtab2[ shortcol[1] ]; shortcol[2]= igamtab2[ shortcol[2] ]; + shortcol[3]= igamtab2[ shortcol[3] ]; } if(R.r.dither_intensity!=0.0) { |