moved progress calculations from openglworker to transitionblock

These functions are universal transition functions that have use outside of
the OpenGL workers.
This commit is contained in:
itsmattkc
2020-01-06 16:35:45 +11:00
parent 8391a732b1
commit 8358d7d221
3 changed files with 49 additions and 18 deletions
+40
View File
@@ -1,5 +1,7 @@
#include "transition.h"
#include "common/clamp.h"
TransitionBlock::TransitionBlock() :
connected_out_block_(nullptr),
connected_in_block_(nullptr)
@@ -48,6 +50,44 @@ rational TransitionBlock::out_offset() const
return 0;
}
Block *TransitionBlock::connected_out_block() const
{
return connected_out_block_;
}
Block *TransitionBlock::connected_in_block() const
{
return connected_in_block_;
}
double TransitionBlock::GetTotalProgress(const rational &time) const
{
return GetInternalTransitionTime(time) / length().toDouble();
}
double TransitionBlock::GetOutProgress(const rational &time) const
{
if (out_offset() == 0) {
return 0;
}
return clamp(1.0 - (GetInternalTransitionTime(time) / out_offset().toDouble()), 0.0, 1.0);
}
double TransitionBlock::GetInProgress(const rational &time) const
{
if (in_offset() == 0) {
return 0;
}
return clamp((GetInternalTransitionTime(time) - out_offset().toDouble()) / in_offset().toDouble(), 0.0, 1.0);
}
double TransitionBlock::GetInternalTransitionTime(const rational &time) const
{
return time.toDouble() - in().toDouble();
}
void TransitionBlock::BlockConnected(NodeEdgePtr edge)
{
if (!edge->output()->parentNode()->IsBlock()) {
+6
View File
@@ -21,7 +21,13 @@ public:
Block* connected_out_block() const;
Block* connected_in_block() const;
double GetTotalProgress(const rational& time) const;
double GetOutProgress(const rational& time) const;
double GetInProgress(const rational& time) const;
private:
double GetInternalTransitionTime(const rational& time) const;
NodeInput* out_block_input_;
NodeInput* in_block_input_;