oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated NodeInputs to use a standard value as well as keyframed values

Browse Source 
Previously the non-keyframed value was stored as a static keyframe but this
introduced issues when an input was in a state of keyframes being enabled but
0 keyframes existing. Having a standard value makes much more sense.
This commit is contained in:
itsmattkc
2019-12-27 02:06:41 +11:00
parent 7a512cc540
commit e32376a8b7
9 changed files with 142 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/block/block.cpp
+6 -6
View File
@@ -75,7 +75,7 @@ void Block::set_out(const rational &out)
rational Block::length() const
{
return length_input_->get_value_at_time(0).value<rational>();
return length_input_->get_standard_value().value<rational>();
}
void Block::set_length(const rational &length)
@@ -86,7 +86,7 @@ void Block::set_length(const rational &length)
return;
}
length_input_->set_override_value(QVariant::fromValue(length));
length_input_->set_standard_value(QVariant::fromValue(length));
}
void Block::set_length_and_media_out(const rational &length)
@@ -153,22 +153,22 @@ void Block::set_next(Block *next)
rational Block::media_in() const
{
return media_in_input_->get_value_at_time(0).value<rational>();
return media_in_input_->get_standard_value().value<rational>();
}
void Block::set_media_in(const rational &media_in)
{
media_in_input_->set_override_value(QVariant::fromValue(media_in));
media_in_input_->set_standard_value(QVariant::fromValue(media_in));
}
rational Block::media_out() const
{
return media_out_input_->get_value_at_time(0).value<rational>();
return media_out_input_->get_standard_value().value<rational>();
}
void Block::set_media_out(const rational &media_out)
{
media_out_input_->set_override_value(QVariant::fromValue(media_out));
media_out_input_->set_standard_value(QVariant::fromValue(media_out));
}
rational Block::media_length() const