diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2017-09-21 12:23:48 -0700 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-12-05 10:05:01 +0000 |
| commit | 14599af2f27292710e68a6e500aa9f9cf3a30789 (patch) | |
| tree | 024e6545c682796f64159112988dede312b68f00 /src/particles/qquickwander.cpp | |
| parent | 1dbe0acecbc286b6df25fe2a9c4a373fa0d6b11e (diff) | |
Update to new QRandomGenerator API
To get latest qtbase dev integrated in qt5 dev again without
qtdeclarative 5.10->dev merge.
Change-Id: I6905649aca2b06302df8cee2f660f1f92398d36a
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
(cherry picked from commit ee00fa01dc41deaaedfa0d1d5cc6cd750bfe75f4)
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/particles/qquickwander.cpp')
| -rw-r--r-- | src/particles/qquickwander.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/particles/qquickwander.cpp b/src/particles/qquickwander.cpp index cfdede440b..a78482ec84 100644 --- a/src/particles/qquickwander.cpp +++ b/src/particles/qquickwander.cpp @@ -103,8 +103,8 @@ WanderData* QQuickWanderAffector::getData(int idx) d->y_vel = 0; d->x_peak = m_xVariance; d->y_peak = m_yVariance; - d->x_var = m_pace * QRandomGenerator::getReal(); - d->y_var = m_pace * QRandomGenerator::getReal(); + d->x_var = m_pace * QRandomGenerator::global()->generateDouble(); + d->y_var = m_pace * QRandomGenerator::global()->generateDouble(); m_wanderData.insert(idx, d); return d; @@ -125,7 +125,7 @@ bool QQuickWanderAffector::affectParticle(QQuickParticleData* data, qreal dt) if (m_xVariance != 0.) { if ((d->x_vel > d->x_peak && d->x_var > 0.0) || (d->x_vel < -d->x_peak && d->x_var < 0.0)) { d->x_var = -d->x_var; - d->x_peak = m_xVariance + m_xVariance * QRandomGenerator::getReal(); + d->x_peak = m_xVariance + m_xVariance * QRandomGenerator::global()->generateDouble(); } d->x_vel += d->x_var * dt; } @@ -134,7 +134,7 @@ bool QQuickWanderAffector::affectParticle(QQuickParticleData* data, qreal dt) if (m_yVariance != 0.) { if ((d->y_vel > d->y_peak && d->y_var > 0.0) || (d->y_vel < -d->y_peak && d->y_var < 0.0)) { d->y_var = -d->y_var; - d->y_peak = m_yVariance + m_yVariance * QRandomGenerator::getReal(); + d->y_peak = m_yVariance + m_yVariance * QRandomGenerator::global()->generateDouble(); } d->y_vel += d->y_var * dt; } @@ -147,8 +147,8 @@ bool QQuickWanderAffector::affectParticle(QQuickParticleData* data, qreal dt) p->y += dy; return true; */ - qreal dx = dt * m_pace * (2 * QRandomGenerator::getReal() - 1); - qreal dy = dt * m_pace * (2 * QRandomGenerator::getReal() - 1); + qreal dx = dt * m_pace * (2 * QRandomGenerator::global()->generateDouble() - 1); + qreal dy = dt * m_pace * (2 * QRandomGenerator::global()->generateDouble() - 1); qreal newX, newY; switch (m_affectedParameter){ case Position: |