change: change code style to Linux style except indent.
This commit is contained in:
Mike Solar
@@ -25,136 +25,142 @@
|
||||
|
||||
#include "widget/slider/floatslider.h"
|
||||
|
||||
namespace olive {
|
||||
namespace olive
|
||||
{
|
||||
|
||||
const QString MatrixGenerator::kPositionInput = QStringLiteral("pos_in");
|
||||
const QString MatrixGenerator::kRotationInput = QStringLiteral("rot_in");
|
||||
const QString MatrixGenerator::kScaleInput = QStringLiteral("scale_in");
|
||||
const QString MatrixGenerator::kUniformScaleInput = QStringLiteral("uniform_scale_in");
|
||||
const QString MatrixGenerator::kUniformScaleInput =
|
||||
QStringLiteral("uniform_scale_in");
|
||||
const QString MatrixGenerator::kAnchorInput = QStringLiteral("anchor_in");
|
||||
|
||||
#define super Node
|
||||
|
||||
MatrixGenerator::MatrixGenerator()
|
||||
{
|
||||
AddInput(kPositionInput, NodeValue::kVec2, QVector2D(0.0, 0.0));
|
||||
AddInput(kPositionInput, NodeValue::kVec2, QVector2D(0.0, 0.0));
|
||||
|
||||
AddInput(kRotationInput, NodeValue::kFloat, 0.0);
|
||||
AddInput(kRotationInput, NodeValue::kFloat, 0.0);
|
||||
|
||||
AddInput(kScaleInput, NodeValue::kVec2, QVector2D(1.0f, 1.0f));
|
||||
SetInputProperty(kScaleInput, QStringLiteral("min"), QVector2D(0, 0));
|
||||
SetInputProperty(kScaleInput, QStringLiteral("view"), FloatSlider::kPercentage);
|
||||
SetInputProperty(kScaleInput, QStringLiteral("disable1"), true);
|
||||
AddInput(kScaleInput, NodeValue::kVec2, QVector2D(1.0f, 1.0f));
|
||||
SetInputProperty(kScaleInput, QStringLiteral("min"), QVector2D(0, 0));
|
||||
SetInputProperty(kScaleInput, QStringLiteral("view"),
|
||||
FloatSlider::kPercentage);
|
||||
SetInputProperty(kScaleInput, QStringLiteral("disable1"), true);
|
||||
|
||||
AddInput(kUniformScaleInput, NodeValue::kBoolean, true, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
|
||||
AddInput(kUniformScaleInput, NodeValue::kBoolean, true,
|
||||
InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable));
|
||||
|
||||
AddInput(kAnchorInput, NodeValue::kVec2, QVector2D(0.0, 0.0));
|
||||
AddInput(kAnchorInput, NodeValue::kVec2, QVector2D(0.0, 0.0));
|
||||
}
|
||||
|
||||
QString MatrixGenerator::Name() const
|
||||
{
|
||||
return tr("Orthographic Matrix");
|
||||
return tr("Orthographic Matrix");
|
||||
}
|
||||
|
||||
QString MatrixGenerator::ShortName() const
|
||||
{
|
||||
return tr("Ortho");
|
||||
return tr("Ortho");
|
||||
}
|
||||
|
||||
QString MatrixGenerator::id() const
|
||||
{
|
||||
return QStringLiteral("org.olivevideoeditor.Olive.ortho");
|
||||
return QStringLiteral("org.olivevideoeditor.Olive.ortho");
|
||||
}
|
||||
|
||||
QVector<Node::CategoryID> MatrixGenerator::Category() const
|
||||
{
|
||||
return {kCategoryGenerator, kCategoryMath};
|
||||
return { kCategoryGenerator, kCategoryMath };
|
||||
}
|
||||
|
||||
QString MatrixGenerator::Description() const
|
||||
{
|
||||
return tr("Generate an orthographic matrix using position, rotation, and scale.");
|
||||
return tr(
|
||||
"Generate an orthographic matrix using position, rotation, and scale.");
|
||||
}
|
||||
|
||||
void MatrixGenerator::Retranslate()
|
||||
{
|
||||
super::Retranslate();
|
||||
super::Retranslate();
|
||||
|
||||
SetInputName(kPositionInput, tr("Position"));
|
||||
SetInputName(kRotationInput, tr("Rotation"));
|
||||
SetInputName(kScaleInput, tr("Scale"));
|
||||
SetInputName(kUniformScaleInput, tr("Uniform Scale"));
|
||||
SetInputName(kAnchorInput, tr("Anchor Point"));
|
||||
SetInputName(kPositionInput, tr("Position"));
|
||||
SetInputName(kRotationInput, tr("Rotation"));
|
||||
SetInputName(kScaleInput, tr("Scale"));
|
||||
SetInputName(kUniformScaleInput, tr("Uniform Scale"));
|
||||
SetInputName(kAnchorInput, tr("Anchor Point"));
|
||||
}
|
||||
|
||||
void MatrixGenerator::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
|
||||
void MatrixGenerator::Value(const NodeValueRow &value,
|
||||
const NodeGlobals &globals,
|
||||
NodeValueTable *table) const
|
||||
{
|
||||
// Push matrix output
|
||||
QMatrix4x4 mat = GenerateMatrix(value, false, false, false, QMatrix4x4());
|
||||
table->Push(NodeValue::kMatrix, mat, this);
|
||||
// Push matrix output
|
||||
QMatrix4x4 mat = GenerateMatrix(value, false, false, false, QMatrix4x4());
|
||||
table->Push(NodeValue::kMatrix, mat, this);
|
||||
}
|
||||
|
||||
QMatrix4x4 MatrixGenerator::GenerateMatrix(const NodeValueRow &value, bool ignore_anchor, bool ignore_position, bool ignore_scale, const QMatrix4x4 &mat) const
|
||||
QMatrix4x4 MatrixGenerator::GenerateMatrix(const NodeValueRow &value,
|
||||
bool ignore_anchor,
|
||||
bool ignore_position,
|
||||
bool ignore_scale,
|
||||
const QMatrix4x4 &mat) const
|
||||
{
|
||||
QVector2D anchor;
|
||||
QVector2D position;
|
||||
QVector2D scale;
|
||||
QVector2D anchor;
|
||||
QVector2D position;
|
||||
QVector2D scale;
|
||||
|
||||
if (!ignore_anchor) {
|
||||
anchor = value[kAnchorInput].toVec2();
|
||||
}
|
||||
if (!ignore_anchor) {
|
||||
anchor = value[kAnchorInput].toVec2();
|
||||
}
|
||||
|
||||
if (!ignore_scale) {
|
||||
scale = value[kScaleInput].toVec2();
|
||||
}
|
||||
if (!ignore_scale) {
|
||||
scale = value[kScaleInput].toVec2();
|
||||
}
|
||||
|
||||
if (!ignore_position) {
|
||||
position = value[kPositionInput].toVec2();
|
||||
}
|
||||
if (!ignore_position) {
|
||||
position = value[kPositionInput].toVec2();
|
||||
}
|
||||
|
||||
return GenerateMatrix(position,
|
||||
value[kRotationInput].toDouble(),
|
||||
scale,
|
||||
value[kUniformScaleInput].toBool(),
|
||||
anchor,
|
||||
mat);
|
||||
return GenerateMatrix(position, value[kRotationInput].toDouble(), scale,
|
||||
value[kUniformScaleInput].toBool(), anchor, mat);
|
||||
}
|
||||
|
||||
QMatrix4x4 MatrixGenerator::GenerateMatrix(const QVector2D& pos,
|
||||
const float& rot,
|
||||
const QVector2D& scale,
|
||||
bool uniform_scale,
|
||||
const QVector2D& anchor,
|
||||
QMatrix4x4 mat)
|
||||
QMatrix4x4
|
||||
MatrixGenerator::GenerateMatrix(const QVector2D &pos, const float &rot,
|
||||
const QVector2D &scale, bool uniform_scale,
|
||||
const QVector2D &anchor, QMatrix4x4 mat)
|
||||
{
|
||||
// Position
|
||||
mat.translate(pos.x(), pos.y());
|
||||
// Position
|
||||
mat.translate(pos.x(), pos.y());
|
||||
|
||||
// Rotation
|
||||
mat.rotate(rot, 0, 0, 1);
|
||||
// Rotation
|
||||
mat.rotate(rot, 0, 0, 1);
|
||||
|
||||
// Scale (convert to a QVector3D so that the identity matrix is preserved if all values are 1.0f)
|
||||
QVector3D full_scale;
|
||||
if (uniform_scale) {
|
||||
full_scale = QVector3D(scale.x(), scale.x(), 1.0f);
|
||||
} else {
|
||||
full_scale = QVector3D(scale, 1.0f);
|
||||
}
|
||||
mat.scale(full_scale);
|
||||
// Scale (convert to a QVector3D so that the identity matrix is preserved if all values are 1.0f)
|
||||
QVector3D full_scale;
|
||||
if (uniform_scale) {
|
||||
full_scale = QVector3D(scale.x(), scale.x(), 1.0f);
|
||||
} else {
|
||||
full_scale = QVector3D(scale, 1.0f);
|
||||
}
|
||||
mat.scale(full_scale);
|
||||
|
||||
// Anchor Point
|
||||
mat.translate(-anchor.x(), -anchor.y());
|
||||
// Anchor Point
|
||||
mat.translate(-anchor.x(), -anchor.y());
|
||||
|
||||
return mat;
|
||||
return mat;
|
||||
}
|
||||
|
||||
void MatrixGenerator::InputValueChangedEvent(const QString &input, int element)
|
||||
{
|
||||
Q_UNUSED(element)
|
||||
Q_UNUSED(element)
|
||||
|
||||
if (input == kUniformScaleInput) {
|
||||
SetInputProperty(kScaleInput, QStringLiteral("disable1"), GetStandardValue(kUniformScaleInput).toBool());
|
||||
}
|
||||
if (input == kUniformScaleInput) {
|
||||
SetInputProperty(kScaleInput, QStringLiteral("disable1"),
|
||||
GetStandardValue(kUniformScaleInput).toBool());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user