griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added Scale, fixed bugs incl. patch #18037

Browse Source
This commit is contained in:
Robin Allen
2009-02-06 18:09:35 +00:00
parent 86c25491e1
commit 09099111e3
9 changed files with 121 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_node.h
View File

@@ -406,6 +406,7 @@ struct TexResult;
#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

1
source/blender/blenkernel/intern/node.c
View File

@@ -2902,6 +2902,7 @@ static void registerTextureNodes(ListBase *ntypelist)
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);

1
source/blender/nodes/TEX_node.h
View File

@@ -58,6 +58,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_compose;
extern bNodeType tex_node_decompose;

28
source/blender/nodes/intern/TEX_nodes/TEX_compose.c
View File

@@ -53,19 +53,19 @@ static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
}
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
};

10
source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
View File

@@ -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, "" }
};

23
source/blender/nodes/intern/TEX_nodes/TEX_math.c
View File

@@ -143,6 +143,29 @@ static void valuefn(float *out, float *coord, bNode *node, bNodeStack **in, shor
*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);
}
}

2
source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
View File

@@ -91,8 +91,6 @@ static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, shor
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= {

76
source/blender/nodes/intern/TEX_nodes/TEX_scale.c Normal file
View File

@@ -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
};

2
source/blender/nodes/intern/TEX_nodes/TEX_translate.c
View File

@@ -55,8 +55,6 @@ static void colorfn(float *out, float *coord, bNode *node, bNodeStack **in, shor
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 = {