forked from bartvdbraak/blender
Cycles:
* Added 2 new nodes to combine and separate HSV colors. Screenshot: http://www.pasteall.org/pic/show.php?id=54828
This commit is contained in:
parent
e7fc69bdfd
commit
285ef99931
@ -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();
|
||||
}
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
29
intern/cycles/kernel/shaders/node_combine_hsv.osl
Normal file
29
intern/cycles/kernel/shaders/node_combine_hsv.osl
Normal file
@ -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);
|
||||
}
|
||||
|
33
intern/cycles/kernel/shaders/node_separate_hsv.osl
Normal file
33
intern/cycles/kernel/shaders/node_separate_hsv.osl
Normal file
@ -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];
|
||||
}
|
@ -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;
|
||||
|
56
intern/cycles/kernel/svm/svm_sepcomb_hsv.h
Normal file
56
intern/cycles/kernel/svm/svm_sepcomb_hsv.h
Normal file
@ -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
|
||||
|
@ -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,
|
||||
|
@ -2644,6 +2644,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")
|
||||
@ -2737,7 +2768,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")
|
||||
{
|
||||
|
@ -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)
|
||||
|
@ -227,6 +227,8 @@ shader_node_categories = [
|
||||
NodeItem("ShaderNodeVectorMath"),
|
||||
NodeItem("ShaderNodeSeparateRGB"),
|
||||
NodeItem("ShaderNodeCombineRGB"),
|
||||
NodeItem("ShaderNodeSeparateHSV"),
|
||||
NodeItem("ShaderNodeCombineHSV"),
|
||||
NodeItem("ShaderNodeWavelength"),
|
||||
NodeItem("ShaderNodeBlackbody"),
|
||||
]),
|
||||
|
@ -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
|
||||
|
@ -3427,6 +3427,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();
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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", "" )
|
||||
|
80
source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
Normal file
80
source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
Normal file
@ -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);
|
||||
}
|
Loading…
Reference in New Issue
Block a user