Showing the changes to libraries/render-utils/src/RenderDeferredTask.cpp (1 of 20 files). Show all
Unified · Split
| @@ -1,3 +1,4 @@ | ||
| 1 | + | |
| 1 | 2 | // |
| 2 | 3 | // RenderDeferredTask.cpp |
| 3 | 4 | // render-utils/src/ |
| @@ -18,6 +19,7 @@ · 14 unmodified lines | ||
| 18 | 19 | #include "FramebufferCache.h" |
| 19 | 20 | #include "DeferredLightingEffect.h" |
| 20 | 21 | #include "TextureCache.h" |
| 22 | +#include "HitEffect.h" | |
| 21 | 23 | |
| 22 | 24 | #include "render/DrawStatus.h" |
| 23 | 25 | #include "AmbientOcclusionEffect.h" |
| @@ -76,6 +78,7 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 52 unmodified lines | ||
| 76 | 78 | _jobs.push_back(Job(new DepthSortItems::JobModel("DepthSortOpaque", _jobs.back().getOutput()))); |
| 77 | 79 | auto& renderedOpaques = _jobs.back().getOutput(); |
| 78 | 80 | _jobs.push_back(Job(new DrawOpaqueDeferred::JobModel("DrawOpaqueDeferred", _jobs.back().getOutput()))); |
| 81 | + | |
| 79 | 82 | _jobs.push_back(Job(new DrawLight::JobModel("DrawLight"))); |
| 80 | 83 | _jobs.push_back(Job(new RenderDeferred::JobModel("RenderDeferred"))); |
| 81 | 84 | _jobs.push_back(Job(new ResolveDeferred::JobModel("ResolveDeferred"))); |
| @@ -103,8 +106,13 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 21 unmodified lines | ||
| 103 | 106 | _drawStatusJobIndex = _jobs.size() - 1; |
| 104 | 107 | |
| 105 | 108 | _jobs.push_back(Job(new DrawOverlay3D::JobModel("DrawOverlay3D"))); |
| 109 | + _jobs.push_back(Job(new HitEffect::JobModel("HitEffect"))); | |
| 110 | + _jobs.back().setEnabled(false); | |
| 111 | + _drawHitEffectJobIndex = _jobs.size() -1; | |
| 112 | + | |
| 106 | 113 | |
| 107 | 114 | _jobs.push_back(Job(new ResetGLState::JobModel())); |
| 115 | + | |
| 108 | 116 | |
| 109 | 117 | // Give ourselves 3 frmaes of timer queries |
| 110 | 118 | _timerQueries.push_back(std::make_shared<gpu::Query>()); |
| @@ -131,6 +139,10 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend · 20 unmodified lines | ||
| 131 | 139 | |
| 132 | 140 | // Make sure we turn the displayItemStatus on/off |
| 133 | 141 | setDrawItemStatus(renderContext->_drawItemStatus); |
| 142 | + | |
| 143 | + //Make sure we display hit effect on screen, as desired from a script | |
| 144 | + setDrawHitEffect(renderContext->_drawHitEffect); | |
| 145 | + | |
| 134 | 146 | |
| 135 | 147 | // TODO: turn on/off AO through menu item |
| 136 | 148 | setOcclusionStatus(renderContext->_occlusionStatus); |