Revision: 42671
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42671
Author: dfelinto
Date: 2011-12-16 20:35:06 +0000 (Fri, 16 Dec 2011)
Log Message:
-----------
Cycles Gamma Node
Node specially useful for Texture correction.
This is also a nice example of a simple node made from scratch in case someone
wants to create their custom nodes.
Review by Brecht.
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/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/nodes/NOD_shader.h
Added Paths:
-----------
trunk/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl
trunk/blender/intern/cycles/kernel/svm/svm_gamma.h
trunk/blender/source/blender/nodes/shader/nodes/node_shader_gamma.c
Modified: trunk/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.cpp 2011-12-16 19:53:12 UTC
(rev 42670)
+++ trunk/blender/intern/cycles/app/cycles_xml.cpp 2011-12-16 20:35:06 UTC
(rev 42671)
@@ -446,6 +446,9 @@
xml_read_enum(&mix->type, MixNode::type_enum, node,
"type");
snode = mix;
}
+ else if(string_iequals(node.name(), "gamma")) {
+ snode = new GammaNode();
+ }
else if(string_iequals(node.name(), "combine_rgb")) {
snode = new CombineRGBNode();
}
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2011-12-16
19:53:12 UTC (rev 42670)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2011-12-16
20:35:06 UTC (rev 42671)
@@ -160,6 +160,10 @@
node = new InvertNode();
break;
}
+ case BL::ShaderNode::type_GAMMA: {
+ node = new GammaNode();
+ break;
+ }
case BL::ShaderNode::type_MIX_RGB: {
BL::ShaderNodeMixRGB b_mix_node(b_node);
MixNode *mix = new MixNode();
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2011-12-16 19:53:12 UTC
(rev 42670)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2011-12-16 20:35:06 UTC
(rev 42671)
@@ -59,6 +59,7 @@
svm/svm_convert.h
svm/svm_displace.h
svm/svm_fresnel.h
+ svm/svm_gamma.h
svm/svm_geometry.h
svm/svm_gradient.h
svm/svm_hsv.h
Modified: trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt 2011-12-16
19:53:12 UTC (rev 42670)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt 2011-12-16
20:35:06 UTC (rev 42671)
@@ -19,6 +19,7 @@
node_emission.osl
node_environment_texture.osl
node_fresnel.osl
+ node_gamma.osl
node_geometry.osl
node_glass_bsdf.osl
node_glossy_bsdf.osl
Added: trunk/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl
(rev 0)
+++ trunk/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl 2011-12-16
20:35:06 UTC (rev 42671)
@@ -0,0 +1,33 @@
+/*
+ * 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_gamma(
+ color ColorIn = color(0.8, 0.8, 0.8),
+ float Gamma = 1.0,
+ output ColorOut = color(0.8, 0.8, 0.8)
+{
+ int i;
+ for (i=0;i<3;i++) {
+ if (ColorIn[i] > 0.0)
+ ColorIn[i] = powf(ColorIn[i], Gamma);
+ }
+
+ ColorOut = ColorIn;
+}
Property changes on: trunk/blender/intern/cycles/kernel/osl/nodes/node_gamma.osl
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm.h 2011-12-16 19:53:12 UTC
(rev 42670)
+++ trunk/blender/intern/cycles/kernel/svm/svm.h 2011-12-16 20:35:06 UTC
(rev 42671)
@@ -130,6 +130,7 @@
#include "svm_geometry.h"
#include "svm_hsv.h"
#include "svm_image.h"
+#include "svm_gamma.h"
#include "svm_invert.h"
#include "svm_light_path.h"
#include "svm_magic.h"
@@ -262,6 +263,9 @@
case NODE_INVERT:
svm_node_invert(sd, stack, node.y, node.z,
node.w);
break;
+ case NODE_GAMMA:
+ svm_node_gamma(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;
Added: trunk/blender/intern/cycles/kernel/svm/svm_gamma.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_gamma.h
(rev 0)
+++ trunk/blender/intern/cycles/kernel/svm/svm_gamma.h 2011-12-16 20:35:06 UTC
(rev 42671)
@@ -0,0 +1,37 @@
+/*
+ * 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_gamma(ShaderData *sd, float *stack, uint in_gamma, uint
in_color, uint out_color)
+{
+ float3 color = stack_load_float3(stack, in_color);
+ float gamma = stack_load_float(stack, in_gamma);
+
+ if (color.x > 0.0)
+ color.x = powf(color.x, gamma);
+ if (color.y > 0.0)
+ color.y = powf(color.y, gamma);
+ if (color.z > 0.0)
+ color.z = powf(color.z, gamma);
+
+ if (stack_valid(out_color))
+ stack_store_float3(stack, out_color, color);
+}
+
+CCL_NAMESPACE_END
Property changes on: trunk/blender/intern/cycles/kernel/svm/svm_gamma.h
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/blender/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_types.h 2011-12-16 19:53:12 UTC
(rev 42670)
+++ trunk/blender/intern/cycles/kernel/svm/svm_types.h 2011-12-16 20:35:06 UTC
(rev 42671)
@@ -85,7 +85,8 @@
NODE_HSV = 5200,
NODE_CAMERA = 5300,
NODE_INVERT = 5400,
- NODE_NORMAL = 5500
+ NODE_NORMAL = 5500,
+ NODE_GAMMA = 5600
} NodeType;
typedef enum NodeAttributeType {
Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp 2011-12-16 19:53:12 UTC
(rev 42670)
+++ trunk/blender/intern/cycles/render/nodes.cpp 2011-12-16 20:35:06 UTC
(rev 42671)
@@ -1726,6 +1726,33 @@
compiler.add(this, "node_combine_rgb");
}
+/* Gamma */
+GammaNode::GammaNode()
+: ShaderNode("gamma")
+{
+ add_input("Color", SHADER_SOCKET_COLOR);
+ add_input("Gamma", SHADER_SOCKET_FLOAT);
+ add_output("Color", SHADER_SOCKET_COLOR);
+}
+
+void GammaNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *color_in = input("Color");
+ ShaderInput *gamma_in = input("Gamma");
+ ShaderOutput *color_out = output("Color");
+
+ compiler.stack_assign(color_in);
+ compiler.stack_assign(gamma_in);
+ compiler.stack_assign(color_out);
+
+ compiler.add_node(NODE_GAMMA, gamma_in->stack_offset,
color_in->stack_offset, color_out->stack_offset);
+}
+
+void GammaNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_gamma");
+}
+
/* Separate RGB */
SeparateRGBNode::SeparateRGBNode()
: ShaderNode("separate_rgb")
Modified: trunk/blender/intern/cycles/render/nodes.h
===================================================================
--- trunk/blender/intern/cycles/render/nodes.h 2011-12-16 19:53:12 UTC (rev
42670)
+++ trunk/blender/intern/cycles/render/nodes.h 2011-12-16 20:35:06 UTC (rev
42671)
@@ -302,6 +302,11 @@
SHADER_NODE_CLASS(CombineRGBNode)
};
+class GammaNode : public ShaderNode {
+public:
+ SHADER_NODE_CLASS(GammaNode)
+};
+
class SeparateRGBNode : public ShaderNode {
public:
SHADER_NODE_CLASS(SeparateRGBNode)
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2011-12-16 19:53:12 UTC
(rev 42670)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2011-12-16 20:35:06 UTC
(rev 42671)
@@ -521,6 +521,7 @@
#define SH_NODE_LAYER_WEIGHT 160
#define SH_NODE_VOLUME_TRANSPARENT 161
#define SH_NODE_VOLUME_ISOTROPIC 162
+#define SH_NODE_GAMMA 163
/* custom defines options for Material node */
#define SH_NODE_MAT_DIFF 1
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2011-12-16
19:53:12 UTC (rev 42670)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2011-12-16
20:35:06 UTC (rev 42671)
@@ -1899,6 +1899,7 @@
register_node_type_sh_output(ttype);
register_node_type_sh_material(ttype);
register_node_type_sh_camera(ttype);
+ register_node_type_sh_gamma(ttype);
register_node_type_sh_value(ttype);
register_node_type_sh_rgb(ttype);
register_node_type_sh_mix_rgb(ttype);
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h
2011-12-16 19:53:12 UTC (rev 42670)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h
2011-12-16 20:35:06 UTC (rev 42671)
@@ -40,6 +40,7 @@
DefNode( ShaderNode, SH_NODE_RGBTOBW, 0,
"RGBTOBW", RGBToBW, "RGB to BW", "" )
DefNode( ShaderNode, SH_NODE_TEXTURE, def_texture,
"TEXTURE", Texture, "Texture", "" )
DefNode( ShaderNode, SH_NODE_NORMAL, 0,
"NORMAL", Normal, "Normal", "" )
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
