Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved some const defs to avoid redefinition

Browse source
This commit is contained in:
wangyix 2014-07-14 10:43:02 -07:00
parent a59cef3197
commit cb5a9bf668
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/shared/src/SharedUtil.cpp
View file

@ -839,6 +839,9 @@ QByteArray createByteArray(const glm::vec3& vector) {
} }
QString formatUsecTime(float usecs, int prec) { QString formatUsecTime(float usecs, int prec) {
static const quint64 SECONDS_PER_MINUTE = 60;
static const quint64 USECS_PER_MINUTE = USECS_PER_SECOND * SECONDS_PER_MINUTE;
QString result; QString result;
if (usecs > USECS_PER_MINUTE) { if (usecs > USECS_PER_MINUTE) {
result = QString::number(usecs / USECS_PER_MINUTE, 'f', prec) + "min"; result = QString::number(usecs / USECS_PER_MINUTE, 'f', prec) + "min";

2
libraries/shared/src/SharedUtil.h
View file

@ -57,9 +57,7 @@ static const float METERS_PER_MILLIMETER = 0.001f;
static const float MILLIMETERS_PER_METER = 1000.0f; static const float MILLIMETERS_PER_METER = 1000.0f;
static const quint64 USECS_PER_MSEC = 1000; static const quint64 USECS_PER_MSEC = 1000;
static const quint64 MSECS_PER_SECOND = 1000; static const quint64 MSECS_PER_SECOND = 1000;
static const quint64 SECONDS_PER_MINUTE = 60;
static const quint64 USECS_PER_SECOND = USECS_PER_MSEC * MSECS_PER_SECOND; static const quint64 USECS_PER_SECOND = USECS_PER_MSEC * MSECS_PER_SECOND;
static const quint64 USECS_PER_MINUTE = USECS_PER_SECOND * SECONDS_PER_MINUTE;
const int BITS_IN_BYTE = 8; const int BITS_IN_BYTE = 8;