History

merge with upstream

Sam Gateau committed 11 years ago

Commit ab4b9402 parents 9cf3dfd 4ebc75d38 files · +3989 −503Browse files

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

Unified · Split

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