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
265265 keyBuilder.withWireframe();
266266 }
267267 ShapeKey globalKey = keyBuilder.build();
268+ args->_globalShapeKey = globalKey._flags.to_ulong();
268269
269270 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn, globalKey);
271+
270272 args->_batch = nullptr;
273+ args->_globalShapeKey = 0;
271274 });
272275
273276 config->setNumDrawn((int)inItems.size());
@@ -308,6 +311,7 @@ void DrawStateSortDeferred::run(const SceneContextPointer& sceneContext, const R · 34 unmodified lines
308311 keyBuilder.withWireframe();
309312 }
310313 ShapeKey globalKey = keyBuilder.build();
314+ args->_globalShapeKey = globalKey._flags.to_ulong();
311315
312316 if (_stateSort) {
313317 renderStateSortShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn, globalKey);
@@ -315,6 +319,7 @@ void DrawStateSortDeferred::run(const SceneContextPointer& sceneContext, const R · 1 unmodified line
315319 renderShapes(sceneContext, renderContext, _shapePlumber, inItems, _maxDrawn, globalKey);
316320 }
317321 args->_batch = nullptr;
322+ args->_globalShapeKey = 0;
318323 });
319324
320325 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