History

Merge branch 'master' of https://github.com/highfidelity/hifi into yellow

Sam Gateau committed 11 years ago

Commit 8c960962 parents 661f299 4ebc75d20 files · +2820 −367Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+12−0
@@ -1,3 +1,4 @@
1
1//2//
2// RenderDeferredTask.cpp3// RenderDeferredTask.cpp
3// render-utils/src/4// render-utils/src/
@@ -18,6 +19,7 @@ · 14 unmodified lines
18#include "FramebufferCache.h"19#include "FramebufferCache.h"
19#include "DeferredLightingEffect.h"20#include "DeferredLightingEffect.h"
20#include "TextureCache.h"21#include "TextureCache.h"
22#include "HitEffect.h"
21 23
22#include "render/DrawStatus.h"24#include "render/DrawStatus.h"
23#include "AmbientOcclusionEffect.h"25#include "AmbientOcclusionEffect.h"
@@ -76,6 +78,7 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 52 unmodified lines
76 _jobs.push_back(Job(new DepthSortItems::JobModel("DepthSortOpaque", _jobs.back().getOutput())));78 _jobs.push_back(Job(new DepthSortItems::JobModel("DepthSortOpaque", _jobs.back().getOutput())));
77 auto& renderedOpaques = _jobs.back().getOutput();79 auto& renderedOpaques = _jobs.back().getOutput();
78 _jobs.push_back(Job(new DrawOpaqueDeferred::JobModel("DrawOpaqueDeferred", _jobs.back().getOutput())));80 _jobs.push_back(Job(new DrawOpaqueDeferred::JobModel("DrawOpaqueDeferred", _jobs.back().getOutput())));
81
79 _jobs.push_back(Job(new DrawLight::JobModel("DrawLight")));82 _jobs.push_back(Job(new DrawLight::JobModel("DrawLight")));
80 _jobs.push_back(Job(new RenderDeferred::JobModel("RenderDeferred")));83 _jobs.push_back(Job(new RenderDeferred::JobModel("RenderDeferred")));
81 _jobs.push_back(Job(new ResolveDeferred::JobModel("ResolveDeferred")));84 _jobs.push_back(Job(new ResolveDeferred::JobModel("ResolveDeferred")));
@@ -103,8 +106,13 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 21 unmodified lines
103 _drawStatusJobIndex = _jobs.size() - 1;106 _drawStatusJobIndex = _jobs.size() - 1;
104 107
105 _jobs.push_back(Job(new DrawOverlay3D::JobModel("DrawOverlay3D")));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 _jobs.push_back(Job(new ResetGLState::JobModel()));114 _jobs.push_back(Job(new ResetGLState::JobModel()));
115
108 116
109 // Give ourselves 3 frmaes of timer queries117 // Give ourselves 3 frmaes of timer queries
110 _timerQueries.push_back(std::make_shared<gpu::Query>());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 // Make sure we turn the displayItemStatus on/off140 // Make sure we turn the displayItemStatus on/off
133 setDrawItemStatus(renderContext->_drawItemStatus);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 // TODO: turn on/off AO through menu item147 // TODO: turn on/off AO through menu item
136 setOcclusionStatus(renderContext->_occlusionStatus);148 setOcclusionStatus(renderContext->_occlusionStatus);