[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18838] trunk/blender/source/blender: Added Scale, fixed bugs incl.
Robin Allen
roblovski at gmail.com
Fri Feb 6 19:09:35 CET 2009
Revision: 18838
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18838
Author: kakbarnf
Date: 2009-02-06 19:09:35 +0100 (Fri, 06 Feb 2009)
Log Message:
-----------
Added Scale, fixed bugs incl. patch #18037
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/nodes/TEX_node.h
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
Added Paths:
-----------
trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2009-02-06 17:32:57 UTC (rev 18837)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2009-02-06 18:09:35 UTC (rev 18838)
@@ -406,6 +406,7 @@
#define TEX_NODE_COMPOSE 119
#define TEX_NODE_DECOMPOSE 120
#define TEX_NODE_VALTONOR 121
+#define TEX_NODE_SCALE 122
/* 201-299 reserved. Use like this: TEX_NODE_PROC + TEX_CLOUDS, etc */
#define TEX_NODE_PROC 200
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2009-02-06 17:32:57 UTC (rev 18837)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2009-02-06 18:09:35 UTC (rev 18838)
@@ -2902,6 +2902,7 @@
nodeRegisterType(ntypelist, &tex_node_rotate);
nodeRegisterType(ntypelist, &tex_node_translate);
+ nodeRegisterType(ntypelist, &tex_node_scale);
nodeRegisterType(ntypelist, &tex_node_proc_voronoi);
nodeRegisterType(ntypelist, &tex_node_proc_blend);
Modified: trunk/blender/source/blender/nodes/TEX_node.h
===================================================================
--- trunk/blender/source/blender/nodes/TEX_node.h 2009-02-06 17:32:57 UTC (rev 18837)
+++ trunk/blender/source/blender/nodes/TEX_node.h 2009-02-06 18:09:35 UTC (rev 18838)
@@ -58,6 +58,7 @@
extern bNodeType tex_node_rotate;
extern bNodeType tex_node_translate;
+extern bNodeType tex_node_scale;
extern bNodeType tex_node_compose;
extern bNodeType tex_node_decompose;
Modified: trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_compose.c 2009-02-06 17:32:57 UTC (rev 18837)
+++ trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_compose.c 2009-02-06 18:09:35 UTC (rev 18838)
@@ -53,19 +53,19 @@
}
bNodeType tex_node_compose= {
- /* *next,*prev */ NULL, NULL,
- /* type code */ TEX_NODE_COMPOSE,
- /* name */ "Compose RGBA",
- /* width+range */ 100, 60, 150,
- /* class+opts */ NODE_CLASS_OP_COLOR, 0,
- /* input sock */ inputs,
- /* output sock */ outputs,
- /* storage */ "",
- /* execfunc */ exec,
- /* butfunc */ NULL,
- /* initfunc */ NULL,
- /* freestoragefunc */ NULL,
- /* copystoragefunc */ NULL,
- /* id */ NULL
+ /* *next,*prev */ NULL, NULL,
+ /* type code */ TEX_NODE_COMPOSE,
+ /* name */ "Compose RGBA",
+ /* width+range */ 100, 60, 150,
+ /* class+opts */ NODE_CLASS_OP_COLOR, 0,
+ /* input sock */ inputs,
+ /* output sock */ outputs,
+ /* storage */ "",
+ /* execfunc */ exec,
+ /* butfunc */ NULL,
+ /* initfunc */ NULL,
+ /* freestoragefunc */ NULL,
+ /* copystoragefunc */ NULL,
+ /* id */ NULL
};
Modified: trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c 2009-02-06 17:32:57 UTC (rev 18837)
+++ trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c 2009-02-06 18:09:35 UTC (rev 18838)
@@ -30,14 +30,14 @@
#include <math.h>
static bNodeSocketType inputs[]= {
- { SOCK_RGBA, 0, "Color", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f },
+ { SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f },
{ -1, 0, "" }
};
static bNodeSocketType outputs[]= {
- { SOCK_VALUE, 1, "Red", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f },
- { SOCK_VALUE, 1, "Green", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f },
- { SOCK_VALUE, 1, "Blue", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f },
- { SOCK_VALUE, 1, "Alpha", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f },
+ { SOCK_VALUE, 0, "Red", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f },
+ { SOCK_VALUE, 0, "Green", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f },
+ { SOCK_VALUE, 0, "Blue", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f },
+ { SOCK_VALUE, 0, "Alpha", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f },
{ -1, 0, "" }
};
Modified: trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c 2009-02-06 17:32:57 UTC (rev 18837)
+++ trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c 2009-02-06 18:09:35 UTC (rev 18838)
@@ -143,6 +143,29 @@
*out= (int)(in0 + 0.5f);
}
break;
+
+ case 15: /* Less Than */
+ {
+ if( in0 < in1 )
+ *out= 1.0f;
+ else
+ *out= 0.0f;
+ }
+ break;
+
+ case 16: /* Greater Than */
+ {
+ if( in0 > in1 )
+ *out= 1.0f;
+ else
+ *out= 0.0f;
+ }
+ break;
+
+ default:
+ fprintf(stderr,
+ "%s:%d: unhandeld value in switch statement: %d\n",
+ __FILE__, __LINE__, node->custom1);
}
}
Modified: trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c 2009-02-06 17:32:57 UTC (rev 18837)
+++ trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c 2009-02-06 18:09:35 UTC (rev 18838)
@@ -91,8 +91,6 @@
static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
{
tex_output(node, in, out[0], &colorfn);
-
- tex_do_preview(node, out[0], data);
}
bNodeType tex_node_rotate= {
Added: trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_scale.c (rev 0)
+++ trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_scale.c 2009-02-06 18:09:35 UTC (rev 18838)
@@ -0,0 +1,76 @@
+/**
+ *
+ * ***** 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): none yet.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <math.h>
+#include "../TEX_util.h"
+
+static bNodeSocketType inputs[]= {
+ { SOCK_RGBA, 1, "Color", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f },
+ { SOCK_VECTOR, 1, "Scale", 1.0f, 1.0f, 1.0f, 0.0f, -10.0f, 10.0f },
+ { -1, 0, "" }
+};
+
+static bNodeSocketType outputs[]= {
+ { SOCK_RGBA, 0, "Color", 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 scale[3], new_coord[3];
+
+ tex_input_vec(scale, in[1], coord, thread);
+
+ new_coord[0] = coord[0] * scale[0];
+ new_coord[1] = coord[1] * scale[1];
+ new_coord[2] = coord[2] * scale[2];
+
+ 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_scale = {
+ /* *next,*prev */ NULL, NULL,
+ /* type code */ TEX_NODE_SCALE,
+ /* name */ "Scale",
+ /* width+range */ 90, 80, 100,
+ /* class+opts */ NODE_CLASS_DISTORT, NODE_OPTIONS,
+ /* input sock */ inputs,
+ /* output sock */ outputs,
+ /* storage */ "",
+ /* execfunc */ exec,
+ /* butfunc */ NULL,
+ /* initfunc */ NULL,
+ /* freestoragefunc */ NULL,
+ /* copystoragefunc */ NULL,
+ /* id */ NULL
+};
+
Modified: trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c 2009-02-06 17:32:57 UTC (rev 18837)
+++ trunk/blender/source/blender/nodes/intern/TEX_nodes/TEX_translate.c 2009-02-06 18:09:35 UTC (rev 18838)
@@ -55,8 +55,6 @@
static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
{
tex_output(node, in, out[0], &colorfn);
-
- tex_do_preview(node, out[0], data);
}
bNodeType tex_node_translate = {
More information about the Bf-blender-cvs
mailing list