diff --git a/inc/hgl/graph/shader/node/vertex_input.h b/inc/hgl/graph/shader/node/vertex_input.h index 6b354238..c861b2fe 100644 --- a/inc/hgl/graph/shader/node/vertex_input.h +++ b/inc/hgl/graph/shader/node/vertex_input.h @@ -19,7 +19,7 @@ public: //未来还要做个数判断之类的 if(ptparam::ParamType::UInteger4) + ||pt>param::ParamType::Double4) return(nullptr); return AddOutput(n,pt); diff --git a/src/RenderDevice/Shader/node/shader_node.cpp b/src/RenderDevice/Shader/node/shader_node.cpp index 1642570f..2c14b95b 100644 --- a/src/RenderDevice/Shader/node/shader_node.cpp +++ b/src/RenderDevice/Shader/node/shader_node.cpp @@ -118,6 +118,8 @@ bool Node::GenOutputParamCode(UTF8StringList &) return true; } +#define SHADER_NODE_TEMP_VALUE_COMMENT ";\t\t\t// temp value of ["+node_name+"]" + bool Node::GenTempValueDefine(UTF8StringList &sl) { const int count=input_params.GetCount(); @@ -133,9 +135,9 @@ bool Node::GenTempValueDefine(UTF8StringList &sl) pt=(*ip)->GetType(); if((*ip)->GetJoinNode()) - sl.Add("\t"+UTF8String(param::GetTypename(pt))+" "+value_name+";\t\t\t// temp value of ["+node_name+"]"); + sl.Add("\t"+UTF8String(param::GetTypename(pt))+" "+value_name+SHADER_NODE_TEMP_VALUE_COMMENT); else - sl.Add("\t"+UTF8String(param::GetTypename(pt))+" "+value_name+"="+(*ip)->GetDefaultValue()+";\t\t\t// temp value of ["+node_name+"]"); + sl.Add("\t"+UTF8String(param::GetTypename(pt))+" "+value_name+"="+(*ip)->GetDefaultValue()+SHADER_NODE_TEMP_VALUE_COMMENT); ++ip; }