Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 10:03:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

include spatialSelection in RenderFetchCullSortTask::Output

Browse source
This commit is contained in:
Zach Pomerantz 2016-12-30 15:08:16 -05:00
parent 0e9da87549
commit 15656a0592
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/render-utils/src/RenderDeferredTask.cpp
View file

@ -60,6 +60,7 @@ RenderDeferredTask::RenderDeferredTask(RenderFetchCullSortTask::Output items) {
const auto overlayOpaques = items[3]; const auto overlayOpaques = items[3];
const auto overlayTransparents = items[4]; const auto overlayTransparents = items[4];
const auto background = items[5]; const auto background = items[5];
const auto spatialSelection = items[6];
// Prepare deferred, generate the shared Deferred Frame Transform // Prepare deferred, generate the shared Deferred Frame Transform
const auto deferredFrameTransform = addJob<GenerateDeferredFrameTransform>("DeferredFrameTransform"); const auto deferredFrameTransform = addJob<GenerateDeferredFrameTransform>("DeferredFrameTransform");
@ -169,10 +170,10 @@ RenderDeferredTask::RenderDeferredTask(RenderFetchCullSortTask::Output items) {
addJob<DebugAmbientOcclusion>("DebugAmbientOcclusion", debugAmbientOcclusionInputs); addJob<DebugAmbientOcclusion>("DebugAmbientOcclusion", debugAmbientOcclusionInputs);
// Scene Octree Debuging job // Scene Octree Debugging job
{ {
// addJob<DrawSceneOctree>("DrawSceneOctree", spatialSelection); addJob<DrawSceneOctree>("DrawSceneOctree", spatialSelection);
// addJob<DrawItemSelection>("DrawItemSelection", spatialSelection); addJob<DrawItemSelection>("DrawItemSelection", spatialSelection);
} }
// Status icon rendering job // Status icon rendering job

3
libraries/render/src/render/RenderFetchCullSortTask.cpp
View file

@ -56,5 +56,6 @@ RenderFetchCullSortTask::RenderFetchCullSortTask(CullFunctor cullFunctor) {
const auto overlayTransparents = addJob<DepthSortItems>("DepthSortOverlayTransparent", filteredNonspatialBuckets[TRANSPARENT_SHAPE_BUCKET], DepthSortItems(false)); const auto overlayTransparents = addJob<DepthSortItems>("DepthSortOverlayTransparent", filteredNonspatialBuckets[TRANSPARENT_SHAPE_BUCKET], DepthSortItems(false));
const auto background = filteredNonspatialBuckets[BACKGROUND_BUCKET]; const auto background = filteredNonspatialBuckets[BACKGROUND_BUCKET];
setOutput(Output{{ opaques, transparents, lights, overlayOpaques, overlayTransparents, background }}); setOutput(Output{{
opaques, transparents, lights, overlayOpaques, overlayTransparents, background, spatialSelection }});
} }

2
libraries/render/src/render/RenderFetchCullSortTask.h
View file

@ -19,7 +19,7 @@
class RenderFetchCullSortTask : public render::Task { class RenderFetchCullSortTask : public render::Task {
public: public:
using Output = std::array<render::Varying, 6>; using Output = std::array<render::Varying, 7>;
using JobModel = ModelO<RenderFetchCullSortTask>; using JobModel = ModelO<RenderFetchCullSortTask>;
RenderFetchCullSortTask(render::CullFunctor cullFunctor); RenderFetchCullSortTask(render::CullFunctor cullFunctor);