diff options
Diffstat (limited to 'rotord')
| -rw-r--r-- | rotord/src/graph.h | 8 | ||||
| -rw-r--r-- | rotord/src/rotor.cpp | 3 | ||||
| -rw-r--r-- | rotord/src/rotor.h | 8 |
3 files changed, 15 insertions, 4 deletions
diff --git a/rotord/src/graph.h b/rotord/src/graph.h index 5e3d1cd..6f2ee79 100644 --- a/rotord/src/graph.h +++ b/rotord/src/graph.h @@ -12,6 +12,14 @@ Graph is an instance of a rotor renderer +tidy up loading stuff +kill xml or retain? +make codebase closer + +-validate loader menthod +get number of nodes +copy nodes ` + -------------------------*/ namespace Rotor { diff --git a/rotord/src/rotor.cpp b/rotord/src/rotor.cpp index b86e067..848ac2b 100644 --- a/rotord/src/rotor.cpp +++ b/rotord/src/rotor.cpp @@ -151,6 +151,7 @@ void Node_factory::list_node(Rotor::Node* type,xmlIO XML,int i=0){ XML.addAttribute("parameter","value",parameter.second->value,j); XML.addAttribute("parameter","min",parameter.second->min,j); XML.addAttribute("parameter","max",parameter.second->max,j); + XML.addAttribute("parameter","step",parameter.second->step,j); j++; } j=0; @@ -246,6 +247,7 @@ void Node_factory::list_categories(Json::Value &JSON){ parameter["value"]=param.second->value; parameter["min"]=param.second->min; parameter["max"]=param.second->max; + parameter["step"]=param.second->step; node["parameters"].append(parameter); } } @@ -316,6 +318,7 @@ void Node_factory::list_nodes(Json::Value &JSON){ parameter["value"]=param.second->value; parameter["min"]=param.second->min; parameter["max"]=param.second->max; + parameter["step"]=param.second->step; node["parameters"].append(parameter); } } diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index cfdf80f..d9ba66d 100644 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -197,8 +197,8 @@ namespace Rotor { void init(const float &_val){ value=_val; } - Parameter(const string &_type,const string &_desc,const string &_title,float _value,float _min,float _max,Node* _connect): Signal_input(_desc,_title,_connect),value(_value),min(_min),max(_max),type(_type){}; - float value,min,max; + Parameter(const string &_type,const string &_desc,const string &_title,float _value,float _min,float _max,float _step,Node* _connect): Signal_input(_desc,_title,_connect),value(_value),min(_min),max(_max),step(_step),type(_type){}; + float value,min,max,step; float get(const Time_spec& time); string type; }; @@ -236,8 +236,8 @@ namespace Rotor { void create_signal_input(const string &_desc,const string &_title,Node* _connect=nullptr ) { inputs.push_back(new Signal_input(_desc,_title,_connect)); }; - void create_parameter(const string &_name,const string &_type,const string &_desc,const string &_title,float _value=1.0f,float _min=0.0f,float _max=0.0f,Node* _connect=nullptr) { - parameters[_name]=new Parameter(_type,_desc,_title,_value,_min,_max,_connect); + void create_parameter(const string &_name,const string &_type,const string &_desc,const string &_title,float _value=1.0f,float _min=0.0f,float _max=0.0f,float _step=0.0f,Node* _connect=nullptr) { + parameters[_name]=new Parameter(_type,_desc,_title,_value,_min,_max,_step,_connect); }; void create_attribute(const string &_attr,const string &_desc,const string &_title,const string &_value,std::vector<std::string> _vals={}) { attributes[_attr]=new Attribute(_desc,_title,_value,_vals); |