oak-team/oak-editor
1
0
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
app/node/node.cpp
+6 -6
View File
@@ -203,13 +203,13 @@ void Node::EndOperation()
}
}
TimeRange Node::InputTimeAdjustment(NodeInput *, const TimeRange &input_time) const
TimeRange Node::InputTimeAdjustment(NodeInput *, int, const TimeRange &input_time) const
{
// Default behavior is no time adjustment at all
return input_time;
}
TimeRange Node::OutputTimeAdjustment(NodeInput *, const TimeRange &input_time) const
TimeRange Node::OutputTimeAdjustment(NodeInput *, int, const TimeRange &input_time) const
{
// Default behavior is no time adjustment at all
return input_time;
@@ -398,7 +398,7 @@ void Node::HashInputElement(QCryptographicHash &hash, NodeInput *input, int elem
{
// Get time adjustment
// For a single frame, we only care about one of the times
rational input_time = InputTimeAdjustment(input, TimeRange(time, time)).in();
rational input_time = InputTimeAdjustment(input, element, TimeRange(time, time)).in();
if (input->IsConnected(element)) {
// Traverse down this edge
@@ -661,8 +661,8 @@ QVector<TimeRange> Node::TransformTimeTo(const TimeRange &time, Node *target, bo
// If this input is connected, traverse it to see if we stumble across the specified `node`
foreach (NodeInput* input, inputs_) {
for (auto it=input->edges().cbegin(); it!=input->edges().cend(); it++) {
TimeRange input_adjustment = InputTimeAdjustment(input, time);
Node* connected = input->GetConnectedNode(it.key());
TimeRange input_adjustment = InputTimeAdjustment(input, it.key(), time);
Node* connected = it.value();
if (connected == target) {
// We found the target, no need to keep traversing
@@ -680,7 +680,7 @@ QVector<TimeRange> Node::TransformTimeTo(const TimeRange &time, Node *target, bo
foreach (const InputConnection& conn, edges()) {
Node* input_node = conn.input->parent();
TimeRange output_adjustment = input_node->OutputTimeAdjustment(conn.input, time);
TimeRange output_adjustment = input_node->OutputTimeAdjustment(conn.input, conn.element, time);
if (input_node == target) {
paths_found.append(output_adjustment);
app/node/node.h
+2 -2
View File
@@ -329,12 +329,12 @@ public:
* If this node modifies the `time` (i.e. a clip converting sequence time to media time), this function should be
* overridden to do so. Also make sure to override OutputTimeAdjustment() to provide the inverse function.
*/
virtual TimeRange InputTimeAdjustment(NodeInput* input, const TimeRange& input_time) const;
virtual TimeRange InputTimeAdjustment(NodeInput* input, int element, const TimeRange& input_time) const;
/**
* @brief The inverse of InputTimeAdjustment()
*/
virtual TimeRange OutputTimeAdjustment(NodeInput* input, const TimeRange& input_time) const;
virtual TimeRange OutputTimeAdjustment(NodeInput* input, int element, const TimeRange& input_time) const;
/**
* @brief Copies inputs from from Node to another including connections
app/node/output/track/track.cpp
+29 -5
View File
@@ -96,6 +96,30 @@ QString Track::Description() const
"a Sequence.");
}
TimeRange Track::InputTimeAdjustment(NodeInput *input, int element, const TimeRange &input_time) const
{
if (input == block_input_ && element >= 0) {
int cache_index = GetCacheIndexFromArrayIndex(element);
const rational& block_in = blocks_.at(cache_index).range.in();
return input_time - block_in;
}
return Node::InputTimeAdjustment(input, element, input_time);
}
TimeRange Track::OutputTimeAdjustment(NodeInput *input, int element, const TimeRange &input_time) const
{
if (input == block_input_ && element >= 0) {
int cache_index = GetCacheIndexFromArrayIndex(element);
const rational& block_in = blocks_.at(cache_index).range.in();
return input_time + block_in;
}
return Node::OutputTimeAdjustment(input, element, input_time);
}
const double &Track::GetTrackHeight() const
{
return track_height_;
@@ -435,15 +459,15 @@ void Track::UpdateInOutFrom(int index)
SetLengthInternal(last_out);
}
int Track::GetInputIndexFromCacheIndex(int cache_index)
int Track::GetArrayIndexFromCacheIndex(int index) const
{
return GetInputIndexFromCacheIndex(block_cache_.at(cache_index));
return blocks_.at(index).array_index;
}
int Track::GetInputIndexFromCacheIndex(Block *block)
int Track::GetCacheIndexFromArrayIndex(int index) const
{
for (int i=0; i<block_input_->ArraySize(); i++) {
if (block_input_->GetConnectedNode(i) == block) {
for (int i=0; i<blocks_.size(); i++) {
if (blocks_.at(i).array_index == index) {
return i;
}
}
app/node/output/track/track.h
+10 -5
View File
@@ -18,8 +18,8 @@
***/
#ifndef TRACKOUTPUT_H
#define TRACKOUTPUT_H
#ifndef TRACK_H
#define TRACK_H
#include "audio/audiovisualwaveform.h"
#include "node/block/block.h"
@@ -56,6 +56,10 @@ public:
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override;
virtual TimeRange InputTimeAdjustment(NodeInput* input, int element, const TimeRange& input_time) const override;
virtual TimeRange OutputTimeAdjustment(NodeInput* input, int element, const TimeRange& input_time) const override;
const double& GetTrackHeight() const;
void SetTrackHeight(const double& height);
@@ -277,8 +281,9 @@ protected:
private:
void UpdateInOutFrom(int index);
int GetInputIndexFromCacheIndex(int cache_index);
int GetInputIndexFromCacheIndex(Block* block);
int GetArrayIndexFromCacheIndex(int index) const;
int GetCacheIndexFromArrayIndex(int index) const;
void SetLengthInternal(const rational& r, bool invalidate = true);
@@ -313,4 +318,4 @@ private slots:
}
#endif // TRACKOUTPUT_H
#endif // TRACK_H
app/node/output/viewer/viewer.h
+5
View File
@@ -97,6 +97,11 @@ public:
return track_cache_;
}
Track* GetTrackFromReference(const TrackReference& track_ref) const
{
return track_lists_.at(track_ref.type())->GetTrackAt(track_ref.index());
}
/**
* @brief Same as GetTracks() but omits tracks that are locked.
*/
app/node/traverser.cpp
+15 -12
View File
@@ -34,9 +34,7 @@ NodeValueDatabase NodeTraverser::GenerateDatabase(const Node* node, const TimeRa
return NodeValueDatabase();
}
TimeRange input_time = node->InputTimeAdjustment(input, range);
database.Insert(input, ProcessInput(input, input_time));
database.Insert(input, ProcessInput(input, range));
}
AddGlobalsToDatabase(database, range);
@@ -47,16 +45,18 @@ NodeValueDatabase NodeTraverser::GenerateDatabase(const Node* node, const TimeRa
NodeValueTable NodeTraverser::ProcessInput(NodeInput* input, const TimeRange& range)
{
// If input is connected, retrieve value directly
Node* node = input->parent();
if (input->IsConnected()) {
TimeRange adjusted_range = node->InputTimeAdjustment(input, -1, range);
// Value will equal something from the connected node, follow it
return GenerateTable(input->GetConnectedNode(), range);
return GenerateTable(input->GetConnectedNode(), adjusted_range);
} else {
// Store node
Node* node = static_cast<Node*>(input->parent());
QVariant return_val;
if (input->IsArray()) {
@@ -66,11 +66,12 @@ NodeValueTable NodeTraverser::ProcessInput(NodeInput* input, const TimeRange& ra
for (int i=0; i<array_tbl.size(); i++) {
NodeValueTable& sub_tbl = array_tbl[i];
TimeRange adjusted_range = node->InputTimeAdjustment(input, i, range);
if (input->IsConnected(i)) {
sub_tbl = GenerateTable(input->GetConnectedNode(i), range);
sub_tbl = GenerateTable(input->GetConnectedNode(i), adjusted_range);
} else {
QVariant input_value = input->GetValueAtTime(range.in(), i);
QVariant input_value = input->GetValueAtTime(adjusted_range.in(), i);
sub_tbl.Push(input->GetDataType(), input_value, node);
}
}
@@ -80,7 +81,9 @@ NodeValueTable NodeTraverser::ProcessInput(NodeInput* input, const TimeRange& ra
} else {
// Not connected or an array, just pull the immediate
return_val = input->GetValueAtTime(range.in());
TimeRange adjusted_range = node->InputTimeAdjustment(input, -1, range);
return_val = input->GetValueAtTime(adjusted_range.in());
}
@@ -120,12 +123,12 @@ NodeValueTable NodeTraverser::GenerateTable(const Node *n, const rational &in, c
NodeValueTable NodeTraverser::GenerateBlockTable(const Track *track, const TimeRange &range)
{
// By default, just follow the in point
Block* active_block = track->BlockAtTime(range.in());
int active_block = track->BlockAtTime(range.in());
NodeValueTable table;
if (active_block) {
table = GenerateTable(active_block, range);
if (active_block >= 0) {
table = GenerateTable(track->Blocks().at(active_block).block, range);
}
return table;