From ede644969b600b3c3be50ab1584a7860d5c74d1e Mon Sep 17 00:00:00 2001 From: Robert Wenzlaff Date: Sun, 18 Jan 2004 17:17:44 +0000 Subject: [PATCH] - Made dispfact for new mtex default to 0.2. - Fine tunes scaleing of Nor channel to better match intensity chan. - removed last debug printf. --- source/blender/blenkernel/intern/texture.c | 1 + source/blender/render/intern/source/texture.c | 6 +++--- source/blender/renderconverter/intern/convertBlenderScene.c | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 2c73746d4a1..ef9431c843b 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -409,6 +409,7 @@ void default_mtex(MTex *mtex) mtex->colfac= 1.0; mtex->norfac= 0.5; mtex->varfac= 1.0; + mtex->dispfac=0.2; } diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 3a14879014c..e94d9163f5e 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -1219,9 +1219,9 @@ void do_material_tex(ShadeInput *shi) if(mtex->maptoneg & MAP_DISPLACE) tex->norfac= -mtex->norfac; else tex->norfac= mtex->norfac; - shi->displace[0]+= 0.1f*Tnor*tex->norfac*tex->nor[0]; - shi->displace[1]+= 0.1f*Tnor*tex->norfac*tex->nor[1]; - shi->displace[2]+= 0.1f*Tnor*tex->norfac*tex->nor[2]; + shi->displace[0]+= 0.2f*Tnor*tex->norfac*tex->nor[0]; + shi->displace[1]+= 0.2f*Tnor*tex->norfac*tex->nor[1]; + shi->displace[2]+= 0.2f*Tnor*tex->norfac*tex->nor[2]; } if(rgbnor & TEX_RGB) { diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index c673859bbbf..43fed2d269a 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -3041,8 +3041,6 @@ void do_displacement(Object *ob, int startface, int numface, int startvert, int obt=obt->parent; } - printf("ob scale=%f, %f, %f\n", scale[0], scale[1], scale[2]); - /* Clear all flags */ for(i=startvert; i