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

Brad Hefta-Gaub committed 9 years ago

Commit 84eca012 parents 0c22fcb 198c36113 files · +86 −75Browse files

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

Unified · Split

interface/src/Application.cpp+1−0

@@ -1271,6 +1271,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1270 unmodified lines
1271	properties["sim_rate"] = getAverageSimsPerSecond();	1271	properties["sim_rate"] = getAverageSimsPerSecond();
1272	properties["avatar_sim_rate"] = getAvatarSimrate();	1272	properties["avatar_sim_rate"] = getAvatarSimrate();
1273	properties["has_async_reprojection"] = displayPlugin->hasAsyncReprojection();	1273	properties["has_async_reprojection"] = displayPlugin->hasAsyncReprojection();
		1274	properties["hardware_stats"] = displayPlugin->getHardwareStats();
1274		1275
1275	auto bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();	1276	auto bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();
1276	properties["packet_rate_in"] = bandwidthRecorder->getCachedTotalAverageInputPacketsPerSecond();	1277	properties["packet_rate_in"] = bandwidthRecorder->getCachedTotalAverageInputPacketsPerSecond();