archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Render feature: the END OF DIFFUSE BANDING!

Browse Source 
http://www.blender.org/development/current-projects/changes-since-244/rendering-features/

Thanks Andy for poking and analysing, and Nathan for feedback!
This commit is contained in:
Ton Roosendaal
2007-12-28 13:11:27 +00:00
parent 1b72bc9792
commit a85c1c8a65
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/makesdna/DNA_material_types.h
View File

@@ -79,7 +79,7 @@ typedef struct Material {
float aniso_gloss_mir; float aniso_gloss_mir;
float dist_mir; float dist_mir;
short fadeto_mir; short fadeto_mir;
short pad1; short shade_flag; /* like Cubic interpolation */
int mode, mode_l; /* mode_l is the or-ed result of all layer modes */ int mode, mode_l; /* mode_l is the or-ed result of all layer modes */
short flarec, starc, linec, ringc; short flarec, starc, linec, ringc;
@@ -201,6 +201,9 @@ typedef struct Material {
#define MA_RAYMIR_FADETOSKY 0 #define MA_RAYMIR_FADETOSKY 0
#define MA_RAYMIR_FADETOMAT 1 #define MA_RAYMIR_FADETOMAT 1
/* shade_flag */
#define MA_CUBIC 1
/* diff_shader */ /* diff_shader */
#define MA_DIFF_LAMBERT 0 #define MA_DIFF_LAMBERT 0
#define MA_DIFF_ORENNAYAR 1 #define MA_DIFF_ORENNAYAR 1

5
source/blender/render/intern/source/shadeoutput.c
View File

@@ -1297,7 +1297,10 @@ static void shade_one_light(LampRen *lar, ShadeInput *shi, ShadeResult *shr, int
else is= inp; // Lambert else is= inp; // Lambert
} }
/* i is diffuse */ /* 'is' is diffuse */
if((ma->shade_flag & MA_CUBIC) && is>0.0f)
is= 3.0*is*is - 2.0*is*is*is; // nicer termination of shades
i= is*phongcorr; i= is*phongcorr;
if(i>0.0f) { if(i>0.0f) {

3
source/blender/src/buttons_shading.c
View File

@@ -3791,7 +3791,8 @@ static void material_panel_shading(Material *ma)
uiDefButBitI(block, TOG, MA_SHADOW, B_MATPRV, "Shadow", 245,140,65,19, &(ma->mode), 0, 0, 0, 0, "Makes material receive shadows"); uiDefButBitI(block, TOG, MA_SHADOW, B_MATPRV, "Shadow", 245,140,65,19, &(ma->mode), 0, 0, 0, 0, "Makes material receive shadows");
uiDefButBitI(block, TOG, MA_SHADOW_TRA, B_MATPRV, "TraShadow", 245,120,65,19, &(ma->mode), 0, 0, 0, 0, "Receives transparent shadows based at material color and alpha"); uiDefButBitI(block, TOG, MA_SHADOW_TRA, B_MATPRV, "TraShadow", 245,120,65,19, &(ma->mode), 0, 0, 0, 0, "Receives transparent shadows based at material color and alpha");
uiDefButBitI(block, TOG, MA_ONLYSHADOW, B_MATPRV, "OnlyShad", 245,100,65,20, &(ma->mode), 0, 0, 0, 0, "Renders shadows on material as Alpha value"); uiDefButBitI(block, TOG, MA_ONLYSHADOW, B_MATPRV, "OnlyShad", 245,100,65,20, &(ma->mode), 0, 0, 0, 0, "Renders shadows on material as Alpha value");
uiDefButBitI(block, TOG, MA_RAYBIAS, B_MATPRV, "Bias", 245,80,65,19, &(ma->mode), 0, 0, 0, 0, "Prevents ray traced shadow errors with phong interpolated normals (terminator problem)"); uiDefButBitS(block, TOG, MA_CUBIC, B_MATPRV, "Cubic", 245,80,65,19, &(ma->shade_flag), 0, 0, 0, 0, "Use Cubic interpolation of diffuse values, for smoother transitions)");
uiDefButBitI(block, TOG, MA_RAYBIAS, B_MATPRV, "Bias", 245,60,65,19, &(ma->mode), 0, 0, 0, 0, "Prevents ray traced shadow errors with phong interpolated normals (terminator problem)");
uiBlockBeginAlign(block); uiBlockBeginAlign(block);
uiDefIDPoinBut(block, test_grouppoin_but, ID_GR, B_MATPRV, "GR:", 9, 55, 150, 19, &ma->group, "Limit Lighting to Lamps in this Group"); uiDefIDPoinBut(block, test_grouppoin_but, ID_GR, B_MATPRV, "GR:", 9, 55, 150, 19, &ma->group, "Limit Lighting to Lamps in this Group");