Invert Color Cycles Node
authorDalai Felinto <dfelinto@gmail.com>
Sat, 3 Dec 2011 23:05:35 +0000 (23:05 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Sat, 3 Dec 2011 23:05:35 +0000 (23:05 +0000)
as with the HSV node the OSL code is relying on the (yet to be implemented) autorename.

Also the svm code could use mix (svm_lerp) instead:
 32 . float3 color_inv = make_float3(1.0f, 1.0f, 1.0f) - color;
 35 . . stack_store_float3(stack, out_color, svm_lerp(color_inv, color, factor));

I have a feeling that each node 'program' should have the least program as possible. I'll see with Brecht later.
But overall I don't know if that's any fast. And apart from that I think we will need this kind of function to move to a library if multiple functions linked in are not a problem.

intern/cycles/app/cycles_xml.cpp
intern/cycles/blender/blender_shader.cpp
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/osl/nodes/CMakeLists.txt
intern/cycles/kernel/osl/nodes/node_invert.osl [new file with mode: 0644]
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_invert.h [new file with mode: 0644]
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/nodes.cpp
intern/cycles/render/nodes.h
source/blender/nodes/shader/nodes/node_shader_invert.c

index 7cd190f877d3c27a817d938a7958b72c152d407f..530a4ad14d88c9ae792c869f3ddc265ed0f7c4e6 100644 (file)
@@ -435,6 +435,9 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
                else if(string_iequals(node.name(), "add_closure")) {
                        snode = new AddClosureNode();
                }
+               else if(string_iequals(node.name(), "invert")) {
+                       snode = new InvertNode();
+               }
                else if(string_iequals(node.name(), "mix")) {
                        MixNode *mix = new MixNode();
                        xml_read_enum(&mix->type, MixNode::type_enum, node, "type");
index 43359bf5352968e1fc6c40e74802bd1ff4d24a47..930ac1d495aaca557f194709b94eb4a37000eb17 100644 (file)
@@ -130,7 +130,6 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Node *
                case BL::ShaderNode::type_CURVE_RGB: break;
                case BL::ShaderNode::type_CURVE_VEC: break;
                case BL::ShaderNode::type_GEOMETRY: break;
-               case BL::ShaderNode::type_INVERT: break;
                case BL::ShaderNode::type_MATERIAL: break;
                case BL::ShaderNode::type_MATERIAL_EXT: break;
                case BL::ShaderNode::type_NORMAL: break;
@@ -158,6 +157,10 @@ static ShaderNode *add_node(BL::BlendData b_data, ShaderGraph *graph, BL::Node *
                        node = new CameraNode();
                        break;
                }
+               case BL::ShaderNode::type_INVERT: {
+                       node = new InvertNode();
+                       break;
+               }
                case BL::ShaderNode::type_MIX_RGB: {
                        BL::ShaderNodeMixRGB b_mix_node(b_node);
                        MixNode *mix = new MixNode();
index 59f7e04c9d8fd51218105c694f640dca5df02730..601b95d262a85d0e33800686fbe127ab033b8778 100644 (file)
@@ -63,6 +63,7 @@ set(SRC_SVM_HEADERS
        svm/svm_gradient.h
        svm/svm_hsv.h
        svm/svm_image.h
+       svm/svm_invert.h
        svm/svm_light_path.h
        svm/svm_magic.h
        svm/svm_mapping.h
index 02f4a5a55bf9b26bc54b63ee5bbfbb5a93b7a7ec..433fc2155fec1f72f464cbe133437c725a25eb58 100644 (file)
@@ -24,6 +24,7 @@ set(SRC_OSL
        node_glossy_bsdf.osl
        node_hsv.osl
        node_image_texture.osl
+       node_invert.osl
        node_light_path.osl
        node_magic_texture.osl
        node_mapping.osl
diff --git a/intern/cycles/kernel/osl/nodes/node_invert.osl b/intern/cycles/kernel/osl/nodes/node_invert.osl
new file mode 100644 (file)
index 0000000..817198c
--- /dev/null
@@ -0,0 +1,29 @@
+/*
+ * 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_invert(
+       float Fac = 1.0,
+       color ColorIn = color(0.8, 0.8, 0.8),
+       output ColorOut = color(0.8, 0.8, 0.8)
+{
+       color ColorInv = color(1.0) - ColorIn;
+       ColorOut = mix(ColorIn, ColorInv, Fac);
+}
+
index 443715600ca1b452de7598c829c8c9cd8d44769f..5fde44e276990dfc15f5dd07957922dfe0df6876 100644 (file)
@@ -130,6 +130,7 @@ CCL_NAMESPACE_END
 #include "svm_geometry.h"
 #include "svm_hsv.h"
 #include "svm_image.h"
+#include "svm_invert.h"
 #include "svm_light_path.h"
 #include "svm_magic.h"
 #include "svm_mapping.h"
@@ -257,6 +258,9 @@ __device_noinline void svm_eval_nodes(KernelGlobals *kg, ShaderData *sd, ShaderT
                        case NODE_VALUE_V:
                                svm_node_value_v(kg, sd, stack, node.y, &offset);
                                break;
+                       case NODE_INVERT:
+                               svm_node_invert(sd, stack, node.y, node.z, node.w);
+                               break;
                        case NODE_MIX:
                                svm_node_mix(kg, sd, stack, node.y, node.z, node.w, &offset);
                                break;
diff --git a/intern/cycles/kernel/svm/svm_invert.h b/intern/cycles/kernel/svm/svm_invert.h
new file mode 100644 (file)
index 0000000..a14d8ec
--- /dev/null
@@ -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.
+ */
+
+CCL_NAMESPACE_BEGIN
+
+__device float invert(float color, float factor)
+{
+       return factor*(1.0f - color) + (1.0f - factor) * color;
+}
+
+__device void svm_node_invert(ShaderData *sd, float *stack, uint in_fac, uint in_color, uint out_color)
+{
+       float factor = stack_load_float(stack, in_fac);
+       float3 color = stack_load_float3(stack, in_color);
+
+       color.x = invert(color.x, factor);
+       color.y = invert(color.y, factor);
+       color.z = invert(color.z, factor);
+
+       if (stack_valid(out_color))
+               stack_store_float3(stack, out_color, color);
+}
+
+CCL_NAMESPACE_END
+
index fcd345b9359c9a9f397e313897de0b8c1df72cbc..efec5c7650d6fcba3981aa75434ec98624983a36 100644 (file)
@@ -83,7 +83,8 @@ typedef enum NodeType {
        NODE_SEPARATE_RGB = 5000,
        NODE_COMBINE_RGB = 5100,
        NODE_HSV = 5200,
-       NODE_CAMERA = 5300
+       NODE_CAMERA = 5300,
+       NODE_INVERT = 5400
 } NodeType;
 
 typedef enum NodeAttributeType {
index 9f12fe6002fbd79bfbf17309b0aafad35cc3e9b6..45f0ab417753a2c53c5db2bc51570bfbab4c02a6 100644 (file)
@@ -1566,6 +1566,34 @@ void MixClosureNode::compile(OSLCompiler& compiler)
        compiler.add(this, "node_mix_closure");
 }
 
+/* Invert */
+
+InvertNode::InvertNode()
+: ShaderNode("invert")
+{
+       add_input("Fac", SHADER_SOCKET_FLOAT, 1.0f);
+       add_input("Color", SHADER_SOCKET_COLOR);
+       add_output("Color",  SHADER_SOCKET_COLOR);
+}
+
+void InvertNode::compile(SVMCompiler& compiler)
+{
+       ShaderInput *fac_in = input("Fac");
+       ShaderInput *color_in = input("Color");
+       ShaderOutput *color_out = output("Color");
+
+       compiler.stack_assign(fac_in);
+       compiler.stack_assign(color_in);
+       compiler.stack_assign(color_out);
+
+       compiler.add_node(NODE_INVERT, fac_in->stack_offset, color_in->stack_offset, color_out->stack_offset);
+}
+
+void InvertNode::compile(OSLCompiler& compiler)
+{
+       compiler.add(this, "node_invert");
+}
+
 /* Mix */
 
 MixNode::MixNode()
index fd5271d843414e65ccf450d21a4a7842095ae7d7..e08651cf1ebf7959a112aad3b0be296d4318996a 100644 (file)
@@ -284,6 +284,11 @@ public:
        SHADER_NODE_CLASS(MixClosureNode)
 };
 
+class InvertNode : public ShaderNode {
+public:
+       SHADER_NODE_CLASS(InvertNode)
+};
+
 class MixNode : public ShaderNode {
 public:
        SHADER_NODE_CLASS(MixNode)
index 6d21b93fb6570a912cbe067524cdc93b24731dbe..2c20df2274d23c3dc1d677a33861678a503fa692 100644 (file)
@@ -77,7 +77,7 @@ void register_node_type_sh_invert(bNodeTreeType *ttype)
        static bNodeType ntype;
 
        node_type_base(ttype, &ntype, SH_NODE_INVERT, "Invert", NODE_CLASS_OP_COLOR, NODE_OPTIONS);
-       node_type_compatibility(&ntype, NODE_OLD_SHADING);
+       node_type_compatibility(&ntype, NODE_OLD_SHADING|NODE_NEW_SHADING);
        node_type_socket_templates(&ntype, sh_node_invert_in, sh_node_invert_out);
        node_type_size(&ntype, 90, 80, 100);
        node_type_exec(&ntype, node_shader_exec_invert);