Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 04:38:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR

Browse source
This commit is contained in:
Atlante45 2014-04-23 11:00:44 -07:00
parent ae566c55f6
commit ceb5208102
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -1218,8 +1218,7 @@ void Application::touchEndEvent(QTouchEvent* event) {
if (_controllerScriptingInterface.isTouchCaptured()) { if (_controllerScriptingInterface.isTouchCaptured()) {
return; return;
} }
s // put any application specific touch behavior below here..
// put any application specific touch behavior below here..
_touchDragStartedAvgX = _touchAvgX; _touchDragStartedAvgX = _touchAvgX;
_touchDragStartedAvgY = _touchAvgY; _touchDragStartedAvgY = _touchAvgY;
_isTouchPressed = false; _isTouchPressed = false;
@ -1276,7 +1275,7 @@ void Application::timer() {
sendPingPackets(); sendPingPackets();
} }
float diffTime = (float)_timerStart.nsecsElapsed() / 1000000000.0; float diffTime = (float)_timerStart.nsecsElapsed() / 1000000000.0f;
_fps = (float)_frameCount / diffTime; _fps = (float)_frameCount / diffTime;

25
interface/src/Util.cpp
View file

@ -407,24 +407,25 @@ void runTimingTests() {
startTime.start(); startTime.start();
float elapsedUsecs; float elapsedUsecs;
elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0; float NSEC_TO_USEC = 1.0f / 1000.0f;
qDebug("QElapsedTimer::nsecElapsed() usecs: %f", 1000.0f * elapsedUsecs / (float) numTests); elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
qDebug("QElapsedTimer::nsecElapsed() usecs: %f", elapsedUsecs / (float) numTests);
// Random number generation // Random number generation
startTime.start(); startTime.start();
for (int i = 1; i < numTests; i++) { for (int i = 1; i < numTests; i++) {
iResults[i] = rand(); iResults[i] = rand();
} }
elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0; elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
qDebug("rand() stored in array usecs: %f, first result:%d", 1000.0f * elapsedUsecs / (float) numTests, iResults[0]); qDebug("rand() stored in array usecs: %f, first result:%d", elapsedUsecs / (float) numTests, iResults[0]);
// Random number generation using randFloat() // Random number generation using randFloat()
startTime.start(); startTime.start();
for (int i = 1; i < numTests; i++) { for (int i = 1; i < numTests; i++) {
fResults[i] = randFloat(); fResults[i] = randFloat();
} }
elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0; elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
qDebug("randFloat() stored in array usecs: %f, first result: %f", 1000.0f * elapsedUsecs / (float) numTests, fResults[0]); qDebug("randFloat() stored in array usecs: %f, first result: %f", elapsedUsecs / (float) numTests, fResults[0]);
// PowF function // PowF function
fTest = 1145323.2342f; fTest = 1145323.2342f;
@ -432,8 +433,8 @@ void runTimingTests() {
for (int i = 1; i < numTests; i++) { for (int i = 1; i < numTests; i++) {
fTest = powf(fTest, 0.5f); fTest = powf(fTest, 0.5f);
} }
elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0; elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
qDebug("powf(f, 0.5) usecs: %f", 1000.0f * elapsedUsecs / (float) numTests); qDebug("powf(f, 0.5) usecs: %f", elapsedUsecs / (float) numTests);
// Vector Math // Vector Math
float distance; float distance;
@ -444,9 +445,9 @@ void runTimingTests() {
//float distanceSquared = glm::dot(temp, temp); //float distanceSquared = glm::dot(temp, temp);
distance = glm::distance(pointA, pointB); distance = glm::distance(pointA, pointB);
} }
elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0; elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
qDebug("vector math usecs: %f [%f usecs total for %d tests], last result:%f", qDebug("vector math usecs: %f [%f usecs total for %d tests], last result:%f",
1000.0f * elapsedUsecs / (float) numTests, elapsedUsecs, numTests, distance); elapsedUsecs / (float) numTests, elapsedUsecs, numTests, distance);
// Vec3 test // Vec3 test
glm::vec3 vecA(randVector()), vecB(randVector()); glm::vec3 vecA(randVector()), vecB(randVector());
@ -457,8 +458,8 @@ void runTimingTests() {
glm::vec3 temp = vecA-vecB; glm::vec3 temp = vecA-vecB;
result = glm::dot(temp,temp); result = glm::dot(temp,temp);
} }
elapsedUsecs = (float)startTime.nsecsElapsed() / 1000.0; elapsedUsecs = (float)startTime.nsecsElapsed() * NSEC_TO_USEC;
qDebug("vec3 assign and dot() usecs: %f, last result:%f", 1000.0f * elapsedUsecs / (float) numTests, result); qDebug("vec3 assign and dot() usecs: %f, last result:%f", elapsedUsecs / (float) numTests, result);
} }
float loadSetting(QSettings* settings, const char* name, float defaultValue) { float loadSetting(QSettings* settings, const char* name, float defaultValue) {

3
interface/src/starfield/Controller.cpp
View file

@ -23,7 +23,8 @@ bool Controller::computeStars(unsigned numStars, unsigned seed) {
this->retile(numStars, _tileResolution); this->retile(numStars, _tileResolution);
double timeDiff = (double)startTime.nsecsElapsed() / 1000000.0; // ns to ms double NSEC_TO_MSEC = 1.0 / 1000000.0;
double timeDiff = (double)startTime.nsecsElapsed() * NSEC_TO_MSEC;
qDebug() << "Total time to retile and generate stars: " << timeDiff << "msec"; qDebug() << "Total time to retile and generate stars: " << timeDiff << "msec";
return true; return true;