Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 10:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

QEasingCurve optimization

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-04-17 18:57:08 +03:00
parent 017b39fcae
commit cd3d86140e
2 changed files with 81 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/core/tools/qeasingcurve.cpp
View file

@ -246,7 +246,8 @@ public:
QEasingCurvePrivate()
: type(QEasingCurve::Linear),
per(s_defaultperiod), amp(s_defaultamplitude), over(s_defaultovershoot)
{ }
{
}
QEasingCurve::Type type;
qreal per;
@ -291,12 +292,10 @@ QEasingCurve::~QEasingCurve()
*/
QEasingCurve &QEasingCurve::operator=(const QEasingCurve &other)
{
if (*this != other) {
d_ptr->type = other.d_ptr->type;
d_ptr->per = other.d_ptr->per;
d_ptr->amp = other.d_ptr->amp;
d_ptr->over = other.d_ptr->over;
}
d_ptr->type = other.d_ptr->type;
d_ptr->per = other.d_ptr->per;
d_ptr->amp = other.d_ptr->amp;
d_ptr->over = other.d_ptr->over;
return *this;
}
@ -308,9 +307,9 @@ bool QEasingCurve::operator==(const QEasingCurve &other) const
{
bool res = (d_ptr->type == other.d_ptr->type);
if (res) {
res = qFuzzyCompare(period(), other.period()) &&
qFuzzyCompare(amplitude(), other.amplitude()) &&
qFuzzyCompare(overshoot(), other.overshoot());
res = qFuzzyCompare(d_ptr->per, other.d_ptr->per) &&
qFuzzyCompare(d_ptr->amp, other.d_ptr->amp) &&
qFuzzyCompare(d_ptr->over, other.d_ptr->over);
}
return res;
}

171
tests/auto/qeasingcurve/tst_qeasingcurve.cpp
View file

@ -23,20 +23,14 @@
#include <QtTest/QtTest>
#include <qeasingcurve.h>
#include <qdebug.h>
//TESTED_CLASS=
//TESTED_FILES=
// TESTED_CLASS=
// TESTED_FILES=
class tst_QEasingCurve : public QObject {
Q_OBJECT
public:
tst_QEasingCurve();
virtual ~tst_QEasingCurve();
public Q_SLOTS:
void init();
void cleanup();
class tst_QEasingCurve : public QObject
{
Q_OBJECT
private slots:
void type();
@ -46,108 +40,89 @@ private slots:
void operators();
void properties();
void metaTypes();
protected:
};
tst_QEasingCurve::tst_QEasingCurve()
{
}
tst_QEasingCurve::~tst_QEasingCurve()
{
}
void tst_QEasingCurve::init()
{
}
void tst_QEasingCurve::cleanup()
{
}
#include <qdebug.h>
void tst_QEasingCurve::type()
{
{
QEasingCurve curve(QEasingCurve::Linear);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
QEasingCurve curve(QEasingCurve::Linear);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
curve.setPeriod(5);
curve.setAmplitude(3);
QCOMPARE(curve.period(), 5.0);
QCOMPARE(curve.amplitude(), 3.0);
curve.setPeriod(5);
curve.setAmplitude(3);
QCOMPARE(curve.period(), 5.0);
QCOMPARE(curve.amplitude(), 3.0);
curve.setType(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 5.0);
QCOMPARE(curve.amplitude(), 3.0);
curve.setType(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 5.0);
QCOMPARE(curve.amplitude(), 3.0);
}
{
QEasingCurve curve(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
curve.setAmplitude(2);
QCOMPARE(curve.type(), QEasingCurve::InElastic);
curve.setType(QEasingCurve::Linear);
QEasingCurve curve(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
curve.setAmplitude(2);
QCOMPARE(curve.type(), QEasingCurve::InElastic);
curve.setType(QEasingCurve::Linear);
}
{
// check bounaries
QEasingCurve curve(QEasingCurve::InCubic);
QTest::ignoreMessage(QtWarningMsg, "QEasingCurve: Invalid curve type 9999");
curve.setType((QEasingCurve::Type)9999);
QCOMPARE(curve.type(), QEasingCurve::InCubic);
QTest::ignoreMessage(QtWarningMsg, "QEasingCurve: Invalid curve type -9999");
curve.setType((QEasingCurve::Type)-9999);
QCOMPARE(curve.type(), QEasingCurve::InCubic);
QTest::ignoreMessage(QtWarningMsg, QString::fromAscii("QEasingCurve: Invalid curve type %1")
.arg(QEasingCurve::NCurveTypes).toLatin1().constData());
curve.setType(QEasingCurve::NCurveTypes);
QCOMPARE(curve.type(), QEasingCurve::InCubic);
QTest::ignoreMessage(QtWarningMsg, QString::fromAscii("QEasingCurve: Invalid curve type %1")
.arg(-1).toLatin1().constData());
curve.setType((QEasingCurve::Type)-1);
QCOMPARE(curve.type(), QEasingCurve::InCubic);
curve.setType(QEasingCurve::Linear);
QCOMPARE(curve.type(), QEasingCurve::Linear);
curve.setType(QEasingCurve::CosineCurve);
QCOMPARE(curve.type(), QEasingCurve::CosineCurve);
// check bounaries
QEasingCurve curve(QEasingCurve::InCubic);
QTest::ignoreMessage(QtWarningMsg, "QEasingCurve: Invalid curve type 9999");
curve.setType((QEasingCurve::Type)9999);
QCOMPARE(curve.type(), QEasingCurve::InCubic);
QTest::ignoreMessage(QtWarningMsg, "QEasingCurve: Invalid curve type -9999");
curve.setType((QEasingCurve::Type)-9999);
QCOMPARE(curve.type(), QEasingCurve::InCubic);
QTest::ignoreMessage(QtWarningMsg, QString::fromAscii("QEasingCurve: Invalid curve type %1")
.arg(QEasingCurve::NCurveTypes).toLatin1().constData());
curve.setType(QEasingCurve::NCurveTypes);
QCOMPARE(curve.type(), QEasingCurve::InCubic);
QTest::ignoreMessage(QtWarningMsg, QString::fromAscii("QEasingCurve: Invalid curve type %1")
.arg(-1).toLatin1().constData());
curve.setType((QEasingCurve::Type)-1);
QCOMPARE(curve.type(), QEasingCurve::InCubic);
curve.setType(QEasingCurve::Linear);
QCOMPARE(curve.type(), QEasingCurve::Linear);
curve.setType(QEasingCurve::CosineCurve);
QCOMPARE(curve.type(), QEasingCurve::CosineCurve);
}
}
void tst_QEasingCurve::propertyDefaults()
{
{
// checks if the defaults are correct, but also demonstrates a weakness with the API.
QEasingCurve curve(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
QCOMPARE(curve.overshoot(), qreal(1.70158));
curve.setType(QEasingCurve::InBounce);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
QCOMPARE(curve.overshoot(), qreal(1.70158));
curve.setType(QEasingCurve::Linear);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
QCOMPARE(curve.overshoot(), qreal(1.70158));
curve.setType(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
QCOMPARE(curve.overshoot(), qreal(1.70158));
curve.setPeriod(0.4);
curve.setAmplitude(0.6);
curve.setOvershoot(1.0);
curve.setType(QEasingCurve::Linear);
QCOMPARE(curve.period(), 0.4);
QCOMPARE(curve.amplitude(), 0.6);
QCOMPARE(curve.overshoot(), 1.0);
curve.setType(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 0.4);
QCOMPARE(curve.amplitude(), 0.6);
QCOMPARE(curve.overshoot(), 1.0);
// checks if the defaults are correct, but also demonstrates a weakness with the API.
QEasingCurve curve(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
QCOMPARE(curve.overshoot(), qreal(1.70158));
curve.setType(QEasingCurve::InBounce);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
QCOMPARE(curve.overshoot(), qreal(1.70158));
curve.setType(QEasingCurve::Linear);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
QCOMPARE(curve.overshoot(), qreal(1.70158));
curve.setType(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 0.3);
QCOMPARE(curve.amplitude(), 1.0);
QCOMPARE(curve.overshoot(), qreal(1.70158));
curve.setPeriod(0.4);
curve.setAmplitude(0.6);
curve.setOvershoot(1.0);
curve.setType(QEasingCurve::Linear);
QCOMPARE(curve.period(), 0.4);
QCOMPARE(curve.amplitude(), 0.6);
QCOMPARE(curve.overshoot(), 1.0);
curve.setType(QEasingCurve::InElastic);
QCOMPARE(curve.period(), 0.4);
QCOMPARE(curve.amplitude(), 0.6);
QCOMPARE(curve.overshoot(), 1.0);
}
}
@ -486,8 +461,7 @@ void tst_QEasingCurve::properties()
amplitude = linear.amplitude();
period = linear.period();
obj.setProperty("easing",
qVariantFromValue(QEasingCurve(QEasingCurve::Linear)));
obj.setProperty("easing", qVariantFromValue(QEasingCurve(QEasingCurve::Linear)));
easing = qvariant_cast<QEasingCurve>(obj.property("easing"));
QCOMPARE(easing.type(), QEasingCurve::Linear);
@ -500,8 +474,7 @@ void tst_QEasingCurve::metaTypes()
{
QVERIFY(QMetaType::type("QEasingCurve") == QMetaType::QEasingCurve);
QCOMPARE(QByteArray(QMetaType::typeName(QMetaType::QEasingCurve)),
QByteArray("QEasingCurve"));
QCOMPARE(QByteArray(QMetaType::typeName(QMetaType::QEasingCurve)), QByteArray("QEasingCurve"));
QVERIFY(QMetaType::isRegistered(QMetaType::QEasingCurve));