diff options
| author | M.G. Kishalmi <lmg@kishalmi.net> | 2011-01-29 14:56:11 +0300 |
|---|---|---|
| committer | M.G. Kishalmi <lmg@kishalmi.net> | 2011-01-29 14:56:11 +0300 |
| commit | c709524dc9a2489c9f0af7107ad5246952d2250f (patch) | |
| tree | 65cb718e1d05f7fe017272befe8ba5fdb8c9e646 /source/blender/render/intern/include/texture.h | |
| parent | e7e5fa06301430d8c37b302ca70c45a216bc16cf (diff) | |
new bumpmapping options for the renderer
oldbump -> original
newbump -> compatible
*new* -> default (3tap)
*new* -> best quality (5tap)
the latter two have an option to apply bumpmapping in
viewspace - much like displacement mapping
objectspace - default (scales with the object)
texturespace - much like normal mapping (scales)
Diffstat (limited to 'source/blender/render/intern/include/texture.h')
| -rw-r--r-- | source/blender/render/intern/include/texture.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/render/intern/include/texture.h b/source/blender/render/intern/include/texture.h index fb941d1b7f3..8eb91f3299f 100644 --- a/source/blender/render/intern/include/texture.h +++ b/source/blender/render/intern/include/texture.h @@ -48,6 +48,7 @@ if(tex->saturation != 1.0f) { \ hsv_to_rgb(_hsv[0], _hsv[1], _hsv[2], &texres->tr, &texres->tg, &texres->tb); \ } \ +#define RGBTOBW(r,g,b) ( r*0.35 + g*0.45 + b*0.2 ) /* keep this in sync with gpu_shader_material.glsl:rgbtobw */ struct HaloRen; struct ShadeInput; |