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

Cycles: Deduplicate Vector and RGB Curve nodes

Browse Source 
Since most of the code for these two nodes was identical, this commit
now instead uses a common base class that implements all the functionality.
This commit is contained in:
Lukas Stockner
2016-06-21 00:19:51 +02:00
parent a170607578
commit 93c6cf496e
2 changed files with 72 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
intern/cycles/render/nodes.cpp
View File

@@ -4885,6 +4885,54 @@ bool BumpNode::constant_fold(ShaderGraph *graph, ShaderOutput *, ShaderInput *)
return false;
}
/* Curve node */
CurvesNode::CurvesNode(const NodeType *node_type)
: ShaderNode(node_type)
{
}
void CurvesNode::compile(SVMCompiler& compiler, int type, ShaderInput *value_in, ShaderOutput *value_out)
{
if(curves.size() == 0)
return;
ShaderInput *fac_in = input("Fac");
compiler.add_node(type,
compiler.encode_uchar4(compiler.stack_assign(fac_in),
compiler.stack_assign(value_in),
compiler.stack_assign(value_out)),
__float_as_int(min_x),
__float_as_int(max_x));
compiler.add_node(curves.size());
for(int i = 0; i < curves.size(); i++)
compiler.add_node(float3_to_float4(curves[i]));
}
void CurvesNode::compile(OSLCompiler& compiler, const char* name)
{
if(curves.size() == 0)
return;
compiler.parameter_color_array("ramp", curves);
compiler.parameter(this, "min_x");
compiler.parameter(this, "max_x");
compiler.add(this, name);
}
void CurvesNode::compile(SVMCompiler& /*compiler*/)
{
assert(0);
}
void CurvesNode::compile(OSLCompiler& /*compiler*/)
{
assert(0);
}
/* RGBCurvesNode */
NODE_DEFINE(RGBCurvesNode)
@@ -4896,48 +4944,26 @@ NODE_DEFINE(RGBCurvesNode)
SOCKET_FLOAT(max_x, "Max X", 1.0f);
SOCKET_IN_FLOAT(fac, "Fac", 0.0f);
SOCKET_IN_COLOR(color, "Color", make_float3(0.0f, 0.0f, 0.0f));
SOCKET_IN_COLOR(value, "Color", make_float3(0.0f, 0.0f, 0.0f));
SOCKET_OUT_COLOR(color, "Color");
SOCKET_OUT_COLOR(value, "Color");
return type;
}
RGBCurvesNode::RGBCurvesNode()
: ShaderNode(node_type)
: CurvesNode(node_type)
{
}
void RGBCurvesNode::compile(SVMCompiler& compiler)
{
if(curves.size() == 0)
return;
ShaderInput *fac_in = input("Fac");
ShaderInput *color_in = input("Color");
ShaderOutput *color_out = output("Color");
compiler.add_node(NODE_RGB_CURVES,
compiler.encode_uchar4(compiler.stack_assign(fac_in),
compiler.stack_assign(color_in),
compiler.stack_assign(color_out)),
__float_as_int(min_x),
__float_as_int(max_x));
compiler.add_node(curves.size());
for(int i = 0; i < curves.size(); i++)
compiler.add_node(float3_to_float4(curves[i]));
CurvesNode::compile(compiler, NODE_RGB_CURVES, input("Color"), output("Color"));
}
void RGBCurvesNode::compile(OSLCompiler& compiler)
{
if(curves.size() == 0)
return;
compiler.parameter_color_array("ramp", curves);
compiler.parameter(this, "min_x");
compiler.parameter(this, "max_x");
compiler.add(this, "node_rgb_curves");
CurvesNode::compile(compiler, "node_rgb_curves");
}
/* VectorCurvesNode */
@@ -4951,48 +4977,26 @@ NODE_DEFINE(VectorCurvesNode)
SOCKET_FLOAT(max_x, "Max X", 1.0f);
SOCKET_IN_FLOAT(fac, "Fac", 0.0f);
SOCKET_IN_VECTOR(vector, "Vector", make_float3(0.0f, 0.0f, 0.0f));
SOCKET_IN_VECTOR(value, "Vector", make_float3(0.0f, 0.0f, 0.0f));
SOCKET_OUT_VECTOR(vector, "Vector");
SOCKET_OUT_VECTOR(value, "Vector");
return type;
}
VectorCurvesNode::VectorCurvesNode()
: ShaderNode(node_type)
: CurvesNode(node_type)
{
}
void VectorCurvesNode::compile(SVMCompiler& compiler)
{
if(curves.size() == 0)
return;
ShaderInput *fac_in = input("Fac");
ShaderInput *vector_in = input("Vector");
ShaderOutput *vector_out = output("Vector");
compiler.add_node(NODE_VECTOR_CURVES,
compiler.encode_uchar4(compiler.stack_assign(fac_in),
compiler.stack_assign(vector_in),
compiler.stack_assign(vector_out)),
__float_as_int(min_x),
__float_as_int(max_x));
compiler.add_node(curves.size());
for(int i = 0; i < curves.size(); i++)
compiler.add_node(float3_to_float4(curves[i]));
CurvesNode::compile(compiler, NODE_VECTOR_CURVES, input("Vector"), output("Vector"));
}
void VectorCurvesNode::compile(OSLCompiler& compiler)
{
if(curves.size() == 0)
return;
compiler.parameter_color_array("ramp", curves);
compiler.parameter(this, "min_x");
compiler.parameter(this, "max_x");
compiler.add(this, "node_vector_curves");
CurvesNode::compile(compiler, "node_vector_curves");
}
/* RGBRampNode */

24
intern/cycles/render/nodes.h
View File

@@ -875,26 +875,30 @@ public:
float distance;
};
class RGBCurvesNode : public ShaderNode {
class CurvesNode : public ShaderNode {
public:
SHADER_NODE_CLASS(RGBCurvesNode)
explicit CurvesNode(const NodeType *node_type);
SHADER_NODE_BASE_CLASS(CurvesNode);
virtual int get_group() { return NODE_GROUP_LEVEL_3; }
bool has_spatial_varying() { return true; }
void compile(SVMCompiler& compiler, int type, ShaderInput *value_in, ShaderOutput *value_out);
void compile(OSLCompiler& compiler, const char *name);
array<float3> curves;
float min_x, max_x, fac;
float3 color;
float3 value;
};
class VectorCurvesNode : public ShaderNode {
class RGBCurvesNode : public CurvesNode {
public:
SHADER_NODE_CLASS(RGBCurvesNode)
};
class VectorCurvesNode : public CurvesNode {
public:
SHADER_NODE_CLASS(VectorCurvesNode)
virtual int get_group() { return NODE_GROUP_LEVEL_3; }
array<float3> curves;
float min_x, max_x, fac;
float3 vector;
};
class RGBRampNode : public ShaderNode {