Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Allen <roblovski@gmail.com>2009-06-13 18:22:40 +0400
committerRobin Allen <roblovski@gmail.com>2009-06-13 18:22:40 +0400
commitc4ad2ed2536407cf2a9b3bc8f0b77bc88cccf71d (patch)
treed43615f4c1bca2fa10ebb2b0f4148e91f58f954c /source/blender/nodes
parentb40eb540d3a49c710bbd10effa9d9db04a915347 (diff)
Omission of a texture node to specify coordinates was regarded as a bug by some users. I rather agree :)
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/TEX_node.h1
-rw-r--r--source/blender/nodes/intern/TEX_nodes/TEX_at.c70
2 files changed, 71 insertions, 0 deletions
diff --git a/source/blender/nodes/TEX_node.h b/source/blender/nodes/TEX_node.h
index d298f062143..f58d0312961 100644
--- a/source/blender/nodes/TEX_node.h
+++ b/source/blender/nodes/TEX_node.h
@@ -59,6 +59,7 @@ extern bNodeType tex_node_distance;
extern bNodeType tex_node_rotate;
extern bNodeType tex_node_translate;
extern bNodeType tex_node_scale;
+extern bNodeType tex_node_at;
extern bNodeType tex_node_compose;
extern bNodeType tex_node_decompose;
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_at.c b/source/blender/nodes/intern/TEX_nodes/TEX_at.c
new file mode 100644
index 00000000000..80f232ccd0c
--- /dev/null
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_at.c
@@ -0,0 +1,70 @@
+/**
+ *
+ * ***** 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): R Allen
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "../TEX_util.h"
+
+static bNodeSocketType inputs[]= {
+ { SOCK_RGBA, 1, "Texture", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f },
+ { SOCK_VECTOR, 1, "Coordinates", 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f },
+ { -1, 0, "" }
+};
+static bNodeSocketType outputs[]= {
+ { SOCK_RGBA, 0, "Texture", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f },
+ { -1, 0, "" }
+};
+
+static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
+{
+ float new_coord[3];
+
+ tex_input_vec(new_coord, in[1], coord, thread);
+ tex_input_rgba(out, in[0], new_coord, thread);
+}
+
+static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
+{
+ tex_output(node, in, out[0], &colorfn);
+}
+
+bNodeType tex_node_at = {
+ /* *next,*prev */ NULL, NULL,
+ /* type code */ TEX_NODE_AT,
+ /* name */ "At",
+ /* width+range */ 100, 60, 150,
+ /* class+opts */ NODE_CLASS_DISTORT, 0,
+ /* input sock */ inputs,
+ /* output sock */ outputs,
+ /* storage */ "",
+ /* execfunc */ exec,
+ /* butfunc */ NULL,
+ /* initfunc */ NULL,
+ /* freestoragefunc */ NULL,
+ /* copystoragefunc */ NULL,
+ /* id */ NULL
+
+};