summaryrefslogtreecommitdiff
path: root/rotord/rotor.cpp
diff options
context:
space:
mode:
authorTim Redfern <tim@herge.(none)>2013-07-16 15:55:57 +0100
committerTim Redfern <tim@herge.(none)>2013-07-16 15:55:57 +0100
commitf7fcf8cdea57a043b99d90549407195ea1148042 (patch)
tree27e065ede8c8ee75adb88977d12e2928634d3220 /rotord/rotor.cpp
parentfa9ec6ed48b78d17bd367a4838af36530a8a0347 (diff)
alpha not yet working
Diffstat (limited to 'rotord/rotor.cpp')
-rwxr-xr-xrotord/rotor.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/rotord/rotor.cpp b/rotord/rotor.cpp
index 90d23d9..a1163fe 100755
--- a/rotord/rotor.cpp
+++ b/rotord/rotor.cpp
@@ -30,6 +30,7 @@ Node_factory::Node_factory(){
add_type("mirror",new Mirror());
add_type("monochrome",new Monochrome());
add_type("transform",new Transform());
+ add_type("alpha_merge",new Alpha_merge());
}
bool Signal_input::connect(Signal_node* source) {
@@ -39,7 +40,7 @@ bool Signal_input::connect(Signal_node* source) {
}
else return false;
}
-void Parameter_input::update(const Time_spec& time){ //gets input and updates variable
+void Parameter_input::update(const Time_spec& time){ //gets input and updates variable
if (receiver){
*receiver=((Signal_node*)connection)->get_output(time);
}
@@ -51,7 +52,7 @@ bool Image_input::connect(Image_node* source) {
}
else return false;
}
-void Node::update_params(const Time_spec& time){ //compute connected parameters
+void Node::update_params(const Time_spec& time){ //compute connected parameters
for (auto p:parameter_inputs){
p->update(time);
}