History

Merge branch 'master' of https://github.com/highfidelity/hifi into brown

samcake committed 9 years ago

Commit 044110e2 parents c256893 f9c6cec59 files · +1029 −646Browse files

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

Unified · Split

interface/src/Application.cpp+3−6
@@ -1340,8 +1340,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1339 unmodified lines
1340 1340
1341 auto glInfo = getGLContextData();1341 auto glInfo = getGLContextData();
1342 properties["gl_info"] = glInfo;1342 properties["gl_info"] = glInfo;
1343 properties["gpu_used_memory"] = (int)BYTES_TO_MB(gpu::Context::getUsedGPUMemory());1343 properties["gpu_used_memory"] = (int)BYTES_TO_MB(gpu::Context::getUsedGPUMemSize());
1344 properties["gpu_free_memory"] = (int)BYTES_TO_MB(gpu::Context::getFreeGPUMemory());1344 properties["gpu_free_memory"] = (int)BYTES_TO_MB(gpu::Context::getFreeGPUMemSize());
1345 properties["gpu_frame_time"] = (float)(qApp->getGPUContext()->getFrameTimerGPUAverage());1345 properties["gpu_frame_time"] = (float)(qApp->getGPUContext()->getFrameTimerGPUAverage());
1346 properties["batch_frame_time"] = (float)(qApp->getGPUContext()->getFrameTimerBatchAverage());1346 properties["batch_frame_time"] = (float)(qApp->getGPUContext()->getFrameTimerBatchAverage());
1347 properties["ideal_thread_count"] = QThread::idealThreadCount();1347 properties["ideal_thread_count"] = QThread::idealThreadCount();
@@ -3601,10 +3601,6 @@ void Application::idle(float nsecsElapsed) { · 2253 unmodified lines
3601 _overlayConductor.update(secondsSinceLastUpdate);3601 _overlayConductor.update(secondsSinceLastUpdate);
3602}3602}
3603 3603
3604void Application::setLowVelocityFilter(bool lowVelocityFilter) {
3605 controller::InputDevice::setLowVelocityFilter(lowVelocityFilter);
3606}
3607
3608ivec2 Application::getMouse() const {3604ivec2 Application::getMouse() const {
3609 return getApplicationCompositor().getReticlePosition();3605 return getApplicationCompositor().getReticlePosition();
3610}3606}
@@ -4380,6 +4376,7 @@ void Application::update(float deltaTime) { · 769 unmodified lines
4380 }4376 }
4381 }4377 }
4382 4378
4379 userInputMapper->setInputCalibrationData(calibrationData);
4383 userInputMapper->update(deltaTime);4380 userInputMapper->update(deltaTime);
4384 4381
4385 if (keyboardMousePlugin && keyboardMousePlugin->isActive()) {4382 if (keyboardMousePlugin && keyboardMousePlugin->isActive()) {