Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:58:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add Job::Config to HitEffect

Browse source
This commit is contained in:
Zach Pomerantz 2016-01-22 17:07:30 -08:00
parent 772aedde91
commit e8b8f4d535
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -171,9 +171,6 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend
return; return;
} }
setDrawHitEffect(renderContext->getDrawHitEffect());
// TODO: turn on/off AO through menu item
setAntialiasingStatus(renderContext->getFxaaStatus()); setAntialiasingStatus(renderContext->getFxaaStatus());
// TODO: Allow runtime manipulation of culling ShouldRenderFunctor // TODO: Allow runtime manipulation of culling ShouldRenderFunctor

4
libraries/render/src/render/Context.cpp
View file

@ -13,9 +13,9 @@
using namespace render; using namespace render;
RenderContext::RenderContext(int drawStatus, bool drawHitEffect) RenderContext::RenderContext(int drawStatus)
: _args{ nullptr }, : _args{ nullptr },
_drawStatus{ drawStatus }, _drawHitEffect{ drawHitEffect } { _drawStatus{ drawStatus } {
} }
void RenderContext::setOptions(bool occlusion, bool fxaa, bool showOwned, bool shadowMap) { void RenderContext::setOptions(bool occlusion, bool fxaa, bool showOwned, bool shadowMap) {

4
libraries/render/src/render/Context.h
View file

@ -32,13 +32,12 @@ class JobConfig;
class RenderContext { class RenderContext {
public: public:
RenderContext(int drawStatus, bool drawHitEffect); RenderContext(int drawStatus);
RenderContext() {}; RenderContext() {};
void setArgs(RenderArgs* args) { _args = args; } void setArgs(RenderArgs* args) { _args = args; }
RenderArgs* getArgs() { return _args; } RenderArgs* getArgs() { return _args; }
int getDrawStatus() { return _drawStatus; } int getDrawStatus() { return _drawStatus; }
bool getDrawHitEffect() { return _drawHitEffect; }
bool getOcclusionStatus() { return _occlusionStatus; } bool getOcclusionStatus() { return _occlusionStatus; }
bool getFxaaStatus() { return _fxaaStatus; } bool getFxaaStatus() { return _fxaaStatus; }
bool getShadowMapStatus() { return _shadowMapStatus; } bool getShadowMapStatus() { return _shadowMapStatus; }
@ -50,7 +49,6 @@ protected:
// Options // Options
int _drawStatus; // bitflag int _drawStatus; // bitflag
bool _drawHitEffect;
bool _occlusionStatus { false }; bool _occlusionStatus { false };
bool _fxaaStatus { false }; bool _fxaaStatus { false };
bool _shadowMapStatus { false }; bool _shadowMapStatus { false };