diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index b72ea1a9f7b..469ba15d291 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -231,6 +231,12 @@ static ShaderNode *add_node(Scene *scene, BL::BlendData b_data, BL::Scene b_scen else if (b_node.is_a(&RNA_ShaderNodeCombineRGB)) { node = new CombineRGBNode(); } + else if (b_node.is_a(&RNA_ShaderNodeSeparateHSV)) { + node = new SeparateHSVNode(); + } + else if (b_node.is_a(&RNA_ShaderNodeCombineHSV)) { + node = new CombineHSVNode(); + } else if (b_node.is_a(&RNA_ShaderNodeHueSaturation)) { node = new HSVNode(); } diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 184aaecc901..963ec652784 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -100,6 +100,7 @@ set(SRC_SVM_HEADERS svm/svm_normal.h svm/svm_ramp.h svm/svm_sepcomb_rgb.h + svm/svm_sepcomb_hsv.h svm/svm_sky.h svm/svm_tex_coord.h svm/svm_texture.h diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt index df1b6ee442d..660cfbce528 100644 --- a/intern/cycles/kernel/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/shaders/CMakeLists.txt @@ -12,6 +12,7 @@ set(SRC_OSL node_camera.osl node_checker_texture.osl node_combine_rgb.osl + node_combine_hsv.osl node_convert_from_color.osl node_convert_from_float.osl node_convert_from_int.osl @@ -53,6 +54,7 @@ set(SRC_OSL node_rgb_curves.osl node_rgb_ramp.osl node_separate_rgb.osl + node_separate_hsv.osl node_set_normal.osl node_sky_texture.osl node_subsurface_scattering.osl diff --git a/intern/cycles/kernel/shaders/node_combine_hsv.osl b/intern/cycles/kernel/shaders/node_combine_hsv.osl new file mode 100644 index 00000000000..a5c889e340f --- /dev/null +++ b/intern/cycles/kernel/shaders/node_combine_hsv.osl @@ -0,0 +1,29 @@ +/* + * Copyright 2013, 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_combine_hsv( + float H = 0.0, + float S = 0.0, + float V = 0.0, + output color Color = 0.8) +{ + Color = color("hsv", H, S, V); +} + diff --git a/intern/cycles/kernel/shaders/node_separate_hsv.osl b/intern/cycles/kernel/shaders/node_separate_hsv.osl new file mode 100644 index 00000000000..0f074bf23b5 --- /dev/null +++ b/intern/cycles/kernel/shaders/node_separate_hsv.osl @@ -0,0 +1,33 @@ +/* + * Copyright 2013, 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" +#include "node_color.h" + +shader node_separate_hsv( + color Color = 0.8, + output float H = 0.0, + output float S = 0.0, + output float V = 0.0) +{ + color col = rgb_to_hsv(Color); + + H = col[0]; + S = col[1]; + V = col[2]; +} diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index 20dba59d2d0..5380bdad1ae 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -170,6 +170,7 @@ CCL_NAMESPACE_END #include "svm_mix.h" #include "svm_ramp.h" #include "svm_sepcomb_rgb.h" +#include "svm_sepcomb_hsv.h" #include "svm_musgrave.h" #include "svm_sky.h" #include "svm_tex_coord.h" @@ -340,6 +341,12 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT case NODE_COMBINE_RGB: svm_node_combine_rgb(sd, stack, node.y, node.z, node.w); break; + case NODE_SEPARATE_HSV: + svm_node_separate_hsv(kg, sd, stack, node.y, node.z, node.w, &offset); + break; + case NODE_COMBINE_HSV: + svm_node_combine_hsv(kg, sd, stack, node.y, node.z, node.w, &offset); + break; case NODE_HSV: svm_node_hsv(kg, sd, stack, node.y, node.z, node.w, &offset); break; diff --git a/intern/cycles/kernel/svm/svm_sepcomb_hsv.h b/intern/cycles/kernel/svm/svm_sepcomb_hsv.h new file mode 100644 index 00000000000..d349d0efe87 --- /dev/null +++ b/intern/cycles/kernel/svm/svm_sepcomb_hsv.h @@ -0,0 +1,56 @@ +/* + * Copyright 2013, 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_combine_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, uint hue_in, uint saturation_in, uint value_in, int *offset) +{ + uint4 node1 = read_node(kg, offset); + uint color_out = node1.y; + + float hue = stack_load_float(stack, hue_in); + float saturation = stack_load_float(stack, saturation_in); + float value = stack_load_float(stack, value_in); + + /* Combine, and convert back to RGB */ + float3 color = hsv_to_rgb(make_float3(hue, saturation, value)); + + if (stack_valid(color_out)) + stack_store_float3(stack, color_out, color); +} + +__device void svm_node_separate_hsv(KernelGlobals *kg, ShaderData *sd, float *stack, uint color_in, uint hue_out, uint saturation_out, int *offset) +{ + uint4 node1 = read_node(kg, offset); + uint value_out = node1.y; + + float3 color = stack_load_float3(stack, color_in); + + /* Convert to HSV */ + color = rgb_to_hsv(color); + + if (stack_valid(hue_out)) + stack_store_float(stack, hue_out, color.x); + if (stack_valid(saturation_out)) + stack_store_float(stack, saturation_out, color.y); + if (stack_valid(value_out)) + stack_store_float(stack, value_out, color.z); +} + +CCL_NAMESPACE_END + diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h index 41788903e21..dbfb8d48fbf 100644 --- a/intern/cycles/kernel/svm/svm_types.h +++ b/intern/cycles/kernel/svm/svm_types.h @@ -83,6 +83,8 @@ typedef enum NodeType { NODE_CLOSURE_VOLUME, NODE_SEPARATE_RGB, NODE_COMBINE_RGB, + NODE_SEPARATE_HSV, + NODE_COMBINE_HSV, NODE_HSV, NODE_CAMERA, NODE_INVERT, diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index bd718ed51e5..b5107315d4c 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -2651,6 +2651,37 @@ void CombineRGBNode::compile(OSLCompiler& compiler) compiler.add(this, "node_combine_rgb"); } +/* Combine HSV */ +CombineHSVNode::CombineHSVNode() +: ShaderNode("combine_hsv") +{ + add_input("H", SHADER_SOCKET_FLOAT); + add_input("S", SHADER_SOCKET_FLOAT); + add_input("V", SHADER_SOCKET_FLOAT); + add_output("Color", SHADER_SOCKET_COLOR); +} + +void CombineHSVNode::compile(SVMCompiler& compiler) +{ + ShaderInput *hue_in = input("H"); + ShaderInput *saturation_in = input("S"); + ShaderInput *value_in = input("V"); + ShaderOutput *color_out = output("Color"); + + compiler.stack_assign(color_out); + compiler.stack_assign(hue_in); + compiler.stack_assign(saturation_in); + compiler.stack_assign(value_in); + + compiler.add_node(NODE_COMBINE_HSV, hue_in->stack_offset, saturation_in->stack_offset, value_in->stack_offset); + compiler.add_node(NODE_COMBINE_HSV, color_out->stack_offset); +} + +void CombineHSVNode::compile(OSLCompiler& compiler) +{ + compiler.add(this, "node_combine_hsv"); +} + /* Gamma */ GammaNode::GammaNode() : ShaderNode("gamma") @@ -2744,7 +2775,39 @@ void SeparateRGBNode::compile(OSLCompiler& compiler) compiler.add(this, "node_separate_rgb"); } -/* Separate RGB */ +/* Separate HSV */ +SeparateHSVNode::SeparateHSVNode() +: ShaderNode("separate_rgb") +{ + add_input("Color", SHADER_SOCKET_COLOR); + add_output("H", SHADER_SOCKET_FLOAT); + add_output("S", SHADER_SOCKET_FLOAT); + add_output("V", SHADER_SOCKET_FLOAT); +} + +void SeparateHSVNode::compile(SVMCompiler& compiler) +{ + ShaderInput *color_in = input("Color"); + ShaderOutput *hue_out = output("H"); + ShaderOutput *saturation_out = output("S"); + ShaderOutput *value_out = output("V"); + + compiler.stack_assign(color_in); + compiler.stack_assign(hue_out); + compiler.stack_assign(saturation_out); + compiler.stack_assign(value_out); + + compiler.add_node(NODE_SEPARATE_HSV, color_in->stack_offset, hue_out->stack_offset, saturation_out->stack_offset); + compiler.add_node(NODE_SEPARATE_HSV, value_out->stack_offset); + +} + +void SeparateHSVNode::compile(OSLCompiler& compiler) +{ + compiler.add(this, "node_separate_hsv"); +} + +/* Hue Saturation Value */ HSVNode::HSVNode() : ShaderNode("hsv") { diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h index 4aeec4491ad..46b426ea20b 100644 --- a/intern/cycles/render/nodes.h +++ b/intern/cycles/render/nodes.h @@ -407,6 +407,11 @@ public: SHADER_NODE_CLASS(CombineRGBNode) }; +class CombineHSVNode : public ShaderNode { +public: + SHADER_NODE_CLASS(CombineHSVNode) +}; + class GammaNode : public ShaderNode { public: SHADER_NODE_CLASS(GammaNode) @@ -422,6 +427,11 @@ public: SHADER_NODE_CLASS(SeparateRGBNode) }; +class SeparateHSVNode : public ShaderNode { +public: + SHADER_NODE_CLASS(SeparateHSVNode) +}; + class HSVNode : public ShaderNode { public: SHADER_NODE_CLASS(HSVNode) diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 915fa276b26..91090dc2c75 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -227,6 +227,8 @@ shader_node_categories = [ NodeItem("ShaderNodeVectorMath"), NodeItem("ShaderNodeSeparateRGB"), NodeItem("ShaderNodeCombineRGB"), + NodeItem("ShaderNodeSeparateHSV"), + NodeItem("ShaderNodeCombineHSV"), NodeItem("ShaderNodeWavelength"), NodeItem("ShaderNodeBlackbody"), ]), diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 5f84450045f..c151d47334e 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -744,6 +744,8 @@ struct ShadeResult; #define SH_NODE_WAVELENGTH 180 #define SH_NODE_BLACKBODY 181 #define SH_NODE_VECT_TRANSFORM 182 +#define SH_NODE_SEPHSV 183 +#define SH_NODE_COMBHSV 184 /* custom defines options for Material node */ #define SH_NODE_MAT_DIFF 1 diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 1f7d1c84bbe..5001aa01653 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -3424,6 +3424,8 @@ static void registerShaderNodes(void) register_node_type_sh_invert(); register_node_type_sh_seprgb(); register_node_type_sh_combrgb(); + register_node_type_sh_sephsv(); + register_node_type_sh_combhsv(); register_node_type_sh_hue_sat(); register_node_type_sh_attribute(); diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 3241f98ad1e..64261246e3d 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -140,6 +140,7 @@ set(SRC shader/nodes/node_shader_output.c shader/nodes/node_shader_rgb.c shader/nodes/node_shader_sepcombRGB.c + shader/nodes/node_shader_sepcombHSV.c shader/nodes/node_shader_squeeze.c shader/nodes/node_shader_texture.c shader/nodes/node_shader_valToRgb.c diff --git a/source/blender/nodes/NOD_shader.h b/source/blender/nodes/NOD_shader.h index a8c77a9baed..ec39d81618d 100644 --- a/source/blender/nodes/NOD_shader.h +++ b/source/blender/nodes/NOD_shader.h @@ -70,6 +70,8 @@ void register_node_type_sh_material_ext(void); void register_node_type_sh_invert(void); void register_node_type_sh_seprgb(void); void register_node_type_sh_combrgb(void); +void register_node_type_sh_sephsv(void); +void register_node_type_sh_combhsv(void); void register_node_type_sh_hue_sat(void); void register_node_type_sh_tex_brick(void); diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 81f3fbf7432..0b526fcde0e 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -115,6 +115,8 @@ DefNode( ShaderNode, SH_NODE_TEX_CHECKER, def_sh_tex_checker, "TE DefNode( ShaderNode, SH_NODE_TEX_BRICK, def_sh_tex_brick, "TEX_BRICK", TexBrick, "Brick Texture", "" ) DefNode( ShaderNode, SH_NODE_TEX_COORD, def_sh_tex_coord, "TEX_COORD", TexCoord, "Texture Coordinate","" ) DefNode( ShaderNode, SH_NODE_VECT_TRANSFORM, def_sh_vect_transform, "VECT_TRANSFORM", VectorTransform, "Vector Transform", "" ) +DefNode( ShaderNode, SH_NODE_SEPHSV, 0, "SEPHSV", SeparateHSV, "Separate HSV", "" ) +DefNode( ShaderNode, SH_NODE_COMBHSV, 0, "COMBHSV", CombineHSV, "Combine HSV", "" ) DefNode( CompositorNode, CMP_NODE_VIEWER, def_cmp_viewer, "VIEWER", Viewer, "Viewer", "" ) DefNode( CompositorNode, CMP_NODE_RGB, 0, "RGB", RGB, "RGB", "" ) diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c b/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c new file mode 100644 index 00000000000..707e295241a --- /dev/null +++ b/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c @@ -0,0 +1,80 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * 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. + * + * The Original Code is Copyright (C) 2013 Blender Foundation. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file blender/nodes/shader/nodes/node_shader_sepcombHSV.c + * \ingroup shdnodes + */ + + +#include "node_shader_util.h" + +/* **************** SEPARATE HSV ******************** */ +static bNodeSocketTemplate sh_node_sephsv_in[] = { + { SOCK_RGBA, 1, N_("Color"), 0.8f, 0.8f, 0.8f, 1.0f}, + { -1, 0, "" } +}; +static bNodeSocketTemplate sh_node_sephsv_out[] = { + { SOCK_FLOAT, 0, N_("H")}, + { SOCK_FLOAT, 0, N_("S")}, + { SOCK_FLOAT, 0, N_("V")}, + { -1, 0, "" } +}; + +void register_node_type_sh_sephsv(void) +{ + static bNodeType ntype; + + sh_node_type_base(&ntype, SH_NODE_SEPHSV, "Separate HSV", NODE_CLASS_CONVERTOR, 0); + node_type_compatibility(&ntype, NODE_NEW_SHADING); + node_type_socket_templates(&ntype, sh_node_sephsv_in, sh_node_sephsv_out); + + nodeRegisterType(&ntype); +} + + +/* **************** COMBINE HSV ******************** */ +static bNodeSocketTemplate sh_node_combhsv_in[] = { + { SOCK_FLOAT, 1, N_("H"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED}, + { SOCK_FLOAT, 1, N_("S"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED}, + { SOCK_FLOAT, 1, N_("V"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_UNSIGNED}, + { -1, 0, "" } +}; +static bNodeSocketTemplate sh_node_combhsv_out[] = { + { SOCK_RGBA, 0, N_("Color")}, + { -1, 0, "" } +}; + +void register_node_type_sh_combhsv(void) +{ + static bNodeType ntype; + + sh_node_type_base(&ntype, SH_NODE_COMBHSV, "Combine HSV", NODE_CLASS_CONVERTOR, 0); + node_type_compatibility(&ntype, NODE_NEW_SHADING); + node_type_socket_templates(&ntype, sh_node_combhsv_in, sh_node_combhsv_out); + + nodeRegisterType(&ntype); +}