History

can toggle hit effect on and off from a script

ericrius1 committed 11 years ago

Commit e75a6fe1 parent 3439d456 files · +23 −4Browse 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+7−0
@@ -78,6 +78,9 @@ RenderDeferredTask::RenderDeferredTask() : Task() { · 77 unmodified lines
78 78
79 _jobs.push_back(Job(new DrawOverlay3D::JobModel("DrawOverlay3D")));79 _jobs.push_back(Job(new DrawOverlay3D::JobModel("DrawOverlay3D")));
80 _jobs.push_back(Job(new HitEffect::JobModel("HitEffect")));80 _jobs.push_back(Job(new HitEffect::JobModel("HitEffect")));
81 _jobs.back().setEnabled(false);
82 _drawHitEffectJobIndex = _jobs.size() -1;
83
81 _jobs.push_back(Job(new ResetGLState::JobModel()));84 _jobs.push_back(Job(new ResetGLState::JobModel()));
82 85
83 86
@@ -106,6 +109,10 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend · 22 unmodified lines
106 109
107 // Make sure we turn the displayItemStatus on/off110 // Make sure we turn the displayItemStatus on/off
108 setDrawItemStatus(renderContext->_drawItemStatus);111 setDrawItemStatus(renderContext->_drawItemStatus);
112
113 //Make sure we display hit effect on screen, as desired from a script
114 setDrawHitEffect(renderContext->_drawHitEffect);
115
109 116
110 renderContext->args->_context->syncCache();117 renderContext->args->_context->syncCache();
111 118