kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- Made dispfact for new mtex default to 0.2.

Browse Source 
- Fine tunes scaleing of Nor channel to better match intensity chan.
	- removed last debug printf.
This commit is contained in:
Robert Wenzlaff 2004-01-18 17:17:44 +00:00
parent 60a5328d4b
commit ede644969b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/texture.c
View File

@ -409,6 +409,7 @@ void default_mtex(MTex *mtex)
mtex->colfac= 1.0; mtex->colfac= 1.0;
mtex->norfac= 0.5; mtex->norfac= 0.5;
mtex->varfac= 1.0; mtex->varfac= 1.0;
mtex->dispfac=0.2;
} }

6
source/blender/render/intern/source/texture.c
View File

@ -1219,9 +1219,9 @@ void do_material_tex(ShadeInput *shi)
if(mtex->maptoneg & MAP_DISPLACE) tex->norfac= -mtex->norfac; if(mtex->maptoneg & MAP_DISPLACE) tex->norfac= -mtex->norfac;
else tex->norfac= mtex->norfac; else tex->norfac= mtex->norfac;
shi->displace[0]+= 0.1f*Tnor*tex->norfac*tex->nor[0]; shi->displace[0]+= 0.2f*Tnor*tex->norfac*tex->nor[0];
shi->displace[1]+= 0.1f*Tnor*tex->norfac*tex->nor[1]; shi->displace[1]+= 0.2f*Tnor*tex->norfac*tex->nor[1];
shi->displace[2]+= 0.1f*Tnor*tex->norfac*tex->nor[2]; shi->displace[2]+= 0.2f*Tnor*tex->norfac*tex->nor[2];
} }
if(rgbnor & TEX_RGB) { if(rgbnor & TEX_RGB) {

2
source/blender/renderconverter/intern/convertBlenderScene.c
View File

@ -3041,8 +3041,6 @@ void do_displacement(Object *ob, int startface, int numface, int startvert, int
obt=obt->parent; obt=obt->parent;
} }
printf("ob scale=%f, %f, %f\n", scale[0], scale[1], scale[2]);
/* Clear all flags */ /* Clear all flags */
for(i=startvert; i<startvert+numvert; i++){ for(i=startvert; i<startvert+numvert; i++){
vr= RE_findOrAddVert(i); vr= RE_findOrAddVert(i);