[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42327] trunk/blender: SeparateRGB and CombineRGB nodes for Cycles materials
Dalai Felinto
dfelinto at gmail.com
Thu Dec 1 22:46:19 CET 2011
Revision: 42327
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42327
Author: dfelinto
Date: 2011-12-01 21:46:10 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
SeparateRGB and CombineRGB nodes for Cycles materials
reviewed and approved by Brecht
my first OpenCL code \o/
Modified Paths:
--------------
trunk/blender/intern/cycles/app/cycles_xml.cpp
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/intern/cycles/kernel/CMakeLists.txt
trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
trunk/blender/intern/cycles/kernel/svm/svm.h
trunk/blender/intern/cycles/kernel/svm/svm_types.h
trunk/blender/intern/cycles/render/nodes.cpp
trunk/blender/intern/cycles/render/nodes.h
trunk/blender/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
Added Paths:
-----------
trunk/blender/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
Modified: trunk/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.cpp 2011-12-01 20:02:47 UTC (rev 42326)
+++ trunk/blender/intern/cycles/app/cycles_xml.cpp 2011-12-01 21:46:10 UTC (rev 42327)
@@ -471,6 +471,12 @@
xml_read_enum(&mix->type, MixNode::type_enum, node, "type");
snode = mix;
}
+ else if(string_iequals(node.name(), "combine_rgb")) {
+ snode = new CombineRGBNode();
+ }
+ else if(string_iequals(node.name(), "separate_rgb")) {
+ snode = new SeparateRGBNode();
+ }
else if(string_iequals(node.name(), "attribute")) {
AttributeNode *attr = new AttributeNode();
xml_read_ustring(&attr->attribute, node, "attribute");
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2011-12-01 20:02:47 UTC (rev 42326)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2011-12-01 21:46:10 UTC (rev 42327)
@@ -128,7 +128,6 @@
switch(b_node.type()) {
/* not supported */
case BL::ShaderNode::type_CAMERA: break;
- case BL::ShaderNode::type_COMBRGB: break;
case BL::ShaderNode::type_CURVE_RGB: break;
case BL::ShaderNode::type_CURVE_VEC: break;
case BL::ShaderNode::type_GEOMETRY: break;
@@ -139,7 +138,6 @@
case BL::ShaderNode::type_NORMAL: break;
case BL::ShaderNode::type_OUTPUT: break;
case BL::ShaderNode::type_SCRIPT: break;
- case BL::ShaderNode::type_SEPRGB: break;
case BL::ShaderNode::type_SQUEEZE: break;
case BL::ShaderNode::type_TEXTURE: break;
case BL::ShaderNode::type_VALTORGB: break;
@@ -165,6 +163,14 @@
node = mix;
break;
}
+ case BL::ShaderNode::type_SEPRGB: {
+ node = new SeparateRGBNode();
+ break;
+ }
+ case BL::ShaderNode::type_COMBRGB: {
+ node = new CombineRGBNode();
+ break;
+ }
case BL::ShaderNode::type_RGBTOBW: {
node = new ConvertNode(SHADER_SOCKET_COLOR, SHADER_SOCKET_FLOAT);
break;
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2011-12-01 20:02:47 UTC (rev 42326)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2011-12-01 21:46:10 UTC (rev 42327)
@@ -69,6 +69,7 @@
svm/svm_musgrave.h
svm/svm_noise.h
svm/svm_noisetex.h
+ svm/svm_sepcomb_rgb.h
svm/svm_sky.h
svm/svm_tex_coord.h
svm/svm_texture.h
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt 2011-12-01 20:02:47 UTC (rev 42326)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt 2011-12-01 21:46:10 UTC (rev 42327)
@@ -35,6 +35,7 @@
node_output_displacement.osl
node_output_surface.osl
node_output_volume.osl
+ node_sepcomb_rgb.osl
node_sky_texture.osl
node_stucci_texture.osl
node_texture_coordinate.osl
Added: trunk/blender/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl (rev 0)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_sepcomb_rgb.osl 2011-12-01 21:46:10 UTC (rev 42327)
@@ -0,0 +1,40 @@
+/*
+ * 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_separate_rgb(
+ color Image = color(0.8, 0.8, 0.8),
+ output float R = 0.0,
+ output float G = 0.0,
+ output float B = 0.0)
+{
+ R = Image[0];
+ G = Image[1];
+ B = Image[2];
+}
+
+shader node_combine_rgb(
+ float R = 0.0,
+ float G = 0.0,
+ float B = 0.0,
+ output color Image = color(0.8, 0.8, 0.8)
+{
+ Image = color(R, G, B)
+}
+
Modified: trunk/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm.h 2011-12-01 20:02:47 UTC (rev 42326)
+++ trunk/blender/intern/cycles/kernel/svm/svm.h 2011-12-01 21:46:10 UTC (rev 42327)
@@ -134,6 +134,7 @@
#include "svm_wave.h"
#include "svm_math.h"
#include "svm_mix.h"
+#include "svm_sepcomb_rgb.h"
#include "svm_musgrave.h"
#include "svm_sky.h"
#include "svm_tex_coord.h"
@@ -254,6 +255,12 @@
case NODE_MIX:
svm_node_mix(kg, sd, stack, node.y, node.z, node.w, &offset);
break;
+ case NODE_SEPARATE_RGB:
+ svm_node_separate_rgb(sd, stack, node.y, node.z, node.w);
+ break;
+ case NODE_COMBINE_RGB:
+ svm_node_combine_rgb(sd, stack, node.y, node.z, node.w);
+ break;
case NODE_ATTR:
svm_node_attr(kg, sd, stack, node);
break;
Added: trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h (rev 0)
+++ trunk/blender/intern/cycles/kernel/svm/svm_sepcomb_rgb.h 2011-12-01 21:46:10 UTC (rev 42327)
@@ -0,0 +1,38 @@
+/*
+ * 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_combine_rgb(ShaderData *sd, float *stack, uint in_offset, uint color_index, uint out_offset)
+{
+ float color = stack_load_float(stack, in_offset);
+
+ if (stack_valid(out_offset))
+ stack_store_float(stack, out_offset+color_index, color);
+}
+
+__device void svm_node_separate_rgb(ShaderData *sd, float *stack, uint icolor_offset, uint color_index, uint out_offset)
+{
+ float3 color = stack_load_float3(stack, icolor_offset);
+
+ if (stack_valid(out_offset))
+ stack_store_float(stack, out_offset, color[color_index]);
+}
+
+CCL_NAMESPACE_END
+
Modified: trunk/blender/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_types.h 2011-12-01 20:02:47 UTC (rev 42326)
+++ trunk/blender/intern/cycles/kernel/svm/svm_types.h 2011-12-01 21:46:10 UTC (rev 42327)
@@ -79,7 +79,9 @@
NODE_TEX_ENVIRONMENT = 4600,
NODE_CLOSURE_HOLDOUT = 4700,
NODE_LAYER_WEIGHT = 4800,
- NODE_CLOSURE_VOLUME = 4900
+ NODE_CLOSURE_VOLUME = 4900,
+ NODE_SEPARATE_RGB = 5000,
+ NODE_COMBINE_RGB = 5100
} NodeType;
typedef enum NodeAttributeType {
Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp 2011-12-01 20:02:47 UTC (rev 42326)
+++ trunk/blender/intern/cycles/render/nodes.cpp 2011-12-01 21:46:10 UTC (rev 42327)
@@ -1629,6 +1629,74 @@
compiler.add(this, "node_mix");
}
+/* Combine RGB */
+CombineRGBNode::CombineRGBNode()
+: ShaderNode("combine_rgb")
+{
+ add_input("R", SHADER_SOCKET_FLOAT);
+ add_input("G", SHADER_SOCKET_FLOAT);
+ add_input("B", SHADER_SOCKET_FLOAT);
+ add_output("Image", SHADER_SOCKET_COLOR);
+}
+
+void CombineRGBNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *red_in = input("R");
+ ShaderInput *green_in = input("G");
+ ShaderInput *blue_in = input("B");
+ ShaderOutput *color_out = output("Image");
+
+ compiler.stack_assign(color_out);
+
+ compiler.stack_assign(red_in);
+ compiler.add_node(NODE_COMBINE_RGB, red_in->stack_offset, 0, color_out->stack_offset);
+
+ compiler.stack_assign(green_in);
+ compiler.add_node(NODE_COMBINE_RGB, green_in->stack_offset, 1, color_out->stack_offset);
+
+ compiler.stack_assign(blue_in);
+ compiler.add_node(NODE_COMBINE_RGB, blue_in->stack_offset, 2, color_out->stack_offset);
+}
+
+void CombineRGBNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_combine_rgb");
+}
+
+/* Separate RGB */
+SeparateRGBNode::SeparateRGBNode()
+: ShaderNode("separate_rgb")
+{
+ add_input("Image", SHADER_SOCKET_COLOR);
+ add_output("R", SHADER_SOCKET_FLOAT);
+ add_output("G", SHADER_SOCKET_FLOAT);
+ add_output("B", SHADER_SOCKET_FLOAT);
+}
+
+void SeparateRGBNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *color_in = input("Image");
+ ShaderOutput *red_out = output("R");
+ ShaderOutput *green_out = output("G");
+ ShaderOutput *blue_out = output("B");
+
+ compiler.stack_assign(color_in);
+
+ compiler.stack_assign(red_out);
+ compiler.add_node(NODE_SEPARATE_RGB, color_in->stack_offset, 0, red_out->stack_offset);
+
+ compiler.stack_assign(green_out);
+ compiler.add_node(NODE_SEPARATE_RGB, color_in->stack_offset, 1, green_out->stack_offset);
+
+ compiler.stack_assign(blue_out);
+ compiler.add_node(NODE_SEPARATE_RGB, color_in->stack_offset, 2, blue_out->stack_offset);
+}
+
+void SeparateRGBNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_separate_rgb");
+}
+
/* Attribute */
AttributeNode::AttributeNode()
Modified: trunk/blender/intern/cycles/render/nodes.h
===================================================================
--- trunk/blender/intern/cycles/render/nodes.h 2011-12-01 20:02:47 UTC (rev 42326)
+++ trunk/blender/intern/cycles/render/nodes.h 2011-12-01 21:46:10 UTC (rev 42327)
@@ -292,6 +292,16 @@
static ShaderEnum type_enum;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list