asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compile shaders using default values.

Browse source
This commit is contained in:
Mariano Javier Suligoy 2015-08-30 02:44:49 -03:00
parent ea448cb779
commit a19a653e2c
2 changed files with 80 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
scene/resources/shader_graph.cpp
View file

@ -1849,17 +1849,17 @@ void ShaderGraph::_update_shader() {
Vector<String> inputs; Vector<String> inputs;
int max = get_node_input_slot_count(get_mode(),ShaderType(i),n->type); int max = get_node_input_slot_count(get_mode(),ShaderType(i),n->type);
for(int k=0;k<max;k++) { for(int k=0;k<max;k++) {
String iname;
if (!n->connections.has(k)) { if (!n->connections.has(k)) {
shader[i].error=GRAPH_ERROR_MISSING_CONNECTIONS; iname="nd"+itos(n->id)+"sl"+itos(k)+"def";
failed=true; } else {
break; iname="nd"+itos(n->connections[k].id)+"sl"+itos(n->connections[k].slot);
} if (node_get_type(ShaderType(i),n->connections[k].id)==NODE_INPUT) {
String iname="nd"+itos(n->connections[k].id)+"sl"+itos(n->connections[k].slot); inputs_used.insert(iname);
inputs.push_back(iname); }
if (node_get_type(ShaderType(i),n->connections[k].id)==NODE_INPUT) {
inputs_used.insert(iname);
}
}
inputs.push_back(iname);
} }
if (failed) if (failed)
@ -2065,6 +2065,31 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
const char *typestr[4]={"float","vec3","mat4","texture"}; const char *typestr[4]={"float","vec3","mat4","texture"};
#define OUTNAME(id,slot) (String(typestr[get_node_output_slot_type(get_mode(),p_type,p_node->type,slot)])+" "+("nd"+itos(id)+"sl"+itos(slot))) #define OUTNAME(id,slot) (String(typestr[get_node_output_slot_type(get_mode(),p_type,p_node->type,slot)])+" "+("nd"+itos(id)+"sl"+itos(slot)))
#define OUTVAR(id,slot) ("nd"+itos(id)+"sl"+itos(slot)) #define OUTVAR(id,slot) ("nd"+itos(id)+"sl"+itos(slot))
#define DEF_VEC(slot)\
if (p_inputs[slot].ends_with("def")){\
Vector3 v = p_node->defaults[slot];\
code+=String(typestr[1])+" "+p_inputs[slot]+"=vec3("+v+");\n";\
}
#define DEF_SCALAR(slot)\
if (p_inputs[slot].ends_with("def")){\
double v = p_node->defaults[slot];\
code+=String(typestr[0])+" "+p_inputs[slot]+"="+rtos(v)+";\n";\
}
#define DEF_COLOR(slot)\
if (p_inputs[slot].ends_with("def")){\
Color col = p_node->defaults[slot];\
code+=String(typestr[1])+" "+p_inputs[slot]+"=vec3("+rtos(col.r)+","+rtos(col.g)+","+rtos(col.b)+");\n";\
}
#define DEF_MATRIX(slot) \
if (p_inputs[slot].ends_with("def")){\
Transform xf = p_node->defaults[slot]; \
code+=String(typestr[3])+" "+p_inputs[slot]+"=mat4(\n";\
code+="\tvec4(vec3("+rtos(xf.basis.get_axis(0).x)+","+rtos(xf.basis.get_axis(0).y)+","+rtos(xf.basis.get_axis(0).z)+"),0),\n";\
code+="\tvec4(vec3("+rtos(xf.basis.get_axis(1).x)+","+rtos(xf.basis.get_axis(1).y)+","+rtos(xf.basis.get_axis(1).z)+"),0),\n";\
code+="\tvec4(vec3("+rtos(xf.basis.get_axis(2).x)+","+rtos(xf.basis.get_axis(2).y)+","+rtos(xf.basis.get_axis(2).z)+"),0),\n";\
code+="\tvec4(vec3("+rtos(xf.origin.x)+","+rtos(xf.origin.y)+","+rtos(xf.origin.z)+"),1)\n";\
code+=");\n";\
}
switch(p_node->type) { switch(p_node->type) {
@ -2101,9 +2126,12 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
code+=OUTNAME(p_node->id,0)+"=TIME;\n"; code+=OUTNAME(p_node->id,0)+"=TIME;\n";
}break; }break;
case NODE_SCREEN_TEX: { case NODE_SCREEN_TEX: {
DEF_VEC(0);
code+=OUTNAME(p_node->id,0)+"=texscreen("+p_inputs[0]+".xy);\n"; code+=OUTNAME(p_node->id,0)+"=texscreen("+p_inputs[0]+".xy);\n";
}break; }break;
case NODE_SCALAR_OP: { case NODE_SCALAR_OP: {
DEF_SCALAR(0);
DEF_SCALAR(1);
int op = p_node->param1; int op = p_node->param1;
String optxt; String optxt;
switch(op) { switch(op) {
@ -2123,6 +2151,8 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
}break; }break;
case NODE_VEC_OP: { case NODE_VEC_OP: {
DEF_VEC(0);
DEF_VEC(1);
int op = p_node->param1; int op = p_node->param1;
String optxt; String optxt;
switch(op) { switch(op) {
@ -2140,6 +2170,8 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
}break; }break;
case NODE_VEC_SCALAR_OP: { case NODE_VEC_SCALAR_OP: {
DEF_VEC(0);
DEF_SCALAR(1);
int op = p_node->param1; int op = p_node->param1;
String optxt; String optxt;
switch(op) { switch(op) {
@ -2151,6 +2183,8 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
}break; }break;
case NODE_RGB_OP: { case NODE_RGB_OP: {
DEF_COLOR(0);
DEF_COLOR(1);
int op = p_node->param1; int op = p_node->param1;
static const char*axisn[3]={"x","y","z"}; static const char*axisn[3]={"x","y","z"};
@ -2162,7 +2196,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
case RGB_OP_DIFFERENCE: { case RGB_OP_DIFFERENCE: {
code += OUTNAME(p_node->id,0)+"=abs("+p_inputs[0]+"-"+p_inputs[1]+");\n"; code += OUTNAME(p_node->id,0)+"=abs("+p_inputs[0]+"-"+p_inputs[1]+");\n";
print_line(OUTNAME(p_node->id,0)+"=abs("+p_inputs[0]+"-"+p_inputs[1]+");\n");
} break; } break;
case RGB_OP_DARKEN: { case RGB_OP_DARKEN: {
@ -2233,11 +2267,15 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
} }
}break; }break;
case NODE_XFORM_MULT: { case NODE_XFORM_MULT: {
DEF_MATRIX(0);
DEF_MATRIX(1);
code += OUTNAME(p_node->id,0)+"="+p_inputs[0]+"*"+p_inputs[1]+";\n"; code += OUTNAME(p_node->id,0)+"="+p_inputs[0]+"*"+p_inputs[1]+";\n";
}break; }break;
case NODE_XFORM_VEC_MULT: { case NODE_XFORM_VEC_MULT: {
DEF_MATRIX(0);
DEF_VEC(1);
bool no_translation = p_node->param1; bool no_translation = p_node->param1;
if (no_translation) { if (no_translation) {
@ -2248,6 +2286,8 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
}break; }break;
case NODE_XFORM_VEC_INV_MULT: { case NODE_XFORM_VEC_INV_MULT: {
DEF_VEC(0);
DEF_MATRIX(1);
bool no_translation = p_node->param1; bool no_translation = p_node->param1;
if (no_translation) { if (no_translation) {
code += OUTNAME(p_node->id,0)+"=("+p_inputs[1]+"*vec4("+p_inputs[0]+",0)).xyz;\n"; code += OUTNAME(p_node->id,0)+"=("+p_inputs[1]+"*vec4("+p_inputs[0]+",0)).xyz;\n";
@ -2256,6 +2296,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
} }
}break; }break;
case NODE_SCALAR_FUNC: { case NODE_SCALAR_FUNC: {
DEF_SCALAR(0);
static const char*scalar_func_id[SCALAR_MAX_FUNC]={ static const char*scalar_func_id[SCALAR_MAX_FUNC]={
"sin($)", "sin($)",
"cos($)", "cos($)",
@ -2285,6 +2326,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
} break; } break;
case NODE_VEC_FUNC: { case NODE_VEC_FUNC: {
DEF_VEC(0);
static const char*vec_func_id[VEC_MAX_FUNC]={ static const char*vec_func_id[VEC_MAX_FUNC]={
"normalize($)", "normalize($)",
"max(min($,vec3(1,1,1)),vec3(0,0,0))", "max(min($,vec3(1,1,1)),vec3(0,0,0))",
@ -2322,44 +2364,63 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
} }
}break; }break;
case NODE_VEC_LEN: { case NODE_VEC_LEN: {
DEF_VEC(0);
code += OUTNAME(p_node->id,0)+"=length("+p_inputs[0]+");\n"; code += OUTNAME(p_node->id,0)+"=length("+p_inputs[0]+");\n";
}break; }break;
case NODE_DOT_PROD: { case NODE_DOT_PROD: {
DEF_VEC(0);
DEF_VEC(1);
code += OUTNAME(p_node->id,0)+"=dot("+p_inputs[1]+","+p_inputs[0]+");\n"; code += OUTNAME(p_node->id,0)+"=dot("+p_inputs[1]+","+p_inputs[0]+");\n";
}break; }break;
case NODE_VEC_TO_SCALAR: { case NODE_VEC_TO_SCALAR: {
DEF_VEC(0);
code += OUTNAME(p_node->id,0)+"="+p_inputs[0]+".x;\n"; code += OUTNAME(p_node->id,0)+"="+p_inputs[0]+".x;\n";
code += OUTNAME(p_node->id,1)+"="+p_inputs[0]+".y;\n"; code += OUTNAME(p_node->id,1)+"="+p_inputs[0]+".y;\n";
code += OUTNAME(p_node->id,2)+"="+p_inputs[0]+".z;\n"; code += OUTNAME(p_node->id,2)+"="+p_inputs[0]+".z;\n";
}break; }break;
case NODE_SCALAR_TO_VEC: { case NODE_SCALAR_TO_VEC: {
DEF_SCALAR(0);
DEF_SCALAR(1);
DEF_SCALAR(2);
code += OUTNAME(p_node->id,0)+"=vec3("+p_inputs[0]+","+p_inputs[1]+","+p_inputs[2]+""+");\n"; code += OUTNAME(p_node->id,0)+"=vec3("+p_inputs[0]+","+p_inputs[1]+","+p_inputs[2]+""+");\n";
}break; }break;
case NODE_VEC_TO_XFORM: { case NODE_VEC_TO_XFORM: {
DEF_VEC(0);
DEF_VEC(1);
DEF_VEC(2);
DEF_VEC(3);
code += OUTNAME(p_node->id,0)+"=xform("+p_inputs[0]+","+p_inputs[1]+","+p_inputs[2]+","+","+p_inputs[3]+");\n"; code += OUTNAME(p_node->id,0)+"=xform("+p_inputs[0]+","+p_inputs[1]+","+p_inputs[2]+","+","+p_inputs[3]+");\n";
}break; }break;
case NODE_XFORM_TO_VEC: { case NODE_XFORM_TO_VEC: {
DEF_MATRIX(0);
code += OUTNAME(p_node->id,0)+"="+p_inputs[0]+".x;\n"; code += OUTNAME(p_node->id,0)+"="+p_inputs[0]+".x;\n";
code += OUTNAME(p_node->id,1)+"="+p_inputs[0]+".y;\n"; code += OUTNAME(p_node->id,1)+"="+p_inputs[0]+".y;\n";
code += OUTNAME(p_node->id,2)+"="+p_inputs[0]+".z;\n"; code += OUTNAME(p_node->id,2)+"="+p_inputs[0]+".z;\n";
code += OUTNAME(p_node->id,3)+"="+p_inputs[0]+".o;\n"; code += OUTNAME(p_node->id,3)+"="+p_inputs[0]+".o;\n";
}break; }break;
case NODE_SCALAR_INTERP: { case NODE_SCALAR_INTERP: {
DEF_SCALAR(0);
DEF_SCALAR(1);
DEF_SCALAR(2);
code += OUTNAME(p_node->id,0)+"=mix("+p_inputs[0]+","+p_inputs[1]+","+p_inputs[2]+");\n"; code += OUTNAME(p_node->id,0)+"=mix("+p_inputs[0]+","+p_inputs[1]+","+p_inputs[2]+");\n";
}break; }break;
case NODE_VEC_INTERP: { case NODE_VEC_INTERP: {
DEF_VEC(0);
DEF_VEC(1);
DEF_SCALAR(2);
code += OUTNAME(p_node->id,0)+"=mix("+p_inputs[0]+","+p_inputs[1]+","+p_inputs[2]+");\n"; code += OUTNAME(p_node->id,0)+"=mix("+p_inputs[0]+","+p_inputs[1]+","+p_inputs[2]+");\n";
}break; }break;
case NODE_COLOR_RAMP: { case NODE_COLOR_RAMP: {
DEF_SCALAR(0);
static const int color_ramp_len=512; static const int color_ramp_len=512;
DVector<uint8_t> cramp; DVector<uint8_t> cramp;
@ -2416,6 +2477,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
}break; }break;
case NODE_CURVE_MAP: { case NODE_CURVE_MAP: {
DEF_SCALAR(0);
static const int curve_map_len=256; static const int curve_map_len=256;
bool mapped[256]; bool mapped[256];
zeromem(mapped,sizeof(mapped)); zeromem(mapped,sizeof(mapped));
@ -2483,6 +2545,9 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
}break; }break;
case NODE_SCALAR_INPUT: { case NODE_SCALAR_INPUT: {
DEF_SCALAR(0);
DEF_SCALAR(1);
DEF_SCALAR(2);
String name = p_node->param1; String name = p_node->param1;
float dv=p_node->param2; float dv=p_node->param2;
code +="uniform float "+name+"="+rtos(dv)+";\n"; code +="uniform float "+name+"="+rtos(dv)+";\n";
@ -2520,6 +2585,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
}break; }break;
case NODE_TEXTURE_INPUT: { case NODE_TEXTURE_INPUT: {
DEF_VEC(0);
String name = p_node->param1; String name = p_node->param1;
String rname="rt_read_tex"+itos(p_node->id); String rname="rt_read_tex"+itos(p_node->id);
code +="uniform texture "+name+";"; code +="uniform texture "+name+";";
@ -2529,7 +2595,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
}break; }break;
case NODE_CUBEMAP_INPUT: { case NODE_CUBEMAP_INPUT: {
DEF_VEC(0);
String name = p_node->param1; String name = p_node->param1;
code +="uniform cubemap "+name+";"; code +="uniform cubemap "+name+";";
String rname="rt_read_tex"+itos(p_node->id); String rname="rt_read_tex"+itos(p_node->id);
@ -2538,6 +2604,7 @@ void ShaderGraph::_add_node_code(ShaderType p_type,Node *p_node,const Vector<Str
code += OUTNAME(p_node->id,1)+"="+rname+".a;\n"; code += OUTNAME(p_node->id,1)+"="+rname+".a;\n";
}break; }break;
case NODE_DEFAULT_TEXTURE: { case NODE_DEFAULT_TEXTURE: {
DEF_VEC(0);
if (get_mode()==MODE_CANVAS_ITEM && p_type==SHADER_TYPE_FRAGMENT) { if (get_mode()==MODE_CANVAS_ITEM && p_type==SHADER_TYPE_FRAGMENT) {

10
tools/editor/plugins/shader_graph_editor_plugin.cpp
View file

@ -2416,15 +2416,9 @@ void ShaderGraphView::_create_node(int p_id) {
Array reals; Array reals;
reals.push_back("Alpha"); reals.push_back("Alpha");
reals.push_back("NormapMapDepth"); reals.push_back("NormapMapDepth");
reals.push_back("SpecExp");
reals.push_back("LightAlpha"); reals.push_back("LightAlpha");
reals.push_back("PointSize"); reals.push_back("PointSize");
Array vectors;
vectors.push_back("Normal");
vectors.push_back("NormalMap");
vectors.push_back("Vertex");
vectors.push_back("UV");
vectors.push_back("Var1");
vectors.push_back("Var2");
int idx=0; int idx=0;
for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) { for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) {
@ -2435,7 +2429,7 @@ void ShaderGraphView::_create_node(int p_id) {
v=Variant::COLOR; v=Variant::COLOR;
else if (reals.find(s.name)>=0) else if (reals.find(s.name)>=0)
v=Variant::REAL; v=Variant::REAL;
else if (vectors.find(s.name)>=0) else
v=Variant::VECTOR3; v=Variant::VECTOR3;
gn->add_child(make_label(s.name, v)); gn->add_child(make_label(s.name, v));
gn->set_slot(idx,true,s.type,typecol[s.type],false,0,Color()); gn->set_slot(idx,true,s.type,typecol[s.type],false,0,Color());