Commit 760d0ac2 authored by Alan Alpert's avatar Alan Alpert Committed by Qt by Nokia

Sprite minor fixes

Spelling of "motivate", don't send out the message when they didn't set
duration themselves, and update TODO comment.

Change-Id: I4de055f07a1831b9d12798faeda658ff441920f4
Reviewed-by: 's avatarDamian Jansen <damian.jansen@nokia.com>
parent efe0c53c
......@@ -248,12 +248,14 @@ int QQuickSprite::variedDuration() const //Deals with precedence when multiple d
+ (m_frameDurationVariation * ((qreal)qrand()/RAND_MAX) * 2)
- m_frameDurationVariation;
return qMax(0, m_frames * mspf);
}
qWarning() << "Sprite::duration is changing meaning to the full animation duration.";
qWarning() << "Use Sprite::frameDuration for the old meaning, of per frame duration.";
qWarning() << "As an interim measure, duration/durationVariation means the same as frameDuration/frameDurationVariation, and you'll get this warning spewed out everywhere to movtivate you.";
} else if (duration() >= 0) {
qWarning() << "Sprite::duration is changing meaning to the full animation duration.";
qWarning() << "Use Sprite::frameDuration for the old meaning, of per frame duration.";
qWarning() << "As an interim measure, duration/durationVariation means the same as frameDuration/frameDurationVariation, and you'll get this warning spewed out everywhere to motivate you.";
//Note that the spammyness is due to this being the best location to detect, but also called once each animation loop
return QQuickStochasticState::variedDuration() * m_frames;
return QQuickStochasticState::variedDuration() * m_frames;
}
return 1000; //When nothing set
}
void QQuickSprite::startImageLoading()
......
......@@ -70,7 +70,7 @@ class Q_AUTOTEST_EXPORT QQuickStochasticState : public QObject //Currently for i
public:
QQuickStochasticState(QObject* parent = 0)
: QObject(parent)
, m_duration(1000)
, m_duration(-1)
, m_durationVariation(0)
, m_randomStart(false)
{
......
......@@ -261,7 +261,7 @@ struct SpriteVertices {
The sprite or sprites to draw. Sprites will be scaled to the size of this element.
*/
//TODO: Implicitly size element to size of first sprite?
//TODO: Implicitly size element to size of first sprite? or currentSprite?
QQuickSpriteImage::QQuickSpriteImage(QQuickItem *parent) :
QQuickItem(parent)
, m_node(0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment