Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-13 15:11:03 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-01-23 13:12:26 +0300
commit4a5ee1a5a2adc8032cf710357081d3a1e3fcad95 (patch)
treee6da17d7fa18f7008ea8bfb0dd3ef9cd475c1a2c /intern/cycles/render/nodes.cpp
parent2838cf0dfe6c8b435cc54881bf548e2bbb0096ae (diff)
Cycles: add Displacement node.
This converts object space height to world space displacement, to be linked to the new vector displacement material output. Differential Revision: https://developer.blender.org/D3015
Diffstat (limited to 'intern/cycles/render/nodes.cpp')
-rw-r--r--intern/cycles/render/nodes.cpp39
1 files changed, 39 insertions, 0 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 4452fadaf02..87e8ec3d3cc 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -5644,4 +5644,43 @@ void BevelNode::compile(OSLCompiler& compiler)
compiler.add(this, "node_bevel");
}
+/* Displacement */
+
+NODE_DEFINE(DisplacementNode)
+{
+ NodeType* type = NodeType::add("displacement", create, NodeType::SHADER);
+
+ SOCKET_IN_FLOAT(height, "Height", 0.0f);
+ SOCKET_IN_FLOAT(scale, "Scale", 1.0f);
+ SOCKET_IN_NORMAL(normal, "Normal", make_float3(0.0f, 0.0f, 0.0f), SocketType::LINK_NORMAL);
+
+ SOCKET_OUT_VECTOR(displacement, "Displacement");
+
+ return type;
+}
+
+DisplacementNode::DisplacementNode()
+: ShaderNode(node_type)
+{
+}
+
+void DisplacementNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *height_in = input("Height");
+ ShaderInput *scale_in = input("Scale");
+ ShaderInput *normal_in = input("Normal");
+ ShaderOutput *displacement_out = output("Displacement");
+
+ compiler.add_node(NODE_DISPLACEMENT,
+ compiler.encode_uchar4(compiler.stack_assign(height_in),
+ compiler.stack_assign(scale_in),
+ compiler.stack_assign_if_linked(normal_in),
+ compiler.stack_assign(displacement_out)));
+}
+
+void DisplacementNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_displacement");
+}
+
CCL_NAMESPACE_END