[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40300] branches/cycles/source/blender/ nodes/shader/nodes: Cycles: missed these files in merge commit.
Brecht Van Lommel
brechtvanlommel at pandora.be
Sat Sep 17 16:38:57 CEST 2011
Revision: 40300
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40300
Author: blendix
Date: 2011-09-17 14:38:56 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Cycles: missed these files in merge commit.
Added Paths:
-----------
branches/cycles/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_background.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_blend_weight.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_noise.h
branches/cycles/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_output_texture.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_blend.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_clouds.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_distnoise.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_marble.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_stucci.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/cycles/source/blender/nodes/shader/nodes/node_shader_tex_wood.c
Added: branches/cycles/source/blender/nodes/shader/nodes/node_shader_add_shader.c
===================================================================
--- branches/cycles/source/blender/nodes/shader/nodes/node_shader_add_shader.c (rev 0)
+++ branches/cycles/source/blender/nodes/shader/nodes/node_shader_add_shader.c 2011-09-17 14:38:56 UTC (rev 40300)
@@ -0,0 +1,69 @@
+/**
+ * $Id: node_shader_output.c 32517 2010-10-16 14:32:17Z campbellbarton $
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../node_shader_util.h"
+
+/* **************** OUTPUT ******************** */
+
+static bNodeSocketTemplate sh_node_add_shader_in[]= {
+ { SOCK_SHADER, 1, "Shader1"},
+ { SOCK_SHADER, 1, "Shader2"},
+ { -1, 0, "" }
+};
+
+static bNodeSocketTemplate sh_node_add_shader_out[]= {
+ { SOCK_SHADER, 0, "Shader"},
+ { -1, 0, "" }
+};
+
+static void node_shader_exec_add_shader(void *UNUSED(data), bNode *UNUSED(node), bNodeStack **UNUSED(in), bNodeStack **UNUSED(out))
+{
+}
+
+static int node_shader_gpu_add_shader(GPUMaterial *mat, bNode *UNUSED(node), GPUNodeStack *in, GPUNodeStack *out)
+{
+ return GPU_stack_link(mat, "node_add_shader", in, out);
+}
+
+/* node type definition */
+void register_node_type_sh_add_shader(ListBase *lb)
+{
+ static bNodeType ntype;
+
+ node_type_base(&ntype, SH_NODE_ADD_SHADER, "Add Shader", NODE_CLASS_SHADER, 0);
+ node_type_socket_templates(&ntype, sh_node_add_shader_in, sh_node_add_shader_out);
+ node_type_size(&ntype, 150, 60, 200);
+ node_type_init(&ntype, NULL);
+ node_type_storage(&ntype, "", NULL, NULL);
+ node_type_exec(&ntype, node_shader_exec_add_shader);
+ node_type_gpu(&ntype, node_shader_gpu_add_shader);
+
+ nodeRegisterType(lb, &ntype);
+};
+
Added: branches/cycles/source/blender/nodes/shader/nodes/node_shader_attribute.c
===================================================================
--- branches/cycles/source/blender/nodes/shader/nodes/node_shader_attribute.c (rev 0)
+++ branches/cycles/source/blender/nodes/shader/nodes/node_shader_attribute.c 2011-09-17 14:38:56 UTC (rev 40300)
@@ -0,0 +1,59 @@
+/**
+ * $Id: node_shader_output.c 32517 2010-10-16 14:32:17Z campbellbarton $
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../node_shader_util.h"
+
+/* **************** OUTPUT ******************** */
+
+static bNodeSocketTemplate sh_node_attribute_out[]= {
+ { SOCK_VECTOR, 0, "Vector", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+ { -1, 0, "" }
+};
+
+static void node_shader_exec_attribute(void *UNUSED(data), bNode *UNUSED(node), bNodeStack **UNUSED(in), bNodeStack **UNUSED(out))
+{
+}
+
+
+/* node type definition */
+void register_node_type_sh_attribute(ListBase *lb)
+{
+ static bNodeType ntype;
+
+ node_type_base(&ntype, SH_NODE_ATTRIBUTE, "Attribute", NODE_CLASS_INPUT, 0);
+ node_type_socket_templates(&ntype, NULL, sh_node_attribute_out);
+ node_type_size(&ntype, 150, 60, 200);
+ node_type_init(&ntype, NULL);
+ node_type_storage(&ntype, "", NULL, NULL);
+ node_type_exec(&ntype, node_shader_exec_attribute);
+ node_type_gpu(&ntype, NULL);
+
+ nodeRegisterType(lb, &ntype);
+};
+
Added: branches/cycles/source/blender/nodes/shader/nodes/node_shader_background.c
===================================================================
--- branches/cycles/source/blender/nodes/shader/nodes/node_shader_background.c (rev 0)
+++ branches/cycles/source/blender/nodes/shader/nodes/node_shader_background.c 2011-09-17 14:38:56 UTC (rev 40300)
@@ -0,0 +1,65 @@
+/**
+ * $Id: node_shader_output.c 32517 2010-10-16 14:32:17Z campbellbarton $
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../node_shader_util.h"
+
+/* **************** OUTPUT ******************** */
+
+static bNodeSocketTemplate sh_node_background_in[]= {
+ { SOCK_RGBA, 1, "Color", 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
+ { SOCK_FLOAT, 1, "Strength", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1000000.0f},
+ { -1, 0, "" }
+};
+
+static bNodeSocketTemplate sh_node_background_out[]= {
+ { SOCK_SHADER, 0, "Background"},
+ { -1, 0, "" }
+};
+
+static void node_shader_exec_background(void *UNUSED(data), bNode *UNUSED(node), bNodeStack **UNUSED(in), bNodeStack **UNUSED(out))
+{
+}
+
+
+/* node type definition */
+void register_node_type_sh_background(ListBase *lb)
+{
+ static bNodeType ntype;
+
+ node_type_base(&ntype, SH_NODE_BACKGROUND, "Background", NODE_CLASS_SHADER, 0);
+ node_type_socket_templates(&ntype, sh_node_background_in, sh_node_background_out);
+ node_type_size(&ntype, 150, 60, 200);
+ node_type_init(&ntype, NULL);
+ node_type_storage(&ntype, "", NULL, NULL);
+ node_type_exec(&ntype, node_shader_exec_background);
+ node_type_gpu(&ntype, NULL);
+
+ nodeRegisterType(lb, &ntype);
+};
+
Added: branches/cycles/source/blender/nodes/shader/nodes/node_shader_blend_weight.c
===================================================================
--- branches/cycles/source/blender/nodes/shader/nodes/node_shader_blend_weight.c (rev 0)
+++ branches/cycles/source/blender/nodes/shader/nodes/node_shader_blend_weight.c 2011-09-17 14:38:56 UTC (rev 40300)
@@ -0,0 +1,68 @@
+/**
+ * $Id: node_shader_blend_weight.c 32517 2010-10-16 14:32:17Z campbellbarton $
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * 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.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../node_shader_util.h"
+
+/* **************** BlendWeight ******************** */
+static bNodeSocketTemplate sh_node_blend_weight_in[]= {
+ { SOCK_FLOAT, 1, "Blend", 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+ { -1, 0, "" }
+};
+
+static bNodeSocketTemplate sh_node_blend_weight_out[]= {
+ { SOCK_FLOAT, 0, "Fresnel", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+ { SOCK_FLOAT, 0, "Facing", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+ { -1, 0, "" }
+};
+
+static void node_shader_exec_blend_weight(void *UNUSED(data), bNode *UNUSED(node), bNodeStack **UNUSED(in), bNodeStack **UNUSED(out))
+{
+}
+
+static int node_shader_gpu_blend_weight(GPUMaterial *UNUSED(mat), bNode *UNUSED(node), GPUNodeStack *UNUSED(in), GPUNodeStack *UNUSED(out))
+{
+ return 0;
+}
+
+/* node type definition */
+void register_node_type_sh_blend_weight(ListBase *lb)
+{
+ static bNodeType ntype;
+
+ node_type_base(&ntype, SH_NODE_BLEND_WEIGHT, "Blend Weight", NODE_CLASS_INPUT, 0);
+ node_type_socket_templates(&ntype, sh_node_blend_weight_in, sh_node_blend_weight_out);
+ node_type_size(&ntype, 150, 60, 200);
+ node_type_init(&ntype, NULL);
+ node_type_storage(&ntype, "", NULL, NULL);
+ node_type_exec(&ntype, node_shader_exec_blend_weight);
+ node_type_gpu(&ntype, node_shader_gpu_blend_weight);
+
+ nodeRegisterType(lb, &ntype);
+};
+
Added: branches/cycles/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list