build: split the engine into liboakengine.so; worker drops the UI entirely
Physical split: app/{audio,cli,codec,common,config,node,pluginSupport,
render,task,timeline,undo,tool,shaders} plus coreengine, version and
ui/icons+colorcoding move to a new top-level engine/ tree, built as
liboakengine.so (shared). The render backends (oakgl/oakvulkan) move
with it and link the engine library instead of embedding a static
render-core subset (libolive-rendercore is gone).
- oak-render-worker now links liboakengine instead of the whole
libolive-editor object set: 336MB -> 2.9MB, no Qt Widgets UI
- the editor links liboakengine for the engine and keeps only UI
objects in libolive-editor
- install/packaging: GNUInstallDirs libdir on Linux, bundle copy on
macOS, oakengine.dll staged for NSIS, AppImage validation entry
- fix backend lookup for the new layout: DynamicRenderer searched
../app but backends now live in engine/; a stale pre-split liboakgl
in the build tree got dlopened instead, re-initialized and later
destroyed the interposed engine statics (full-suite segfault at
DialogSequenceParameterTab, found via gdb watchpoint)
This commit is contained in:
@@ -0,0 +1,361 @@
|
||||
/***
|
||||
|
||||
Olive - Non-Linear Video Editor
|
||||
Copyright (C) 2022 Olive Team
|
||||
Modifications Copyright (C) 2025 mikesolar
|
||||
|
||||
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/>.
|
||||
|
||||
***/
|
||||
|
||||
#include "shapenodebase.h"
|
||||
|
||||
#include <QtMath>
|
||||
#include <QVector2D>
|
||||
|
||||
#include "common/util.h"
|
||||
#include "node/nodeundo.h"
|
||||
|
||||
namespace olive
|
||||
{
|
||||
|
||||
#define super GeneratorWithMerge
|
||||
|
||||
const QString ShapeNodeBase::k_position_input = QStringLiteral("pos_in");
|
||||
const QString ShapeNodeBase::k_size_input = QStringLiteral("size_in");
|
||||
const QString ShapeNodeBase::k_color_input = QStringLiteral("color_in");
|
||||
|
||||
ShapeNodeBase::ShapeNodeBase(bool create_color_input)
|
||||
{
|
||||
add_input(k_position_input, NodeValue::k_vec2, QVector2D(0, 0));
|
||||
add_input(k_size_input, NodeValue::k_vec2, QVector2D(100, 100));
|
||||
set_input_property(k_size_input, QStringLiteral("min"), QVector2D(0, 0));
|
||||
|
||||
if (create_color_input) {
|
||||
add_input(k_color_input, NodeValue::k_color,
|
||||
QVariant::fromValue(Color(1.0, 0.0, 0.0, 1.0)));
|
||||
}
|
||||
|
||||
// Initiate gizmos
|
||||
QVector<NodeKeyframeTrackReference> pos_n_sz = {
|
||||
NodeKeyframeTrackReference(NodeInput(this, k_position_input), 0),
|
||||
NodeKeyframeTrackReference(NodeInput(this, k_position_input), 1),
|
||||
NodeKeyframeTrackReference(NodeInput(this, k_size_input), 0),
|
||||
NodeKeyframeTrackReference(NodeInput(this, k_size_input), 1)
|
||||
};
|
||||
poly_gizmo_ = add_draggable_gizmo<PolygonGizmo>({
|
||||
NodeKeyframeTrackReference(NodeInput(this, k_position_input), 0),
|
||||
NodeKeyframeTrackReference(NodeInput(this, k_position_input), 1),
|
||||
});
|
||||
for (int i = 0; i < k_gizmo_scale_count; i++) {
|
||||
point_gizmo_[i] =
|
||||
add_draggable_gizmo<PointGizmo>(pos_n_sz, PointGizmo::k_absolute);
|
||||
}
|
||||
}
|
||||
|
||||
void ShapeNodeBase::retranslate()
|
||||
{
|
||||
super::retranslate();
|
||||
|
||||
set_input_name(k_position_input, tr("Position"));
|
||||
set_input_name(k_size_input, tr("Size"));
|
||||
|
||||
if (has_input_with_id(k_color_input)) {
|
||||
set_input_name(k_color_input, tr("Color"));
|
||||
}
|
||||
}
|
||||
|
||||
void ShapeNodeBase::update_gizmo_positions(const NodeValueRow &row,
|
||||
const NodeGlobals &globals)
|
||||
{
|
||||
// Use offsets to make the appearance of values that start in the top left, even though we
|
||||
// really anchor around the center
|
||||
QVector2D center_pt = globals.square_resolution() * 0.5;
|
||||
set_input_property(k_position_input, QStringLiteral("offset"), center_pt);
|
||||
|
||||
QVector2D pos = row[k_position_input].to_vec2();
|
||||
QVector2D sz = row[k_size_input].to_vec2();
|
||||
QVector2D half_sz = sz * 0.5;
|
||||
|
||||
double left_pt = pos.x() + center_pt.x() - half_sz.x();
|
||||
double top_pt = pos.y() + center_pt.y() - half_sz.y();
|
||||
double right_pt = left_pt + sz.x();
|
||||
double bottom_pt = top_pt + sz.y();
|
||||
double center_x_pt = mid(left_pt, right_pt);
|
||||
double center_y_pt = mid(top_pt, bottom_pt);
|
||||
|
||||
point_gizmo_[k_gizmo_scale_top_left]->set_point(QPointF(left_pt, top_pt));
|
||||
point_gizmo_[k_gizmo_scale_top_center]->set_point(QPointF(center_x_pt, top_pt));
|
||||
point_gizmo_[k_gizmo_scale_top_right]->set_point(QPointF(right_pt, top_pt));
|
||||
point_gizmo_[k_gizmo_scale_bottom_left]->set_point(QPointF(left_pt, bottom_pt));
|
||||
point_gizmo_[k_gizmo_scale_bottom_center]->set_point(
|
||||
QPointF(center_x_pt, bottom_pt));
|
||||
point_gizmo_[k_gizmo_scale_bottom_right]->set_point(
|
||||
QPointF(right_pt, bottom_pt));
|
||||
point_gizmo_[k_gizmo_scale_center_left]->set_point(
|
||||
QPointF(left_pt, center_y_pt));
|
||||
point_gizmo_[k_gizmo_scale_center_right]->set_point(
|
||||
QPointF(right_pt, center_y_pt));
|
||||
|
||||
poly_gizmo_->set_polygon(
|
||||
QRectF(left_pt, top_pt, right_pt - left_pt, bottom_pt - top_pt));
|
||||
}
|
||||
|
||||
void ShapeNodeBase::set_rect(QRectF rect, const VideoParams &sequence_res,
|
||||
MultiUndoCommand *command)
|
||||
{
|
||||
// Normalize around center of sequence
|
||||
rect.translate(-sequence_res.width() * 0.5, -sequence_res.height() * 0.5);
|
||||
rect.translate(rect.width() * 0.5, rect.height() * 0.5);
|
||||
|
||||
NodeInput pos(this, ShapeNodeBase::k_position_input);
|
||||
NodeInput sz(this, ShapeNodeBase::k_size_input);
|
||||
|
||||
command->add_child(new NodeParamSetStandardValueCommand(
|
||||
NodeKeyframeTrackReference(sz, 0), rect.width()));
|
||||
command->add_child(new NodeParamSetStandardValueCommand(
|
||||
NodeKeyframeTrackReference(sz, 1), rect.height()));
|
||||
command->add_child(new NodeParamSetStandardValueCommand(
|
||||
NodeKeyframeTrackReference(pos, 0), rect.x()));
|
||||
command->add_child(new NodeParamSetStandardValueCommand(
|
||||
NodeKeyframeTrackReference(pos, 1), rect.y()));
|
||||
}
|
||||
|
||||
void ShapeNodeBase::gizmo_drag_move(double x, double y,
|
||||
const Qt::KeyboardModifiers &modifiers)
|
||||
{
|
||||
DraggableGizmo *gizmo = static_cast<DraggableGizmo *>(sender());
|
||||
|
||||
NodeInputDragger &x_drag = gizmo->get_draggers()[0];
|
||||
NodeInputDragger &y_drag = gizmo->get_draggers()[1];
|
||||
|
||||
if (gizmo == poly_gizmo_) {
|
||||
x_drag.drag(x_drag.get_start_value().toDouble() + x);
|
||||
y_drag.drag(y_drag.get_start_value().toDouble() + y);
|
||||
} else {
|
||||
bool from_center = modifiers & Qt::AltModifier;
|
||||
bool keep_ratio = modifiers & Qt::ShiftModifier;
|
||||
|
||||
NodeInputDragger &w_drag = gizmo->get_draggers()[2];
|
||||
NodeInputDragger &h_drag = gizmo->get_draggers()[3];
|
||||
|
||||
QVector2D gizmo_sz_start(w_drag.get_start_value().toDouble(),
|
||||
h_drag.get_start_value().toDouble());
|
||||
QVector2D gizmo_pos_start(x_drag.get_start_value().toDouble(),
|
||||
y_drag.get_start_value().toDouble());
|
||||
QVector2D gizmo_half_res = gizmo->get_globals().square_resolution() / 2;
|
||||
QVector2D adjusted_pt(x, y);
|
||||
QVector2D new_size;
|
||||
QVector2D new_pos;
|
||||
QVector2D anchor;
|
||||
static const int k_xy_count = 2;
|
||||
bool negative[k_xy_count] = { false };
|
||||
|
||||
double original_ratio;
|
||||
if (keep_ratio) {
|
||||
original_ratio = w_drag.get_start_value().toDouble() /
|
||||
h_drag.get_start_value().toDouble();
|
||||
}
|
||||
|
||||
// Calculate new size
|
||||
if (from_center) {
|
||||
// Calculate new size by using distance from center and doubling it
|
||||
new_size = (adjusted_pt - gizmo_half_res - gizmo_pos_start) * 2;
|
||||
|
||||
if (is_gizmo_top(gizmo)) {
|
||||
new_size.setY(-new_size.y());
|
||||
}
|
||||
|
||||
if (is_gizmo_left(gizmo)) {
|
||||
new_size.setX(-new_size.x());
|
||||
}
|
||||
} else {
|
||||
// Calculate new size by using distance from "anchor" - i.e. the opposite point of the shape
|
||||
// from the gizmo being dragged
|
||||
adjusted_pt -= gizmo_half_res;
|
||||
|
||||
anchor = generate_gizmo_anchor(gizmo_pos_start, gizmo_sz_start, gizmo,
|
||||
&adjusted_pt) +
|
||||
gizmo_half_res;
|
||||
|
||||
adjusted_pt += gizmo_half_res;
|
||||
|
||||
// Calculate size and position
|
||||
new_size = adjusted_pt - anchor;
|
||||
|
||||
// Abs size so neither coord is negative
|
||||
for (int i = 0; i < k_xy_count; i++) {
|
||||
if (new_size[i] < 0) {
|
||||
negative[i] = true;
|
||||
new_size[i] = -new_size[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Restrict sizes by constraints
|
||||
if (is_gizmo_vertical_center(gizmo)) {
|
||||
if (keep_ratio) {
|
||||
// Calculate width from new height
|
||||
new_size.setX(new_size.y() * original_ratio);
|
||||
} else {
|
||||
// Constrain to original width
|
||||
new_size.setX(gizmo_sz_start.x());
|
||||
}
|
||||
}
|
||||
|
||||
if (is_gizmo_horizontal_center(gizmo)) {
|
||||
if (keep_ratio) {
|
||||
// Calculate height from new width
|
||||
new_size.setY(new_size.x() / original_ratio);
|
||||
} else {
|
||||
// Constrain to original height
|
||||
new_size.setY(gizmo_sz_start.y());
|
||||
}
|
||||
}
|
||||
|
||||
if (is_gizmo_corner(gizmo)) {
|
||||
if (keep_ratio) {
|
||||
float hypot = std::hypot(new_size.x(), new_size.y());
|
||||
|
||||
float original_angle =
|
||||
std::atan2(gizmo_sz_start.x(), gizmo_sz_start.y());
|
||||
|
||||
// Calculate new size based on original angle and hypotenuse
|
||||
new_size.setX(std::sin(original_angle) * hypot);
|
||||
new_size.setY(std::cos(original_angle) * hypot);
|
||||
}
|
||||
}
|
||||
|
||||
// Calculate position
|
||||
if (from_center) {
|
||||
new_pos = gizmo_pos_start;
|
||||
} else {
|
||||
QVector2D using_size = new_size;
|
||||
|
||||
// Un-abs size
|
||||
for (int i = 0; i < k_xy_count; i++) {
|
||||
if (negative[i]) {
|
||||
using_size[i] = -using_size[i];
|
||||
}
|
||||
}
|
||||
|
||||
// I'm pretty sure there's an algorithmic way of doing this, but I'm tired and this works
|
||||
if (is_gizmo_horizontal_center(gizmo)) {
|
||||
using_size.setY(0);
|
||||
}
|
||||
|
||||
if (is_gizmo_vertical_center(gizmo)) {
|
||||
using_size.setX(0);
|
||||
}
|
||||
|
||||
new_pos =
|
||||
generate_gizmo_anchor(gizmo_pos_start, gizmo_sz_start, gizmo) +
|
||||
using_size / 2;
|
||||
}
|
||||
|
||||
x_drag.drag(new_pos.x());
|
||||
y_drag.drag(new_pos.y());
|
||||
w_drag.drag(new_size.x());
|
||||
h_drag.drag(new_size.y());
|
||||
}
|
||||
}
|
||||
|
||||
QVector2D ShapeNodeBase::generate_gizmo_anchor(const QVector2D &pos,
|
||||
const QVector2D &size,
|
||||
NodeGizmo *gizmo,
|
||||
QVector2D *pt) const
|
||||
{
|
||||
QVector2D anchor = pos;
|
||||
QVector2D half_sz = size / 2;
|
||||
|
||||
if (is_gizmo_left(gizmo)) {
|
||||
anchor.setX(anchor.x() + half_sz.x());
|
||||
if (pt && pt->x() > anchor.x()) {
|
||||
pt->setX(anchor.x());
|
||||
}
|
||||
}
|
||||
|
||||
if (is_gizmo_right(gizmo)) {
|
||||
anchor.setX(anchor.x() - half_sz.x());
|
||||
if (pt && pt->x() < anchor.x()) {
|
||||
pt->setX(anchor.x());
|
||||
}
|
||||
}
|
||||
|
||||
if (is_gizmo_top(gizmo)) {
|
||||
anchor.setY(anchor.y() + half_sz.y());
|
||||
if (pt && pt->y() > anchor.y()) {
|
||||
pt->setY(anchor.y());
|
||||
}
|
||||
}
|
||||
|
||||
if (is_gizmo_bottom(gizmo)) {
|
||||
anchor.setY(anchor.y() - half_sz.y());
|
||||
if (pt && pt->y() < anchor.y()) {
|
||||
pt->setY(anchor.y());
|
||||
}
|
||||
}
|
||||
|
||||
return anchor;
|
||||
}
|
||||
|
||||
bool ShapeNodeBase::is_gizmo_top(NodeGizmo *g) const
|
||||
{
|
||||
return g == point_gizmo_[k_gizmo_scale_top_center] ||
|
||||
g == point_gizmo_[k_gizmo_scale_top_left] ||
|
||||
g == point_gizmo_[k_gizmo_scale_top_right];
|
||||
}
|
||||
|
||||
bool ShapeNodeBase::is_gizmo_bottom(NodeGizmo *g) const
|
||||
{
|
||||
return g == point_gizmo_[k_gizmo_scale_bottom_center] ||
|
||||
g == point_gizmo_[k_gizmo_scale_bottom_left] ||
|
||||
g == point_gizmo_[k_gizmo_scale_bottom_right];
|
||||
}
|
||||
|
||||
bool ShapeNodeBase::is_gizmo_left(NodeGizmo *g) const
|
||||
{
|
||||
return g == point_gizmo_[k_gizmo_scale_top_left] ||
|
||||
g == point_gizmo_[k_gizmo_scale_center_left] ||
|
||||
g == point_gizmo_[k_gizmo_scale_bottom_left];
|
||||
}
|
||||
|
||||
bool ShapeNodeBase::is_gizmo_right(NodeGizmo *g) const
|
||||
{
|
||||
return g == point_gizmo_[k_gizmo_scale_top_right] ||
|
||||
g == point_gizmo_[k_gizmo_scale_center_right] ||
|
||||
g == point_gizmo_[k_gizmo_scale_bottom_right];
|
||||
}
|
||||
|
||||
bool ShapeNodeBase::is_gizmo_horizontal_center(NodeGizmo *g) const
|
||||
{
|
||||
return g == point_gizmo_[k_gizmo_scale_center_left] ||
|
||||
g == point_gizmo_[k_gizmo_scale_center_right];
|
||||
}
|
||||
|
||||
bool ShapeNodeBase::is_gizmo_vertical_center(NodeGizmo *g) const
|
||||
{
|
||||
return g == point_gizmo_[k_gizmo_scale_top_center] ||
|
||||
g == point_gizmo_[k_gizmo_scale_bottom_center];
|
||||
}
|
||||
|
||||
bool ShapeNodeBase::is_gizmo_corner(NodeGizmo *g) const
|
||||
{
|
||||
return g == point_gizmo_[k_gizmo_scale_top_left] ||
|
||||
g == point_gizmo_[k_gizmo_scale_top_right] ||
|
||||
g == point_gizmo_[k_gizmo_scale_bottom_right] ||
|
||||
g == point_gizmo_[k_gizmo_scale_bottom_left];
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user