History

Expeand the wireframe to the primitive entities and the polyvox

samcake committed 9 years ago

Commit 03992491 parent ea2f1356 files · +36 −7Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+5−0
@@ -265,9 +265,12 @@ void DrawDeferred::run(const SceneContextPointer& sceneContext, const RenderCont · 264 unmodified lines
265 keyBuilder.withWireframe();265 keyBuilder.withWireframe();
266 }266 }
267 ShapeKey globalKey = keyBuilder.build();267 ShapeKey globalKey = keyBuilder.build();
268 args->_globalShapeKey = globalKey._flags.to_ulong();
268 269
269 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn, globalKey);270 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn, globalKey);
271
270 args->_batch = nullptr;272 args->_batch = nullptr;
273 args->_globalShapeKey = 0;
271 });274 });
272 275
273 config->setNumDrawn((int)inItems.size());276 config->setNumDrawn((int)inItems.size());
@@ -308,6 +311,7 @@ void DrawStateSortDeferred::run(const SceneContextPointer& sceneContext, const R · 34 unmodified lines
308 keyBuilder.withWireframe();311 keyBuilder.withWireframe();
309 }312 }
310 ShapeKey globalKey = keyBuilder.build();313 ShapeKey globalKey = keyBuilder.build();
314 args->_globalShapeKey = globalKey._flags.to_ulong();
311 315
312 if (_stateSort) {316 if (_stateSort) {
313 renderStateSortShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn, globalKey);317 renderStateSortShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn, globalKey);
@@ -315,6 +319,7 @@ void DrawStateSortDeferred::run(const SceneContextPointer& sceneContext, const R · 1 unmodified line
315 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn, globalKey);319 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn, globalKey);
316 }320 }
317 args->_batch = nullptr;321 args->_batch = nullptr;
322 args->_globalShapeKey = 0;
318 });323 });
319 324
320 config->setNumDrawn((int)inItems.size());325 config->setNumDrawn((int)inItems.size());

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