Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: add strength input for normal map node.

Browse Source
This commit is contained in:
Brecht Van Lommel
2012-11-08 16:35:20 +00:00
parent 4063db3f61
commit e73408f247
5 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
intern/cycles/render/nodes.cpp
View File

@@ -3032,7 +3032,9 @@ NormalMapNode::NormalMapNode()
attribute = ustring("");
add_input("NormalIn", SHADER_SOCKET_NORMAL, ShaderInput::NORMAL, true);
add_input("Strength", SHADER_SOCKET_FLOAT, 1.0f);
add_input("Color", SHADER_SOCKET_COLOR);
add_output("Normal", SHADER_SOCKET_NORMAL);
}
@@ -3055,6 +3057,7 @@ void NormalMapNode::attributes(AttributeRequestSet *attributes)
void NormalMapNode::compile(SVMCompiler& compiler)
{
ShaderInput *color_in = input("Color");
ShaderInput *strength_in = input("Strength");
ShaderOutput *normal_out = output("Normal");
int attr = 0, attr_sign = 0;
@@ -3070,11 +3073,13 @@ void NormalMapNode::compile(SVMCompiler& compiler)
}
compiler.stack_assign(color_in);
compiler.stack_assign(strength_in);
compiler.stack_assign(normal_out);
compiler.add_node(NODE_NORMAL_MAP,
compiler.encode_uchar4(
color_in->stack_offset,
strength_in->stack_offset,
normal_out->stack_offset,
space_enum[space]),
attr, attr_sign);