diff options
Diffstat (limited to 'rotord/rotor.cpp')
| -rwxr-xr-x | rotord/rotor.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/rotord/rotor.cpp b/rotord/rotor.cpp index cffb929..ab02298 100755 --- a/rotord/rotor.cpp +++ b/rotord/rotor.cpp @@ -54,15 +54,20 @@ void Render_context::add_queue(int item) { work_queue.push_back(item); mutex.unlock(); } - bool Signal_input::connect(Signal_node* source) { if (source->output_type=="signal") { connection=(Node*)source; return true; } else return false; -}; - +} +bool Image_input::connect(Image_node* source) { + if (source->output_type=="image") { + connection=(Node*)source; + return true; + } + else return false; +} bool Signal_output::render(const float duration, const float framerate,string &xml_out){ //testing signal routes cerr << "Rotor: Signal_output rendering " << duration << " seconds at " << framerate << " frames per second" << endl; @@ -488,11 +493,11 @@ bool Graph::load(string &filename){ } int n3=xml.getNumTags("image_input"); for (int i3=0;i3<n3;i3++){ - nodes[nodeID]->create_image_input(xml.getValue("image_input","",i3)); - string fromID=xml.getAttribute("image_input","from","",i2); + ((Image_node*)nodes[nodeID])->create_image_input(xml.getValue("image_input","",i3)); + string fromID=xml.getAttribute("image_input","from","",i3); if (nodes.find(fromID)!=nodes.end()) { - if (!nodes[nodeID]->inputs[i3]->connect((Image_node*)nodes[fromID])){ - cerr << "Rotor: graph loader cannot connect input " << i3 << " of node '" << nodeID << "' to node '" << fromID << "'" << endl; + if (!(((Image_node*)nodes[nodeID])->image_inputs[i3]->connect((Image_node*)nodes[fromID]))){ + cerr << "Rotor: graph loader cannot connect image input " << i3 << " of node '" << nodeID << "' to node '" << fromID << "'" << endl; return false; } else cerr << "Rotor: linked input " << i3 << " of node '" << nodeID << "' to node '" << fromID << "'" << endl; |