History

Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling

ZappoMan committed 13 years ago

Commit 3d3eca92 parents 50a5b60 04b88e523 files · +5693 −129Browse files

Showing the changes to interface/src/Util.cpp (1 of 23 files). Show all

Unified · Split

interface/src/Util.cpp+14−0
@@ -514,6 +514,20 @@ void runTimingTests() { · 513 unmodified lines
514 printLog("vector math usecs: %f [%f msecs total for %d tests]\n", 514 printLog("vector math usecs: %f [%f msecs total for %d tests]\n",
515 1000.0f * elapsedMsecs / (float) numTests, elapsedMsecs, numTests);515 1000.0f * elapsedMsecs / (float) numTests, elapsedMsecs, numTests);
516 516
517 // Vec3 test
518 glm::vec3 vecA(randVector()), vecB(randVector());
519 float result;
520
521 gettimeofday(&startTime, NULL);
522 for (int i = 1; i < numTests; i++) {
523 glm::vec3 temp = vecA-vecB;
524 result = glm::dot(temp,temp);
525 }
526 gettimeofday(&endTime, NULL);
527 elapsedMsecs = diffclock(&startTime, &endTime);
528 printLog("vec3 assign and dot() usecs: %f\n", 1000.0f * elapsedMsecs / (float) numTests);
529
530
517}531}
518 532
519float loadSetting(QSettings* settings, const char* name, float defaultValue) {533float loadSetting(QSettings* settings, const char* name, float defaultValue) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t