Cycles / HSV Separator and Combine node:

* Added nodes to separate and combine hsv colors.

Part of my GSoC 2013 project, SVN merge of r57981. 

3 files changed, 65 insertions, 0 deletions

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,