History

use icons to show network and physics status

Seth Alves committed 11 years ago

Commit 66387c41 parent 774e2ab7 files · +45 −21Browse files

Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 7 files). Show all

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+4−5
@@ -112,12 +112,11 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 111 unmodified lines
112 _jobs.push_back(Job(new DepthSortItems::JobModel("DepthSortTransparent", _jobs.back().getOutput(), DepthSortItems(false))));112 _jobs.push_back(Job(new DepthSortItems::JobModel("DepthSortTransparent", _jobs.back().getOutput(), DepthSortItems(false))));
113 _jobs.push_back(Job(new DrawTransparentDeferred::JobModel("TransparentDeferred", _jobs.back().getOutput())));113 _jobs.push_back(Job(new DrawTransparentDeferred::JobModel("TransparentDeferred", _jobs.back().getOutput())));
114 114
115 // Grab a texture map representing the different status icons and assign that to the drawStatsuJob115 // Grab a texture map representing the different status icons and assign that to the drawStatsuJob
116 auto iconMapPath = PathUtils::resourcesPath() + "images/hifi-logo.svg";116 auto iconMapPath = PathUtils::resourcesPath() + "icons/statusIconAtlas.svg";
117
118 auto statusIconMap = DependencyManager::get<TextureCache>()->getImageTexture(iconMapPath);
119 _jobs.push_back(Job(new render::DrawStatus::JobModel("DrawStatus", renderedOpaques, DrawStatus(statusIconMap))));
120 117
118 auto statusIconMap = DependencyManager::get<TextureCache>()->getImageTexture(iconMapPath);
119 _jobs.push_back(Job(new render::DrawStatus::JobModel("DrawStatus", renderedOpaques, DrawStatus(statusIconMap))));
121 120
122 _jobs.back().setEnabled(false);121 _jobs.back().setEnabled(false);
123 _drawStatusJobIndex = _jobs.size() - 1;122 _drawStatusJobIndex = _jobs.size() - 1;