Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles / HSV Separator and Combine node:

Browse Source 
* Added nodes to separate and combine hsv colors.

Part of my GSoC 2013 project, SVN merge of r57981.
This commit is contained in:
Thomas Dinges
2013-07-31 21:27:48 +00:00
parent 34009da32e 285ef99931
commit 2a2f0319bc
17 changed files with 301 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/kernel/CMakeLists.txt
View File

@@ -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

2
intern/cycles/kernel/shaders/CMakeLists.txt
View File

@@ -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
View 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
View 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];
}

7
intern/cycles/kernel/svm/svm.h
View File

@@ -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
View 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

2
intern/cycles/kernel/svm/svm_types.h
View File

@@ -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,