diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 15:11:03 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-23 13:12:26 +0300 |
| commit | 4a5ee1a5a2adc8032cf710357081d3a1e3fcad95 (patch) | |
| tree | e6da17d7fa18f7008ea8bfb0dd3ef9cd475c1a2c /intern/cycles/kernel/shaders | |
| parent | 2838cf0dfe6c8b435cc54881bf548e2bbb0096ae (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/kernel/shaders')
| -rw-r--r-- | intern/cycles/kernel/shaders/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/node_displacement.osl | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt index 83cfdbcf8ba..fb983a44579 100644 --- a/intern/cycles/kernel/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/shaders/CMakeLists.txt @@ -23,6 +23,7 @@ set(SRC_OSL node_convert_from_point.osl node_convert_from_vector.osl node_diffuse_bsdf.osl + node_displacement.osl node_emission.osl node_environment_texture.osl node_fresnel.osl diff --git a/intern/cycles/kernel/shaders/node_displacement.osl b/intern/cycles/kernel/shaders/node_displacement.osl new file mode 100644 index 00000000000..fb81533c778 --- /dev/null +++ b/intern/cycles/kernel/shaders/node_displacement.osl @@ -0,0 +1,29 @@ +/* + * Copyright 2011-2013 Blender Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "stdosl.h" + +shader node_displacement( + float Height = 0.0, + float Scale = 1.0, + normal Normal = N, + output vector Displacement = vector(0.0, 0.0, 0.0)) +{ + Displacement = normalize(transform("object", Normal)); + Displacement *= Height * Scale; + Displacement = transform("object", "world", Displacement); +} + |