began new infrastructure
Yep, this is another one of my "famous" sweeping rewrites. Expect things to break. Goals for this are: - Greatly simplify node connections (particularly with arrays) so the code requires less maintenance/is more stable - Redesign node structure to address issues where UI would stall for lengthy periods of time - Less reliance on shared ptrs/greater reliance on QObject system for inheritance/memory management - General code cleanup and improvements
This commit is contained in:
@@ -0,0 +1,96 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2020 Olive Team
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
***/
|
||||
|
||||
#ifndef CONNECTABLE_H
|
||||
#define CONNECTABLE_H
|
||||
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
|
||||
namespace olive {
|
||||
|
||||
class Node;
|
||||
class NodeInput;
|
||||
|
||||
class NodeConnectable : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
NodeConnectable() = default;
|
||||
|
||||
struct InputConnection {
|
||||
InputConnection(NodeInput* i = nullptr, int e = -1)
|
||||
{
|
||||
input = i;
|
||||
element = e;
|
||||
}
|
||||
|
||||
bool operator==(const InputConnection& rhs) const
|
||||
{
|
||||
return input == rhs.input && element == rhs.element;
|
||||
}
|
||||
|
||||
NodeInput* input;
|
||||
int element;
|
||||
};
|
||||
|
||||
static void ConnectEdge(Node* output, NodeInput* input, int element = -1);
|
||||
|
||||
static void DisconnectEdge(Node* output, NodeInput* input, int element = -1);
|
||||
|
||||
struct Edge {
|
||||
Node* output;
|
||||
NodeInput* input;
|
||||
int element;
|
||||
};
|
||||
|
||||
signals:
|
||||
void OutputConnected(NodeInput* destination, int element);
|
||||
|
||||
void OutputDisconnected(NodeInput* destination, int element);
|
||||
|
||||
void InputConnected(Node* source, int element);
|
||||
|
||||
void InputDisconnected(Node* source, int element);
|
||||
|
||||
protected:
|
||||
const QVector<InputConnection>& output_connections() const
|
||||
{
|
||||
return output_connections_;
|
||||
}
|
||||
|
||||
const QHash<int, Node*>& input_connections() const
|
||||
{
|
||||
return input_connections_;
|
||||
}
|
||||
|
||||
private:
|
||||
QVector<InputConnection> output_connections_;
|
||||
|
||||
QHash<int, Node*> input_connections_;
|
||||
|
||||
};
|
||||
|
||||
uint qHash(const NodeConnectable::InputConnection& r, uint seed = 0);
|
||||
|
||||
}
|
||||
|
||||
#endif // CONNECTABLE_H
|
||||
Reference in New Issue
Block a user