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

- another fix, to make sure radio colors work local during tracing...

Browse Source 
this will be quite a lot of reconstruction, if i want to go for
  refraction, caustics, pathlights, etc... :/
This commit is contained in:
Ton Roosendaal
2003-12-12 23:40:35 +00:00
parent b2357b5bc6
commit d0159a9879
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/render/intern/source/rendercore.c
View File

@@ -1873,9 +1873,16 @@ void shade_lamp_loop(int mask)
}
}
/* sum shading here, to make all variables local (because of raytrace) */
if(ir<0.0) ir= 0.0; else ir*= ma->r;
ir+= ma->ambr +ma->amb*R.rad[0];
if(ig<0.0) ig= 0.0; else ig*= ma->g;
ig+= ma->ambg +ma->amb*R.rad[1];
if(ib<0.0) ib= 0.0; else ib*= ma->b;
ib+= ma->ambb +ma->amb*R.rad[2];
if(isr<0.0) isr= 0.0;
if(isg<0.0) isg= 0.0;
if(isb<0.0) isb= 0.0;
@@ -1911,24 +1918,24 @@ void shade_lamp_loop(int mask)
}
if(R.refcol[0]==0.0) {
a= 65535.0*( ir +ma->ambr +isr +ma->amb*R.rad[0]);
a= 65535.0*( ir + isr);
if(a>65535) a=65535; else if(a<0) a= 0;
shortcol[0]= a;
a= 65535.0*(ig +ma->ambg +isg +ma->amb*R.rad[1]);
a= 65535.0*(ig + isg);
if(a>65535) a=65535; else if(a<0) a= 0;
shortcol[1]= a;
a= 65535*(ib +ma->ambb +isb + ma->amb*R.rad[2]);
a= 65535*(ib + isb);
if(a>65535) a=65535; else if(a<0) a= 0;
shortcol[2]= a;
}
else {
a= 65535.0*( ma->mirr*R.refcol[1] + (1.0 - ma->mirr*R.refcol[0])*(ir +ma->ambr +ma->amb*R.rad[0]) +isr);
a= 65535.0*( ma->mirr*R.refcol[1] + (1.0 - ma->mirr*R.refcol[0])*ir +isr);
if(a>65535) a=65535; else if(a<0) a= 0;
shortcol[0]= a;
a= 65535.0*( ma->mirg*R.refcol[2] + (1.0 - ma->mirg*R.refcol[0])*(ig +ma->ambg +ma->amb*R.rad[1]) +isg);
a= 65535.0*( ma->mirg*R.refcol[2] + (1.0 - ma->mirg*R.refcol[0])*ig +isg);
if(a>65535) a=65535; else if(a<0) a= 0;
shortcol[1]= a;
a= 65535.0*( ma->mirb*R.refcol[3] + (1.0 - ma->mirb*R.refcol[0])*(ib +ma->ambb +ma->amb*R.rad[2]) +isb);
a= 65535.0*( ma->mirb*R.refcol[3] + (1.0 - ma->mirb*R.refcol[0])*ib +isb);
if(a>65535) a=65535; else if(a<0) a= 0;
shortcol[2]= a;
}