forked from bartvdbraak/blender
Gamma node support for Blender Internal
Patch by Blend4Web Team, thanks! Reviewers: psy-fi Subscribers: yurikovelenov, AlexKowel, Evgeny_Rodygin Differential Revision: https://developer.blender.org/D899
This commit is contained in:
parent
a3e832e68b
commit
01c187fb93
@ -150,6 +150,7 @@ shader_node_categories = [
|
|||||||
NodeItem("ShaderNodeRGBCurve"),
|
NodeItem("ShaderNodeRGBCurve"),
|
||||||
NodeItem("ShaderNodeInvert"),
|
NodeItem("ShaderNodeInvert"),
|
||||||
NodeItem("ShaderNodeHueSaturation"),
|
NodeItem("ShaderNodeHueSaturation"),
|
||||||
|
NodeItem("ShaderNodeGamma"),
|
||||||
]),
|
]),
|
||||||
ShaderOldNodeCategory("SH_OP_VECTOR", "Vector", items=[
|
ShaderOldNodeCategory("SH_OP_VECTOR", "Vector", items=[
|
||||||
NodeItem("ShaderNodeNormal"),
|
NodeItem("ShaderNodeNormal"),
|
||||||
|
@ -505,6 +505,7 @@ extern StructRNA RNA_ShaderNodeMaterial;
|
|||||||
extern StructRNA RNA_ShaderNodeMath;
|
extern StructRNA RNA_ShaderNodeMath;
|
||||||
extern StructRNA RNA_ShaderNodeMixRGB;
|
extern StructRNA RNA_ShaderNodeMixRGB;
|
||||||
extern StructRNA RNA_ShaderNodeNormal;
|
extern StructRNA RNA_ShaderNodeNormal;
|
||||||
|
extern StructRNA RNA_ShaderNodeGamma;
|
||||||
extern StructRNA RNA_ShaderNodeOutput;
|
extern StructRNA RNA_ShaderNodeOutput;
|
||||||
extern StructRNA RNA_ShaderNodeScript;
|
extern StructRNA RNA_ShaderNodeScript;
|
||||||
extern StructRNA RNA_ShaderNodeRGB;
|
extern StructRNA RNA_ShaderNodeRGB;
|
||||||
|
@ -41,6 +41,18 @@ static bNodeSocketTemplate sh_node_gamma_out[] = {
|
|||||||
{ -1, 0, "" }
|
{ -1, 0, "" }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void node_shader_exec_gamma(void *UNUSED(data), int UNUSED(thread), bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), bNodeStack **in, bNodeStack **out)
|
||||||
|
{
|
||||||
|
float col[3];
|
||||||
|
float gamma;
|
||||||
|
nodestack_get_vec(col, SOCK_VECTOR, in[0]);
|
||||||
|
nodestack_get_vec(&gamma, SOCK_FLOAT, in[1]);
|
||||||
|
|
||||||
|
out[0]->vec[0] = col[0] > 0.0 ? pow(col[0], gamma) : col[0];
|
||||||
|
out[0]->vec[1] = col[1] > 0.0 ? pow(col[1], gamma) : col[1];
|
||||||
|
out[0]->vec[2] = col[2] > 0.0 ? pow(col[2], gamma) : col[2];
|
||||||
|
}
|
||||||
|
|
||||||
static int node_shader_gpu_gamma(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
|
static int node_shader_gpu_gamma(GPUMaterial *mat, bNode *UNUSED(node), bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
|
||||||
{
|
{
|
||||||
return GPU_stack_link(mat, "node_gamma", in, out);
|
return GPU_stack_link(mat, "node_gamma", in, out);
|
||||||
@ -51,10 +63,11 @@ void register_node_type_sh_gamma(void)
|
|||||||
static bNodeType ntype;
|
static bNodeType ntype;
|
||||||
|
|
||||||
sh_node_type_base(&ntype, SH_NODE_GAMMA, "Gamma", NODE_CLASS_OP_COLOR, 0);
|
sh_node_type_base(&ntype, SH_NODE_GAMMA, "Gamma", NODE_CLASS_OP_COLOR, 0);
|
||||||
node_type_compatibility(&ntype, NODE_NEW_SHADING);
|
node_type_compatibility(&ntype, NODE_OLD_SHADING | NODE_NEW_SHADING);
|
||||||
node_type_socket_templates(&ntype, sh_node_gamma_in, sh_node_gamma_out);
|
node_type_socket_templates(&ntype, sh_node_gamma_in, sh_node_gamma_out);
|
||||||
node_type_init(&ntype, NULL);
|
node_type_init(&ntype, NULL);
|
||||||
node_type_storage(&ntype, "", NULL, NULL);
|
node_type_storage(&ntype, "", NULL, NULL);
|
||||||
|
node_type_exec(&ntype, NULL, NULL, node_shader_exec_gamma);
|
||||||
node_type_gpu(&ntype, node_shader_gpu_gamma);
|
node_type_gpu(&ntype, node_shader_gpu_gamma);
|
||||||
|
|
||||||
nodeRegisterType(&ntype);
|
nodeRegisterType(&ntype);
|
||||||
|
Loading…
Reference in New Issue
Block a user