Patch #18015, adds "Value to Normal" node
This commit is contained in:
@@ -405,6 +405,7 @@ struct TexResult;
|
|||||||
#define TEX_NODE_DISTANCE 118
|
#define TEX_NODE_DISTANCE 118
|
||||||
#define TEX_NODE_COMPOSE 119
|
#define TEX_NODE_COMPOSE 119
|
||||||
#define TEX_NODE_DECOMPOSE 120
|
#define TEX_NODE_DECOMPOSE 120
|
||||||
|
#define TEX_NODE_VALTONOR 121
|
||||||
|
|
||||||
/* 201-299 reserved. Use like this: TEX_NODE_PROC + TEX_CLOUDS, etc */
|
/* 201-299 reserved. Use like this: TEX_NODE_PROC + TEX_CLOUDS, etc */
|
||||||
#define TEX_NODE_PROC 200
|
#define TEX_NODE_PROC 200
|
||||||
|
@@ -2882,6 +2882,7 @@ static void registerTextureNodes(ListBase *ntypelist)
|
|||||||
nodeRegisterType(ntypelist, &tex_node_mix_rgb);
|
nodeRegisterType(ntypelist, &tex_node_mix_rgb);
|
||||||
nodeRegisterType(ntypelist, &tex_node_valtorgb);
|
nodeRegisterType(ntypelist, &tex_node_valtorgb);
|
||||||
nodeRegisterType(ntypelist, &tex_node_rgbtobw);
|
nodeRegisterType(ntypelist, &tex_node_rgbtobw);
|
||||||
|
nodeRegisterType(ntypelist, &tex_node_valtonor);
|
||||||
nodeRegisterType(ntypelist, &tex_node_curve_rgb);
|
nodeRegisterType(ntypelist, &tex_node_curve_rgb);
|
||||||
nodeRegisterType(ntypelist, &tex_node_curve_time);
|
nodeRegisterType(ntypelist, &tex_node_curve_time);
|
||||||
nodeRegisterType(ntypelist, &tex_node_invert);
|
nodeRegisterType(ntypelist, &tex_node_invert);
|
||||||
|
@@ -41,6 +41,7 @@
|
|||||||
extern bNodeType tex_node_math;
|
extern bNodeType tex_node_math;
|
||||||
extern bNodeType tex_node_mix_rgb;
|
extern bNodeType tex_node_mix_rgb;
|
||||||
extern bNodeType tex_node_valtorgb;
|
extern bNodeType tex_node_valtorgb;
|
||||||
|
extern bNodeType tex_node_valtonor;
|
||||||
extern bNodeType tex_node_rgbtobw;
|
extern bNodeType tex_node_rgbtobw;
|
||||||
extern bNodeType tex_node_output;
|
extern bNodeType tex_node_output;
|
||||||
extern bNodeType tex_node_viewer;
|
extern bNodeType tex_node_viewer;
|
||||||
|
92
source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
Normal file
92
source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
/**
|
||||||
|
*
|
||||||
|
* ***** 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): Jucas.
|
||||||
|
*
|
||||||
|
* ***** END GPL LICENSE BLOCK *****
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "../TEX_util.h"
|
||||||
|
|
||||||
|
static bNodeSocketType inputs[]= {
|
||||||
|
{ SOCK_VALUE, 1, "Val", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f },
|
||||||
|
{ SOCK_VALUE, 1, "Nabla", 0.025f, 0.0f, 0.0f, 0.0f, 0.001f, 0.1f },
|
||||||
|
{ -1, 0, "" }
|
||||||
|
};
|
||||||
|
|
||||||
|
static bNodeSocketType outputs[]= {
|
||||||
|
{ SOCK_VECTOR, 0, "Normal", 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f },
|
||||||
|
{ -1, 0, "" }
|
||||||
|
};
|
||||||
|
|
||||||
|
static void normalfn(float *out, float *coord, bNode *node, bNodeStack **in, short thread)
|
||||||
|
{
|
||||||
|
float new_coord[3];
|
||||||
|
|
||||||
|
float nabla = tex_input_value(in[1], coord, thread);
|
||||||
|
float val;
|
||||||
|
float nor[2];
|
||||||
|
|
||||||
|
val = tex_input_value(in[0], coord, thread);
|
||||||
|
|
||||||
|
new_coord[0] = coord[0] + nabla;
|
||||||
|
new_coord[1] = coord[1];
|
||||||
|
new_coord[2] = coord[2];
|
||||||
|
nor[0] = tex_input_value(in[0], new_coord, thread);
|
||||||
|
|
||||||
|
new_coord[0] = coord[0];
|
||||||
|
new_coord[1] = coord[1] + nabla;
|
||||||
|
nor[1] = tex_input_value(in[0], new_coord, thread);
|
||||||
|
|
||||||
|
new_coord[1] = coord[1];
|
||||||
|
new_coord[2] = coord[2] + nabla;
|
||||||
|
nor[2] = tex_input_value(in[0], new_coord, thread);
|
||||||
|
|
||||||
|
out[0] = val-nor[0];
|
||||||
|
out[1] = val-nor[1];
|
||||||
|
out[2] = val-nor[2];
|
||||||
|
}
|
||||||
|
static void exec(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
|
||||||
|
{
|
||||||
|
tex_output(node, in, out[0], &normalfn);
|
||||||
|
|
||||||
|
tex_do_preview(node, out[0], data);
|
||||||
|
}
|
||||||
|
|
||||||
|
bNodeType tex_node_valtonor = {
|
||||||
|
/* *next,*prev */ NULL, NULL,
|
||||||
|
/* type code */ TEX_NODE_VALTONOR,
|
||||||
|
/* name */ "Value to Normal",
|
||||||
|
/* width+range */ 90, 80, 100,
|
||||||
|
/* class+opts */ NODE_CLASS_CONVERTOR, NODE_OPTIONS,
|
||||||
|
/* input sock */ inputs,
|
||||||
|
/* output sock */ outputs,
|
||||||
|
/* storage */ "",
|
||||||
|
/* execfunc */ exec,
|
||||||
|
/* butfunc */ NULL,
|
||||||
|
/* initfunc */ NULL,
|
||||||
|
/* freestoragefunc */ NULL,
|
||||||
|
/* copystoragefunc */ NULL,
|
||||||
|
/* id */ NULL
|
||||||
|
};
|
||||||
|
|
Reference in New Issue
Block a user