[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43223] trunk/blender: Cycles: checker texture node, patch by Thomas.
Brecht Van Lommel
brechtvanlommel at pandora.be
Sun Jan 8 15:55:47 CET 2012
Revision: 43223
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43223
Author: blendix
Date: 2012-01-08 14:55:43 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Cycles: checker texture node, patch by Thomas.
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/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/makesdna/DNA_node_types.h
trunk/blender/source/blender/makesrna/intern/rna_nodetree.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/svm/svm_checker.h
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
Modified: trunk/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.cpp 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/intern/cycles/app/cycles_xml.cpp 2012-01-08 14:55:43 UTC (rev 43223)
@@ -349,6 +349,9 @@
else if(string_iequals(node.name(), "noise_texture")) {
snode = new NoiseTextureNode();
}
+ else if(string_iequals(node.name(), "checker_texture")) {
+ snode = new CheckerTextureNode();
+ }
else if(string_iequals(node.name(), "gradient_texture")) {
GradientTextureNode *blend = new GradientTextureNode();
xml_read_enum(&blend->type, GradientTextureNode::type_enum, node, "type");
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-01-08 14:55:43 UTC (rev 43223)
@@ -364,6 +364,13 @@
node = wave;
break;
}
+ case BL::ShaderNode::type_TEX_CHECKER: {
+ BL::ShaderNodeTexChecker b_checker_node(b_node);
+ CheckerTextureNode *checker = new CheckerTextureNode();
+ get_tex_mapping(&checker->tex_mapping, b_checker_node.texture_mapping());
+ node = checker;
+ break;
+ }
case BL::ShaderNode::type_TEX_NOISE: {
BL::ShaderNodeTexNoise b_noise_node(b_node);
NoiseTextureNode *noise = new NoiseTextureNode();
Modified: trunk/blender/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- trunk/blender/intern/cycles/kernel/CMakeLists.txt 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/intern/cycles/kernel/CMakeLists.txt 2012-01-08 14:55:43 UTC (rev 43223)
@@ -57,6 +57,7 @@
svm/svm_camera.h
svm/svm_closure.h
svm/svm_convert.h
+ svm/svm_checker.h
svm/svm_displace.h
svm/svm_fresnel.h
svm/svm_gamma.h
Modified: trunk/blender/intern/cycles/kernel/svm/svm.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm.h 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/intern/cycles/kernel/svm/svm.h 2012-01-08 14:55:43 UTC (rev 43223)
@@ -145,6 +145,7 @@
#include "svm_tex_coord.h"
#include "svm_value.h"
#include "svm_voronoi.h"
+#include "svm_checker.h"
CCL_NAMESPACE_BEGIN
@@ -235,6 +236,9 @@
case NODE_TEX_MAGIC:
svm_node_tex_magic(kg, sd, stack, node, &offset);
break;
+ case NODE_TEX_CHECKER:
+ svm_node_tex_checker(kg, sd, stack, node, &offset);
+ break;
#endif
case NODE_CAMERA:
svm_node_camera(kg, sd, stack, node.y, node.z, node.w);
Added: trunk/blender/intern/cycles/kernel/svm/svm_checker.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_checker.h (rev 0)
+++ trunk/blender/intern/cycles/kernel/svm/svm_checker.h 2012-01-08 14:55:43 UTC (rev 43223)
@@ -0,0 +1,57 @@
+/*
+ * 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
+
+/* Checker */
+
+__device_noinline float svm_checker(float3 p, float scale)
+{
+ p *= scale;
+
+ /* 0.00001 because of unit sized stuff */
+ int xi = (int)fabsf(floor(0.00001f + p.x));
+ int yi = (int)fabsf(floor(0.00001f + p.y));
+ int zi = (int)fabsf(floor(0.00001f + p.z));
+
+ return ((xi % 2 == yi % 2) == (zi % 2))? 1.0f: 0.0f;
+}
+
+__device void svm_node_tex_checker(KernelGlobals *kg, ShaderData *sd, float *stack, uint4 node, int *offset)
+{
+ uint co_offset, color1_offset, color2_offset, scale_offset;
+ uint color_offset, fac_offset;
+
+ decode_node_uchar4(node.y, &co_offset, &color1_offset, &color2_offset, &scale_offset);
+ decode_node_uchar4(node.z, &color_offset, &fac_offset, NULL, NULL);
+
+ float3 co = stack_load_float3(stack, co_offset);
+ float3 color1 = stack_load_float3(stack, color1_offset);
+ float3 color2 = stack_load_float3(stack, color2_offset);
+ float scale = stack_load_float_default(stack, scale_offset, node.w);
+
+ float f = svm_checker(co, scale);
+
+ if(stack_valid(color_offset))
+ stack_store_float3(stack, color_offset, (f == 1.0f)? color1: color2);
+ if(stack_valid(fac_offset))
+ stack_store_float(stack, fac_offset, f);
+}
+
+CCL_NAMESPACE_END
+
Modified: trunk/blender/intern/cycles/kernel/svm/svm_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_types.h 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/intern/cycles/kernel/svm/svm_types.h 2012-01-08 14:55:43 UTC (rev 43223)
@@ -86,7 +86,8 @@
NODE_CAMERA = 5300,
NODE_INVERT = 5400,
NODE_NORMAL = 5500,
- NODE_GAMMA = 5600
+ NODE_GAMMA = 5600,
+ NODE_TEX_CHECKER = 5700
} NodeType;
typedef enum NodeAttributeType {
Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/intern/cycles/render/nodes.cpp 2012-01-08 14:55:43 UTC (rev 43223)
@@ -712,6 +712,54 @@
compiler.add(this, "node_magic_texture");
}
+/* Checker Texture */
+
+CheckerTextureNode::CheckerTextureNode()
+: TextureNode("checker_texture")
+{
+ add_input("Vector", SHADER_SOCKET_POINT, ShaderInput::TEXTURE_GENERATED);
+ add_input("Color1", SHADER_SOCKET_COLOR);
+ add_input("Color2", SHADER_SOCKET_COLOR);
+ add_input("Scale", SHADER_SOCKET_FLOAT, 1.0f);
+
+ add_output("Color", SHADER_SOCKET_COLOR);
+ add_output("Fac", SHADER_SOCKET_FLOAT);
+}
+
+void CheckerTextureNode::compile(SVMCompiler& compiler)
+{
+ ShaderInput *vector_in = input("Vector");
+ ShaderInput *color1_in = input("Color1");
+ ShaderInput *color2_in = input("Color2");
+ ShaderInput *scale_in = input("Scale");
+
+ ShaderOutput *color_out = output("Color");
+ ShaderOutput *fac_out = output("Fac");
+
+ compiler.stack_assign(vector_in);
+ compiler.stack_assign(color1_in);
+ compiler.stack_assign(color2_in);
+ if(scale_in->link) compiler.stack_assign(scale_in);
+
+ if(!tex_mapping.skip())
+ tex_mapping.compile(compiler, vector_in->stack_offset, vector_in->stack_offset);
+
+ if(!color_out->links.empty())
+ compiler.stack_assign(color_out);
+ if(!fac_out->links.empty())
+ compiler.stack_assign(fac_out);
+
+ compiler.add_node(NODE_TEX_CHECKER,
+ compiler.encode_uchar4(vector_in->stack_offset, color1_in->stack_offset, color2_in->stack_offset, scale_in->stack_offset),
+ compiler.encode_uchar4(color_out->stack_offset, fac_out->stack_offset),
+ __float_as_int(scale_in->value.x));
+}
+
+void CheckerTextureNode::compile(OSLCompiler& compiler)
+{
+ compiler.add(this, "node_checker_texture");
+}
+
/* Normal */
NormalNode::NormalNode()
Modified: trunk/blender/intern/cycles/render/nodes.h
===================================================================
--- trunk/blender/intern/cycles/render/nodes.h 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/intern/cycles/render/nodes.h 2012-01-08 14:55:43 UTC (rev 43223)
@@ -143,6 +143,11 @@
int depth;
};
+class CheckerTextureNode : public TextureNode {
+public:
+ SHADER_NODE_CLASS(CheckerTextureNode)
+};
+
class MappingNode : public ShaderNode {
public:
SHADER_NODE_CLASS(MappingNode)
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2012-01-08 14:55:43 UTC (rev 43223)
@@ -522,6 +522,7 @@
#define SH_NODE_VOLUME_TRANSPARENT 161
#define SH_NODE_VOLUME_ISOTROPIC 162
#define SH_NODE_GAMMA 163
+#define SH_NODE_TEX_CHECKER 164
/* 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 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-01-08 14:55:43 UTC (rev 43223)
@@ -1945,6 +1945,7 @@
register_node_type_sh_tex_musgrave(ttype);
register_node_type_sh_tex_gradient(ttype);
register_node_type_sh_tex_magic(ttype);
+ register_node_type_sh_tex_checker(ttype);
}
static void registerTextureNodes(bNodeTreeType *ttype)
Modified: trunk/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_node_types.h 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/source/blender/makesdna/DNA_node_types.h 2012-01-08 14:55:43 UTC (rev 43223)
@@ -448,6 +448,10 @@
int color_space, pad;
} NodeTexImage;
+typedef struct NodeTexChecker {
+ NodeTexBase base;
+} NodeTexChecker;
+
typedef struct NodeTexEnvironment {
NodeTexBase base;
int color_space, pad;
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-01-08 13:55:53 UTC (rev 43222)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-01-08 14:55:43 UTC (rev 43223)
@@ -1333,6 +1333,12 @@
def_sh_tex(srna);
}
+static void def_sh_tex_checker(StructRNA *srna)
+{
+ RNA_def_struct_sdna_from(srna, "NodeTexChecker", "storage");
+ def_sh_tex(srna);
+}
+
static void def_sh_tex_magic(StructRNA *srna)
{
PropertyRNA *prop;
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list