diff options
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquicksprite.cpp | 5 | ||||
| -rw-r--r-- | src/quick/items/qquickspriteengine.cpp | 11 | ||||
| -rw-r--r-- | src/quick/items/qquickspriteengine_p.h | 3 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp index aae657b749..8013c57938 100644 --- a/src/quick/items/qquicksprite.cpp +++ b/src/quick/items/qquicksprite.cpp @@ -40,6 +40,7 @@ #include "qquicksprite_p.h" #include <qqml.h> #include <QDebug> +#include <QRandomGenerator> QT_BEGIN_NAMESPACE @@ -236,12 +237,12 @@ int QQuickSprite::variedDuration() const //Deals with precedence when multiple d if (m_frameRate != unsetDuration) { qreal fpms = (m_frameRate - + (m_frameRateVariation * ((qreal)qrand()/RAND_MAX) * 2) + + (m_frameRateVariation * QRandomGenerator::getReal() * 2) - m_frameRateVariation) / 1000.0; return qMax(qreal(0.0) , m_frames / fpms); } else if (m_frameDuration != unsetDuration) { int mspf = m_frameDuration - + (m_frameDurationVariation * ((qreal)qrand()/RAND_MAX) * 2) + + (m_frameDurationVariation * QRandomGenerator::getReal() * 2) - m_frameDurationVariation; return qMax(0, m_frames * mspf); } else if (duration() >= 0) { diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp index 92b60a8e3a..9deb223957 100644 --- a/src/quick/items/qquickspriteengine.cpp +++ b/src/quick/items/qquickspriteengine.cpp @@ -43,6 +43,7 @@ #include <qqml.h> #include <QDebug> #include <QPainter> +#include <QRandomGenerator> #include <QSet> #include <QtGui/qopengl.h> #include <QOpenGLFunctions> @@ -543,7 +544,7 @@ void QQuickStochasticEngine::restart(int index) if (m_addAdvance) m_startTimes[index] += m_advanceTime.elapsed(); if (randomStart) - m_startTimes[index] -= qrand() % m_duration.at(index); + m_startTimes[index] -= QRandomGenerator::bounded(m_duration.at(index)); int time = m_duration.at(index) + m_startTimes.at(index); for (int i=0; i<m_stateUpdates.count(); i++) m_stateUpdates[i].second.removeAll(index); @@ -557,13 +558,13 @@ void QQuickSpriteEngine::restart(int index) //Reimplemented to recognize and han if (m_loaded && m_sprites.at(m_things.at(index))->frameSync()) {//Manually advanced m_startTimes[index] = 0; if (randomStart && m_sprites.at(m_things.at(index))->m_generatedCount) - m_startTimes[index] += qrand() % m_sprites.at(m_things.at(index))->m_generatedCount; + m_startTimes[index] += QRandomGenerator::bounded(m_sprites.at(m_things.at(index))->m_generatedCount); } else { m_startTimes[index] = m_timeOffset; if (m_addAdvance) m_startTimes[index] += m_advanceTime.elapsed(); if (randomStart) - m_startTimes[index] -= qrand() % m_duration.at(index); + m_startTimes[index] -= QRandomGenerator::bounded(m_duration.at(index)); int time = spriteDuration(index) + m_startTimes.at(index); if (randomStart) { int curTime = m_timeOffset + (m_addAdvance ? m_advanceTime.elapsed() : 0); @@ -629,7 +630,7 @@ int QQuickStochasticEngine::nextState(int curState, int curThing) int nextIdx = -1; int goalPath = goalSeek(curState, curThing); if (goalPath == -1){//Random - qreal r =(qreal) qrand() / (qreal) RAND_MAX; + qreal r = QRandomGenerator::getReal(); qreal total = 0.0; for (QVariantMap::const_iterator iter=m_states.at(curState)->m_to.constBegin(); iter!=m_states.at(curState)->m_to.constEnd(); ++iter) @@ -719,7 +720,7 @@ int QQuickStochasticEngine::goalSeek(int curIdx, int spriteIdx, int dist) if (options.count()==1) return *(options.begin()); int option = -1; - qreal r =(qreal) qrand() / (qreal) RAND_MAX; + qreal r = QRandomGenerator::getReal(); qreal total = 0; for (QSet<int>::const_iterator iter=options.constBegin(); iter!=options.constEnd(); ++iter) diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index 90ee68b2f6..4e5458a938 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -63,6 +63,7 @@ QT_REQUIRE_CONFIG(quick_sprite); #include <QQmlListProperty> #include <QImage> #include <QPair> +#include <QRandomGenerator> #include <private/qquickpixmapcache_p.h> #include <private/qtquickglobal_p.h> @@ -112,7 +113,7 @@ public: virtual int variedDuration() const { return qMax(qreal(0.0) , m_duration - + (m_durationVariation * ((qreal)qrand()/RAND_MAX) * 2) + + (m_durationVariation * QRandomGenerator::bounded(2.0)) - m_durationVariation); } |