diff --git a/libraries/render-utils/src/FadeManager.cpp b/libraries/render-utils/src/FadeEffect.cpp similarity index 79% rename from libraries/render-utils/src/FadeManager.cpp rename to libraries/render-utils/src/FadeEffect.cpp index f70e2e94d0..f750798914 100644 --- a/libraries/render-utils/src/FadeManager.cpp +++ b/libraries/render-utils/src/FadeEffect.cpp @@ -1,9 +1,9 @@ -#include "FadeManager.h" +#include "FadeEffect.h" #include "TextureCache.h" #include -FadeManager::FadeManager() : +FadeEffect::FadeEffect() : _isDebugEnabled{ false }, _debugFadePercent{ 0.f } { @@ -11,7 +11,7 @@ FadeManager::FadeManager() : _fadeMaskMap = DependencyManager::get()->getImageTexture(texturePath, image::TextureUsage::STRICT_TEXTURE); } -render::ShapeKey::Builder FadeManager::getKeyBuilder() const +render::ShapeKey::Builder FadeEffect::getKeyBuilder() const { render::ShapeKey::Builder builder; diff --git a/libraries/render-utils/src/FadeManager.h b/libraries/render-utils/src/FadeEffect.h similarity index 86% rename from libraries/render-utils/src/FadeManager.h rename to libraries/render-utils/src/FadeEffect.h index d42447fc26..6c5b2c90c8 100644 --- a/libraries/render-utils/src/FadeManager.h +++ b/libraries/render-utils/src/FadeEffect.h @@ -1,5 +1,5 @@ // -// FadeManager.h +// FadeEffect.h // libraries/render-utils/src/ // // Created by Olivier Prat on 06/06/17. @@ -8,19 +8,19 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef hifi_FadeManager_h -#define hifi_FadeManager_h +#ifndef hifi_FadeEffect_h +#define hifi_FadeEffect_h #include #include #include // Centralizes fade effect data and functions -class FadeManager : public Dependency { +class FadeEffect : public Dependency { SINGLETON_DEPENDENCY public: - FadeManager(); + FadeEffect(); const gpu::TexturePointer getFadeMaskMap() const { return _fadeMaskMap; } @@ -40,4 +40,4 @@ private: }; -#endif // hifi_FadeManager_h +#endif // hifi_FadeEffect_h diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp index 87ac019030..1d6ddea70f 100644 --- a/libraries/render-utils/src/MeshPartPayload.cpp +++ b/libraries/render-utils/src/MeshPartPayload.cpp @@ -15,7 +15,7 @@ #include "DeferredLightingEffect.h" #include "EntityItem.h" -#include "FadeManager.h" +#include "FadeEffect.h" using namespace render; @@ -552,7 +552,7 @@ float ModelMeshPartPayload::computeFadePercent() const { } void ModelMeshPartPayload::bindFade(gpu::Batch& batch) const { - const bool isDebugEnabled = DependencyManager::get()->isDebugEnabled(); + const bool isDebugEnabled = DependencyManager::get()->isDebugEnabled(); if (_fadeState != FADE_COMPLETE || isDebugEnabled) { auto& fade = _fadeBuffer.edit(); @@ -563,7 +563,7 @@ void ModelMeshPartPayload::bindFade(gpu::Batch& batch) const { fade._percent = computeFadePercent(); } else { - fade._percent = DependencyManager::get()->getDebugFadePercent(); + fade._percent = DependencyManager::get()->getDebugFadePercent(); } fade._offset = offset; diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp index 4d91d7d512..1e8673b385 100644 --- a/libraries/render-utils/src/RenderDeferredTask.cpp +++ b/libraries/render-utils/src/RenderDeferredTask.cpp @@ -35,7 +35,7 @@ #include "HitEffect.h" #include "TextureCache.h" #include "ZoneRenderer.h" -#include "FadeManager.h" +#include "FadeEffect.h" #include "AmbientOcclusionEffect.h" #include "AntialiasingEffect.h" @@ -53,8 +53,8 @@ extern void initDeferredPipelines(render::ShapePlumber& plumber); void RenderDeferredTask::configure(const Config& config) { - DependencyManager::get()->setDebugEnabled(config.debugFade); - DependencyManager::get()->setDebugFadePercent(config.debugFadePercent); + DependencyManager::get()->setDebugEnabled(config.debugFade); + DependencyManager::get()->setDebugFadePercent(config.debugFadePercent); } void RenderDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output) { @@ -92,7 +92,7 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren const auto deferredFramebuffer = prepareDeferredOutputs.getN(0); const auto lightingFramebuffer = prepareDeferredOutputs.getN(1); - DependencyManager::set(); + DependencyManager::set(); // Render opaque objects in DeferredBuffer const auto opaqueInputs = DrawStateSortDeferred::Inputs(opaques, lightingModel).hasVarying(); @@ -257,8 +257,8 @@ void DrawDeferred::run(const RenderContextPointer& renderContext, const Inputs& const auto& lightingModel = inputs.get1(); RenderArgs* args = renderContext->args; - ShapeKey::Builder defaultKeyBuilder = DependencyManager::get()->getKeyBuilder(); - gpu::TexturePointer fadeMaskMap = DependencyManager::get()->getFadeMaskMap(); + ShapeKey::Builder defaultKeyBuilder = DependencyManager::get()->getKeyBuilder(); + gpu::TexturePointer fadeMaskMap = DependencyManager::get()->getFadeMaskMap(); gpu::doInBatch(args->_context, [&](gpu::Batch& batch) { args->_batch = &batch; @@ -309,8 +309,8 @@ void DrawStateSortDeferred::run(const RenderContextPointer& renderContext, const const auto& lightingModel = inputs.get1(); RenderArgs* args = renderContext->args; - ShapeKey::Builder defaultKeyBuilder = DependencyManager::get()->getKeyBuilder(); - gpu::TexturePointer fadeMaskMap = DependencyManager::get()->getFadeMaskMap(); + ShapeKey::Builder defaultKeyBuilder = DependencyManager::get()->getKeyBuilder(); + gpu::TexturePointer fadeMaskMap = DependencyManager::get()->getFadeMaskMap(); gpu::doInBatch(args->_context, [&](gpu::Batch& batch) { args->_batch = &batch;