Revision control

// Copyright (C) 2018 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
// Qt-Security score:significant reason:default
#include "qlottiegfill_p.h"
#include <QLinearGradient>
#include <QRadialGradient>
#include <QtMath>
#include <QColor>
#include <QString>
QT_BEGIN_NAMESPACE
using namespace Qt::Literals::StringLiterals;
QLottieGFill::QLottieGFill(const QLottieGFill &other)
- : QLottieShape(other)
+ : QLottieGradientHolder<QLottieShape>(other)
{
if (m_hidden)
return;
m_opacity = other.m_opacity;
- m_startPoint = other.m_startPoint;
- m_endPoint = other.m_endPoint;
- m_highlightLength = other.m_highlightLength;
- m_highlightAngle = other.m_highlightAngle;
- m_colors = other.m_colors;
- if (other.gradientType() == QGradient::LinearGradient)
- m_gradient = new QLinearGradient;
- else if (other.gradientType() == QGradient::RadialGradient)
- m_gradient = new QRadialGradient;
- else {
- Q_UNREACHABLE();
- }
m_fillRule = other.m_fillRule;
}
QLottieGFill::~QLottieGFill()
{
- if (m_gradient)
- delete m_gradient;
}
QLottieBase *QLottieGFill::clone() const
{
return new QLottieGFill(*this);
}
QLottieGFill::QLottieGFill(QLottieBase *parent)
+ : QLottieGradientHolder<QLottieShape>(parent)
{
- setParent(parent);
}
void QLottieGFill::updateProperties(int frame)
{
- QGradient::Type type = gradientType();
- if (type != QGradient::LinearGradient &&
- type != QGradient::RadialGradient)
- return;
-
- m_startPoint.update(frame);
- m_endPoint.update(frame);
- m_highlightLength.update(frame);
- m_highlightAngle.update(frame);
m_opacity.update(frame);
- QHash<qreal, QLottieProperty4D<QVector4D>>::iterator colorIt = m_colors.begin();
- while (colorIt != m_colors.end()) {
- (*colorIt).update(frame);
- ++colorIt;
- }
+ updateGradientProperties(frame);
- setGradient();
+ qreal opacity = m_opacity.value() / 100.0;
+ setGradient(opacity);
}
void QLottieGFill::render(QLottieRenderer &renderer) const
{
renderer.render(*this);
}
int QLottieGFill::parse(const QJsonObject &definition)
{
QLottieBase::parse(definition);
if (m_hidden)
return 0;
- qCDebug(lcLottieQtLottieParser) << "QLottieGFill::parse():" << m_name;
-
- if (!checkRequiredKeys(definition, "Gradient"_L1, { "s"_L1, "e"_L1, "g"_L1, "t"_L1, "o"_L1 }, m_name))
+ if (!checkRequiredKeys(definition, "Gradient"_L1, { "o"_L1 }, m_name))
return -1;
- int type = definition.value("t"_L1).toVariant().toInt();
- switch (type) {
- case 1:
- m_gradient = new QLinearGradient;
- break;
- case 2:
- m_gradient = new QRadialGradient;
- break;
- default:
- qCWarning(lcLottieQtLottieParser) << "Unknown gradient fill type";
- }
-
- QJsonObject color = definition.value("g"_L1).toObject();
- if (!checkRequiredKeys(color, "Gradient"_L1, { "p"_L1, "k"_L1 }, m_name))
- return -1;
-
- int elementCount = color.value("p"_L1).toInt();
- QJsonObject stops = color.value("k"_L1).toObject();
- bool isAnimated = stops.value("a"_L1).toVariant().toBool();
- if (!checkRequiredKeys(stops, "Gradient"_L1, { "a"_L1, "k"_L1 }, m_name))
- return -1;
-
- if (!isAnimated) {
- QMap<qreal, QVector4D> colorStops;
- QJsonArray colorArr = stops.value("k"_L1).toArray();
- for (int i = 0; i < (elementCount * 4); i += 4) {
- // p denotes the color stop percentage
- QVector4D colorVec;
- colorVec[0] = colorArr.at(i + 1).toVariant().toFloat();
- colorVec[1] = colorArr.at(i + 2).toVariant().toFloat();
- colorVec[2] = colorArr.at(i + 3).toVariant().toFloat();
- colorVec[3] = 1.0f;
- QLottieProperty4D<QVector4D> colorPos;
- colorPos.setValue(colorVec);
- // The stop position is found in the first element of the vector
- qreal pos = colorArr.at(i + 0).toVariant().toFloat();
- m_colors[pos] = colorPos;
- colorStops.insert(pos, colorVec);
- }
-
- if (colorArr.size() > (elementCount * 4)) {
- // The gradient has opacity stops; handle them
- QMap<qreal, qreal> opacityStops;
- for (int i = (elementCount * 4); i < colorArr.size(); i += 2) {
- qreal pos = colorArr.at(i).toVariant().toFloat();
- qreal opacity = colorArr.at(i + 1).toVariant().toFloat();
- opacityStops.insert(pos, opacity);
- }
- QMap<qreal, qreal> uniqueOpacityStops(opacityStops);
-
- // First: add opacity to all existing color stops
- for (auto [pos, color] : colorStops.asKeyValueRange()) {
- qreal opacity = 1.0;
- if (pos <= opacityStops.firstKey() || opacityStops.size() == 1) {
- opacity = opacityStops.first();
- } else if (pos >= opacityStops.lastKey()) {
- opacity = opacityStops.last();
- } else {
- auto it2 = opacityStops.lowerBound(pos);
- Q_ASSERT(it2 != opacityStops.cbegin());
- auto it1(it2);
- it1--;
- qreal ratio = (pos - it1.key()) / (it2.key() - it1.key());
- opacity = it1.value() + ratio * (it2.value() - it1.value());
- }
- color[3] = opacity;
- m_colors[pos].setValue(color);
- uniqueOpacityStops.remove(pos); // will remove if position present, otherwise noop
- }
-
- // Second: add new color stops for any unique opacity stop positions
- for (auto [pos, opacity] : uniqueOpacityStops.asKeyValueRange()) {
- QVector4D color;
- if (pos <= colorStops.firstKey() || colorStops.size() == 1) {
- color = colorStops.first();
- } else if (pos >= colorStops.lastKey()) {
- color = colorStops.last();
- } else {
- auto it2 = colorStops.lowerBound(pos);
- Q_ASSERT(it2 != colorStops.cbegin());
- auto it1(it2);
- it1--;
- qreal ratio = (pos - it1.key()) / (it2.key() - it1.key());
- color = it1.value() + ratio * (it2.value() - it1.value());
- }
- color[3] = opacity;
- m_colors[pos].setValue(color);
- }
- }
- } else {
- qCInfo(lcLottieQtLottieParser) << "Animated gradient is not supported";
- }
-
QJsonObject opacity = definition.value("o"_L1).toObject();
opacity = resolveExpression(opacity);
m_opacity.construct(opacity);
- QJsonObject startPoint = definition.value("s"_L1).toObject();
- startPoint = resolveExpression(startPoint);
- m_startPoint.construct(startPoint);
+ qCDebug(lcLottieQtLottieParser) << "QLottieGFill::parse():" << m_name;
- QJsonObject endPoint = definition.value("e"_L1).toObject();
- endPoint = resolveExpression(endPoint);
- m_endPoint.construct(endPoint);
-
- QJsonObject highlight = definition.value("h"_L1).toObject();
- m_highlightLength.construct(highlight);
-
- QJsonObject angle = definition.value("a"_L1).toObject();
- angle = resolveExpression(angle);
- m_highlightAngle.construct(angle);
+ if (!parseGradientProperties(definition))
+ return -1;
const int fillValue = definition.value("r"_L1).toInt();
m_fillRule = (fillValue == 2) ? Qt::OddEvenFill : Qt::WindingFill;
return 0;
}
- QGradient *QLottieGFill::value() const
- {
- return m_gradient;
- }
-
- QGradient::Type QLottieGFill::gradientType() const
- {
- if (m_gradient)
- return m_gradient->type();
- else
- return QGradient::NoGradient;
- }
-
- QPointF QLottieGFill::startPoint() const
- {
- return m_startPoint.value();
- }
-
- QPointF QLottieGFill::endPoint() const
- {
- return m_endPoint.value();
- }
-
- qreal QLottieGFill::highlightLength() const
- {
- return m_highlightLength.value();
- }
-
- qreal QLottieGFill::highlightAngle() const
- {
- return m_highlightAngle.value();
- }
-
- qreal QLottieGFill::opacity() const
- {
- return m_opacity.value();
- }
-
Qt::FillRule QLottieGFill::fillRule() const
{
return m_fillRule;
}
- void QLottieGFill::setGradient()
- {
- QHash<qreal, QLottieProperty4D<QVector4D>>::iterator colorIt = m_colors.begin();
- while (colorIt != m_colors.end()) {
- QVector4D colorPos = (*colorIt).value();
- qreal pos = colorIt.key();
- qreal opacity = m_opacity.value() / 100.0;
- opacity *= static_cast<qreal>(colorPos[3]);
- QColor color;
- color.setRedF(static_cast<qreal>(colorPos[0]));
- color.setGreenF(static_cast<qreal>(colorPos[1]));
- color.setBlueF(static_cast<qreal>(colorPos[2]));
- color.setAlphaF(opacity);
- m_gradient->setColorAt(pos, color);
- ++colorIt;
- }
-
- switch (gradientType()) {
- case QGradient::LinearGradient:
- {
- QLinearGradient *g = static_cast<QLinearGradient*>(m_gradient);
- g->setStart(m_startPoint.value());
- g->setFinalStop(m_endPoint.value());
- break;
- }
- case QGradient::RadialGradient:
- {
- QRadialGradient *g = static_cast<QRadialGradient*>(m_gradient);
- QLineF radLine(m_startPoint.value(), m_endPoint.value());
- g->setCenter(radLine.p1());
- g->setRadius(radLine.length());
- radLine.setAngle(radLine.angle() - m_highlightAngle.value());
- // QRadialGradient needs focalPoint to be inside (and not on) radius circle
- qreal radFraction = qMin((m_highlightLength.value() / 100.0), 0.999);
- g->setFocalPoint(radLine.pointAt(radFraction));
- break;
- }
- default:
- break;
- }
- }
-
QT_END_NAMESPACE