finished json loader

1 files changed, 8 insertions, 5 deletions

diff --git a/rotord/src/graph.cpp b/rotord/src/graph.cpp
index 139873f..5871b7b 100644
--- a/rotord/src/graph.cpp
+++ b/rotord/src/graph.cpp
@@ -43,6 +43,9 @@ bool Graph::video_render(const string &output_filename,const string &audio_filen
 	}
 	if (find_node("video_output")) {
 		Video_output *video_output=dynamic_cast<Video_output*>(find_node("video_output"));
+		for (auto f: find_nodes("video_feedback")){
+			(dynamic_cast<Video_feedback*>(f))->set_feedback(&(video_output->image));
+		}
 		return video_output->render(duration,framerate,output_filename,audio_filename,progress,outW,outH);
 	}
 	
@@ -167,10 +170,10 @@ bool Graph::parseJson(string &data,string &media_path){
 				for (int l=0;l<jnodes[i]["parameters"].size();l++){
 					
 					string parameter=jnodes[i]["parameters"][l]["name"].asString();
-					/*
+					
 					if (nodes[nodeID]->parameters.find(parameter)!=nodes[nodeID]->parameters.end()) {
-						string val=jnodes[i]["parameters"][l]["value"].asString();
-						if (val!="") nodes[nodeID]->parameters.find(parameter)->second->value=ofToFloat(val);
+						float val=jnodes[i]["parameters"][l]["value"].asFloat();
+						nodes[nodeID]->parameters.find(parameter)->second->value=val;
 						string fromID=jnodes[i]["parameters"][l]["from"].asString();
 						if (nodes.find(fromID)!=nodes.end()) {
 							if (!nodes[nodeID]->parameters[parameter]->connect(nodes[fromID])){
@@ -181,8 +184,8 @@ bool Graph::parseJson(string &data,string &media_path){
 						}
 						else if (fromID!="") cerr << "Rotor: linking parameter " << parameter << " of node: '" << nodeID << "', cannot find target '" << fromID << "'" << endl;
 					}
-					else cerr << "Rotor: cannot find parameter input '" << parameter << "' of "<<settings["type"]<<" "<< nodeID << endl;
-					*/
+					else cerr << "Rotor: cannot find parameter '" << parameter << "' of "<<settings["type"]<<" "<< nodeID << endl;
+					
 				}
 				//