diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2011-12-17 00:35:06 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2011-12-17 00:35:06 +0400 |
commit | 2a6fdbcccdb285664d921d59f66f96d0345124de (patch) | |
tree | 3d7b8d41a05318d43821efe43548ac8df5162d78 /intern/cycles/kernel | |
parent | 3311164b24da61f2967f96d0ee27508a7e2e0267 (diff) |
Cycles Gamma Node
Node specially useful for Texture correction.
This is also a nice example of a simple node made from scratch in case someone wants to create their custom nodes.
Review by Brecht.
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/nodes/CMakeLists.txt | 1 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/nodes/node_gamma.osl | 33 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm.h | 4 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_gamma.h | 37 | ||||
-rw-r--r-- | intern/cycles/kernel/svm/svm_types.h | 3 |
6 files changed, 78 insertions, 1 deletions
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 65338eeea6e..e17544bf7af 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -59,6 +59,7 @@ set(SRC_SVM_HEADERS svm/svm_convert.h svm/svm_displace.h svm/svm_fresnel.h + svm/svm_gamma.h svm/svm_geometry.h svm/svm_gradient.h svm/svm_hsv.h diff --git a/intern/cycles/kernel/osl/nodes/CMakeLists.txt b/intern/cycles/kernel/osl/nodes/CMakeLists.txt index 5c1fd8b75d8..1a207d6c139 100644 --- a/intern/cycles/kernel/osl/nodes/CMakeLists.txt +++ b/intern/cycles/kernel/osl/nodes/CMakeLists.txt @@ -19,6 +19,7 @@ set(SRC_OSL node_emission.osl node_environment_texture.osl node_fresnel.osl + node_gamma.osl node_geometry.osl node_glass_bsdf.osl node_glossy_bsdf.osl diff --git a/intern/cycles/kernel/osl/nodes/node_gamma.osl b/intern/cycles/kernel/osl/nodes/node_gamma.osl new file mode 100644 index 00000000000..4dae07d70bc --- /dev/null +++ b/intern/cycles/kernel/osl/nodes/node_gamma.osl @@ -0,0 +1,33 @@ +/* + * Copyright 2011, Blender Foundation. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "stdosl.h" + +shader node_gamma( + color ColorIn = color(0.8, 0.8, 0.8), + float Gamma = 1.0, + output ColorOut = color(0.8, 0.8, 0.8) +{ + int i; + for (i=0;i<3;i++) { + if (ColorIn[i] > 0.0) + ColorIn[i] = powf(ColorIn[i], Gamma); + } + + ColorOut = ColorIn; +} diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 2beff7ff7e6..5a8d6d62c79 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -130,6 +130,7 @@ CCL_NAMESPACE_END #include "svm_geometry.h" #include "svm_hsv.h" #include "svm_image.h" +#include "svm_gamma.h" #include "svm_invert.h" #include "svm_light_path.h" #include "svm_magic.h" @@ -262,6 +263,9 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_INVERT: svm_node_invert(sd, stack, node.y, node.z, node.w); break; + case NODE_GAMMA: + svm_node_gamma(sd, stack, node.y, node.z, node.w); + break; case NODE_MIX: svm_node_mix(kg, sd, stack, node.y, node.z, node.w, &offset); break; diff --git a/intern/cycles/kernel/svm/svm_gamma.h b/intern/cycles/kernel/svm/svm_gamma.h new file mode 100644 index 00000000000..4a8967011c7 --- /dev/null +++ b/intern/cycles/kernel/svm/svm_gamma.h @@ -0,0 +1,37 @@ +/* + * Copyright 2011, Blender Foundation. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +CCL_NAMESPACE_BEGIN + +__device void svm_node_gamma(ShaderData *sd, float *stack, uint in_gamma, uint in_color, uint out_color) +{ + float3 color = stack_load_float3(stack, in_color); + float gamma = stack_load_float(stack, in_gamma); + + if (color.x > 0.0) + color.x = powf(color.x, gamma); + if (color.y > 0.0) + color.y = powf(color.y, gamma); + if (color.z > 0.0) + color.z = powf(color.z, gamma); + + if (stack_valid(out_color)) + stack_store_float3(stack, out_color, color); +} + +CCL_NAMESPACE_END diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index e5e3175761b..c46df3f08c8 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/svm_types.h @@ -85,7 +85,8 @@ typedef enum NodeType { NODE_HSV = 5200, NODE_CAMERA = 5300, NODE_INVERT = 5400, - NODE_NORMAL = 5500 + NODE_NORMAL = 5500, + NODE_GAMMA = 5600 } NodeType; typedef enum NodeAttributeType { |