diff options
author | Ton Roosendaal <ton@blender.org> | 2004-01-05 23:25:07 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2004-01-05 23:25:07 +0300 |
commit | 1170f5f6ed0dff4bc43380efa72cf39d46c80603 (patch) | |
tree | a3243fa053578d26f3ae802982f6d55e4a174f8d /source/blender/blenkernel/intern/material.c | |
parent | f78c0478f5ca4016f1ad8b7a472b63513f36fb68 (diff) |
Displacement map
- changed code to make use of actual textures, not the hackish
'externtex', which is only for tools
- added a 'displacement' vector in ShadeInput, and moved calculation of
displacement vector to texture.c itself. So it works with stencil, but
also for options as 'add', 'mult' and 'sub'.
- for RGB textures it uses the brightness value of color for displace
- for stucci, and plugin textures returning a normal, it uses that
- Also: wrote call in end of preparing renderfaces, to split non-flat
quad faces in triangles. gives a lot fewer errors in displace textures,
but also raytracing irregular subsurfs goes better now.
- texture mapping that works for displace: orco, sticky, global, obj, normal.
UV not yet. Reflection-displace? uhh! :)
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index cc502b54f99..3791a95d687 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -548,16 +548,6 @@ void init_render_material(Material *ma) for(a=0; a<8; a++) { mtex= ma->mtex[a]; if(mtex && mtex->tex) { - - /* force std. ref mapping for envmap */ - if(mtex->tex->type==TEX_ENVMAP) { -/* mtex->texco= TEXCO_REFL; */ -/* mtex->projx= PROJ_X; */ -/* mtex->projy= PROJ_Y; */ -/* mtex->projz= PROJ_Z; */ -/* mtex->mapping= MTEX_FLAT; */ - } - /* do not test for mtex->object and set mtex->texco at TEXCO_ORCO: mtex is linked! */ ma->texco |= mtex->texco; ma->mapto |= mtex->mapto; |