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

various code cleanups

Browse Source
This commit is contained in:
itsmattkc
2021-01-13 12:05:05 +11:00
parent 8f729203fc
commit fbdda3d6d4
21 changed files with 111 additions and 2557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/block/block.cpp
+3 -3
View File
@@ -104,7 +104,7 @@ void Block::set_length_and_media_in(const rational &length)
}
// Calculate media_in adjustment
set_media_in(SequenceToMediaTime(in() + (this->length() - length)));
set_media_in(SequenceToMediaTime(this->length() - length));
// Set the length without setting media out
set_length_internal(length);
@@ -164,7 +164,7 @@ rational Block::SequenceToMediaTime(const rational &sequence_time) const
return sequence_time;
}
rational local_time = sequence_time - in();
rational local_time = sequence_time;
// FIXME: Doesn't handle reversing
if (speed_input_->IsKeyframing() || speed_input_->IsConnected()) {
@@ -208,7 +208,7 @@ rational Block::MediaToSequenceTime(const rational &media_time) const
}
}
return sequence_time + in();
return sequence_time;
}
void Block::LoadInternal(QXmlStreamReader *reader, XMLNodeData &xml_node_data)
app/node/block/clip/clip.cpp
+9 -5
View File
@@ -73,22 +73,26 @@ void ClipBlock::InvalidateCache(const TimeRange& range, const InputConnection& f
}
}
TimeRange ClipBlock::InputTimeAdjustment(NodeInput *input, const TimeRange &input_time) const
TimeRange ClipBlock::InputTimeAdjustment(NodeInput *input, int element, const TimeRange &input_time) const
{
Q_UNUSED(element)
if (input == texture_input_) {
return TimeRange(SequenceToMediaTime(input_time.in()), SequenceToMediaTime(input_time.out()));
}
return Block::InputTimeAdjustment(input, input_time);
return Block::InputTimeAdjustment(input, element, input_time);
}
TimeRange ClipBlock::OutputTimeAdjustment(NodeInput *input, const TimeRange &input_time) const
TimeRange ClipBlock::OutputTimeAdjustment(NodeInput *input, int element, const TimeRange &input_time) const
{
Q_UNUSED(element)
if (input == texture_input_) {
return TimeRange(MediaToSequenceTime(input_time.in()), MediaToSequenceTime(input_time.out()));
}
return Block::InputTimeAdjustment(input, input_time);
return Block::OutputTimeAdjustment(input, element, input_time);
}
NodeValueTable ClipBlock::Value(NodeValueDatabase &value) const
@@ -113,7 +117,7 @@ void ClipBlock::Retranslate()
void ClipBlock::Hash(QCryptographicHash &hash, const rational &time) const
{
if (texture_input_->IsConnected()) {
rational t = InputTimeAdjustment(texture_input_, TimeRange(time, time)).in();
rational t = InputTimeAdjustment(texture_input_, -1, TimeRange(time, time)).in();
texture_input_->GetConnectedNode()->Hash(hash, t);
}
app/node/block/clip/clip.h
+2 -2
View File
@@ -46,9 +46,9 @@ public:
virtual void InvalidateCache(const TimeRange& range, const InputConnection& from) override;
virtual TimeRange InputTimeAdjustment(NodeInput* input, const TimeRange& input_time) const override;
virtual TimeRange InputTimeAdjustment(NodeInput* input, int element, const TimeRange& input_time) const override;
virtual TimeRange OutputTimeAdjustment(NodeInput* input, const TimeRange& input_time) const override;
virtual TimeRange OutputTimeAdjustment(NodeInput* input, int element, const TimeRange& input_time) const override;
virtual NodeValueTable Value(NodeValueDatabase& value) const override;
app/node/block/transition/transition.cpp
+1 -1
View File
@@ -151,7 +151,7 @@ void TransitionBlock::Hash(QCryptographicHash &hash, const rational &time) const
double TransitionBlock::GetInternalTransitionTime(const double &time) const
{
return time - in().toDouble();
return time;
}
void TransitionBlock::InsertTransitionTimes(AcceleratedJob *job, const double &time) const