1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port two examples from QTime to QElapsedTimer

Browse Source 
Change-Id: I23d13bf1e909801797a8fc2785c46f341ef5ee77
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
This commit is contained in:
Albert Astals Cid 2019-09-27 16:11:50 +02:00
parent e24c387413
commit d12bf4eb83
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/embedded/flickable/flickable.cpp
View File

@ -98,7 +98,7 @@ public:
QPoint delta; QPoint delta;
QPoint speed; QPoint speed;
FlickableTicker *ticker; FlickableTicker *ticker;
QTime timeStamp; QElapsedTimer timeStamp;
QWidget *target; QWidget *target;
QList<QEvent*> ignoreList; QList<QEvent*> ignoreList;
}; };
@ -109,7 +109,7 @@ Flickable::Flickable()
d->state = FlickablePrivate::Steady; d->state = FlickablePrivate::Steady;
d->threshold = 10; d->threshold = 10;
d->ticker = new FlickableTicker(this); d->ticker = new FlickableTicker(this);
d->timeStamp = QTime::currentTime(); d->timeStamp.start();
d->target = 0; d->target = 0;
} }
@ -208,7 +208,7 @@ void Flickable::handleMouseRelease(QMouseEvent *event)
event->accept(); event->accept();
delta = event->pos() - d->pressPos; delta = event->pos() - d->pressPos;
if (d->timeStamp.elapsed() > 100) { if (d->timeStamp.elapsed() > 100) {
d->timeStamp = QTime::currentTime(); d->timeStamp.start();
d->speed = delta - d->delta; d->speed = delta - d->delta;
d->delta = delta; d->delta = delta;
} }
@ -253,7 +253,7 @@ void Flickable::handleMouseMove(QMouseEvent *event)
delta = event->pos() - d->pressPos; delta = event->pos() - d->pressPos;
if (delta.x() > d->threshold || delta.x() < -d->threshold || if (delta.x() > d->threshold || delta.x() < -d->threshold ||
delta.y() > d->threshold || delta.y() < -d->threshold) { delta.y() > d->threshold || delta.y() < -d->threshold) {
d->timeStamp = QTime::currentTime(); d->timeStamp.start();
d->state = FlickablePrivate::ManualScroll; d->state = FlickablePrivate::ManualScroll;
d->delta = QPoint(0, 0); d->delta = QPoint(0, 0);
d->pressPos = event->pos(); d->pressPos = event->pos();
@ -266,7 +266,7 @@ void Flickable::handleMouseMove(QMouseEvent *event)
delta = event->pos() - d->pressPos; delta = event->pos() - d->pressPos;
setScrollOffset(d->offset - delta); setScrollOffset(d->offset - delta);
if (d->timeStamp.elapsed() > 100) { if (d->timeStamp.elapsed() > 100) {
d->timeStamp = QTime::currentTime(); d->timeStamp.start();
d->speed = delta - d->delta; d->speed = delta - d->delta;
d->delta = delta; d->delta = delta;
} }

8
examples/embedded/raycasting/raycasting.cpp
View File

@ -92,7 +92,7 @@ public:
} }
void updatePlayer() { void updatePlayer() {
int interval = qBound(20, watch.elapsed(), 250); int interval = qBound(20ll, watch.elapsed(), 250ll);
watch.start(); watch.start();
angle += angleDelta * interval / 1000; angle += angleDelta * interval / 1000;
qreal step = moveDelta * interval / 1000; qreal step = moveDelta * interval / 1000;
@ -106,10 +106,10 @@ public:
} }
void showFps() { void showFps() {
static QTime frameTick; static QElapsedTimer frameTick;
static int totalFrame = 0; static int totalFrame = 0;
if (!(totalFrame & 31)) { if (!(totalFrame & 31)) {
int elapsed = frameTick.elapsed(); const qint64 elapsed = frameTick.elapsed();
frameTick.start(); frameTick.start();
int fps = 32 * 1000 / (1 + elapsed); int fps = 32 * 1000 / (1 + elapsed);
setWindowTitle(QString("Raycasting (%1 FPS)").arg(fps)); setWindowTitle(QString("Raycasting (%1 FPS)").arg(fps));
@ -355,7 +355,7 @@ protected:
} }
private: private:
QTime watch; QElapsedTimer watch;
QBasicTimer ticker; QBasicTimer ticker;
QImage buffer; QImage buffer;
qreal angle; qreal angle;