forked from bartvdbraak/blender
Omission of a texture node to specify coordinates was regarded as a bug by some users. I rather agree :)
This commit is contained in:
parent
b40eb540d3
commit
c4ad2ed253
@ -407,8 +407,9 @@ struct TexResult;
|
||||
#define TEX_NODE_DECOMPOSE 420
|
||||
#define TEX_NODE_VALTONOR 421
|
||||
#define TEX_NODE_SCALE 422
|
||||
#define TEX_NODE_AT 423
|
||||
|
||||
/* 201-299 reserved. Use like this: TEX_NODE_PROC + TEX_CLOUDS, etc */
|
||||
/* 501-599 reserved. Use like this: TEX_NODE_PROC + TEX_CLOUDS, etc */
|
||||
#define TEX_NODE_PROC 500
|
||||
#define TEX_NODE_PROC_MAX 600
|
||||
|
||||
|
@ -2921,6 +2921,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_at);
|
||||
|
||||
nodeRegisterType(ntypelist, &tex_node_proc_voronoi);
|
||||
nodeRegisterType(ntypelist, &tex_node_proc_blend);
|
||||
|
@ -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;
|
||||
|
70
source/blender/nodes/intern/TEX_nodes/TEX_at.c
Normal file
70
source/blender/nodes/intern/TEX_nodes/TEX_at.c
Normal file
@ -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
|
||||
|
||||
};
|
Loading…
Reference in New Issue
Block a user