History

Gut RenderContext

Zach Pomerantz committed 10 years ago

Commit f3265db1 parent e8b8f4d19 files · +117 −142Browse files

Showing the changes to libraries/render/src/render/DrawStatus.cpp (1 of 19 files). Show all

Unified · Split

libraries/render/src/render/DrawStatus.cpp+10−5
@@ -94,12 +94,17 @@ const gpu::TexturePointer DrawStatus::getStatusIconMap() const { · 93 unmodified lines
9494 return _statusIconMap;
9595 }
9696
97+void DrawStatus::configure(const Config& configuration) {
98+ _showDisplay = configuration.showDisplay;
99+ _showNetwork = configuration.showNetwork;
100+}
101+
97102 void DrawStatus::run(const SceneContextPointer& sceneContext,
98103 const RenderContextPointer& renderContext,
99104 const ItemIDsBounds& inItems) {
100− assert(renderContext->getArgs());
101− assert(renderContext->getArgs()->_viewFrustum);
102− RenderArgs* args = renderContext->getArgs();
105+ assert(renderContext->args);
106+ assert(renderContext->args->_viewFrustum);
107+ RenderArgs* args = renderContext->args;
103108 auto& scene = sceneContext->_scene;
104109 const int NUM_STATUS_VEC4_PER_ITEM = 2;
105110 const int VEC4_LENGTH = 4;
@@ -179,7 +184,7 @@ void DrawStatus::run(const SceneContextPointer& sceneContext, · 73 unmodified lines
179184
180185 const unsigned int VEC3_ADRESS_OFFSET = 3;
181186
182− if ((renderContext->getDrawStatus() & showDisplayStatusFlag) > 0) {
187+ if (_showDisplay) {
183188 for (int i = 0; i < nbItems; i++) {
184189 batch._glUniform3fv(_drawItemBoundPosLoc, 1, (const float*) (itemAABox + i));
185190 batch._glUniform3fv(_drawItemBoundDimLoc, 1, ((const float*) (itemAABox + i)) + VEC3_ADRESS_OFFSET);
@@ -192,7 +197,7 @@ void DrawStatus::run(const SceneContextPointer& sceneContext, · 6 unmodified lines
192197
193198 batch.setPipeline(getDrawItemStatusPipeline());
194199
195− if ((renderContext->getDrawStatus() & showNetworkStatusFlag) > 0) {
200+ if (_showNetwork) {
196201 for (int i = 0; i < nbItems; i++) {
197202 batch._glUniform3fv(_drawItemStatusPosLoc, 1, (const float*) (itemAABox + i));
198203 batch._glUniform3fv(_drawItemStatusDimLoc, 1, ((const float*) (itemAABox + i)) + VEC3_ADRESS_OFFSET);

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