Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 19:13:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename RenderContext::ItemsMeta to ItemsConfig

Browse source
This commit is contained in:
Zach Pomerantz 2015-12-18 11:48:40 -08:00
parent cdcb2d565d
commit d057239023
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -3681,7 +3681,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
renderArgs->_viewFrustum = getDisplayViewFrustum();
auto renderInterface = DependencyManager::get<RenderScriptingInterface>();
auto renderItemsMeta = renderInterface->getItemsMeta();
auto renderItemsConfig = renderInterface->getItemsConfig();
auto renderTone = renderInterface->getTone();
int drawStatus = renderInterface->getDrawStatus();
bool drawHitEffect = renderInterface->getDrawHitEffect();
@ -3690,7 +3690,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
bool antialiasingStatus = Menu::getInstance()->isOptionChecked(MenuOption::Antialiasing);
bool showOwnedStatus = Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowOwned);
render::RenderContext renderContext{renderArgs, renderItemsMeta, renderTone};
render::RenderContext renderContext{renderArgs, renderItemsConfig, renderTone};
renderContext.setOptions(drawStatus, drawHitEffect, occlusionStatus, antialiasingStatus, showOwnedStatus);
_renderEngine->setRenderContext(renderContext);
@ -3700,7 +3700,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
myAvatar->endRenderRun();
auto engineContext = _renderEngine->getRenderContext();
renderInterface->setItemCounts(engineContext->getItemsMeta());
renderInterface->setItemCounts(engineContext->getItemsConfig());
}
activeRenderingThread = nullptr;

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

@ -53,8 +53,8 @@ RenderDeferredTask::RenderDeferredTask() : Task() {
// CPU only, create the list of renderedOpaques items
_jobs.push_back(Job(new FetchItems::JobModel("FetchOpaque",
FetchItems([](const RenderContextPointer& context, int count) {
context->getItemsMeta()._opaque._numFeed = count;
auto& opaque = context->getItemsMeta()._opaque;
context->getItemsConfig()._opaque._numFeed = count;
auto& opaque = context->getItemsConfig()._opaque;
})
)));
_jobs.push_back(Job(new CullItemsOpaque::JobModel("CullOpaque", _jobs.back().getOutput())));
@ -65,7 +65,7 @@ RenderDeferredTask::RenderDeferredTask() : Task() {
_jobs.push_back(Job(new FetchItems::JobModel("FetchTransparent",
FetchItems(ItemFilter::Builder::transparentShape().withoutLayered(),
[](const RenderContextPointer& context, int count) {
context->getItemsMeta()._transparent._numFeed = count;
context->getItemsConfig()._transparent._numFeed = count;
})
)));
_jobs.push_back(Job(new CullItemsTransparent::JobModel("CullTransparent", _jobs.back().getOutput())));
@ -187,7 +187,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend
batch.setStateScissorRect(args->_viewport);
args->_batch = &batch;
auto& opaque = renderContext->getItemsMeta()._opaque;
auto& opaque = renderContext->getItemsConfig()._opaque;
opaque._numDrawn = (int)inItems.size();
glm::mat4 projMat;
@ -217,7 +217,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const
batch.setStateScissorRect(args->_viewport);
args->_batch = &batch;
auto& transparent = renderContext->getItemsMeta()._transparent;
auto& transparent = renderContext->getItemsConfig()._transparent;
transparent._numDrawn = (int)inItems.size();
glm::mat4 projMat;
@ -270,7 +270,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon
inItems.emplace_back(id);
}
}
auto& overlay3D = renderContext->getItemsMeta()._overlay3D;
auto& overlay3D = renderContext->getItemsConfig()._overlay3D;
overlay3D._numFeed = (int)inItems.size();
overlay3D._numDrawn = (int)inItems.size();
@ -304,7 +304,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon
batch.setPipeline(getOpaquePipeline());
batch.setResourceTexture(0, args->_whiteTexture);
renderItems(sceneContext, renderContext, inItems, renderContext->getItemsMeta()._overlay3D._maxDrawn);
renderItems(sceneContext, renderContext, inItems, renderContext->getItemsConfig()._overlay3D._maxDrawn);
});
args->_batch = nullptr;
args->_whiteTexture.reset();

6
libraries/render-utils/src/RenderScriptingInterface.h
View file

@ -72,15 +72,15 @@ class RenderScriptingInterface : public QObject, public Dependency {
inline int getDrawStatus() { return _drawStatus; }
inline bool getDrawHitEffect() { return _drawHitEffect; }
inline const render::RenderContext::ItemsMeta& getItemsMeta() { return _items; }
inline const render::RenderContext::ItemsConfig& getItemsConfig() { return _items; }
inline const render::RenderContext::Tone& getTone() { return _tone; }
void setItemCounts(const render::RenderContext::ItemsMeta& items) { _items.setCounts(items); };
void setItemCounts(const render::RenderContext::ItemsConfig& items) { _items.setCounts(items); };
protected:
RenderScriptingInterface();
~RenderScriptingInterface() {};
render::RenderContext::ItemsMeta _items;
render::RenderContext::ItemsConfig _items;
render::RenderContext::Tone _tone;
// Options

10
libraries/render/src/render/Engine.h
View file

@ -32,8 +32,8 @@ const int showNetworkStatusFlag = 2;
class RenderContext {
public:
struct ItemsMeta {
inline void setCounts(const ItemsMeta& items) {
struct ItemsConfig {
inline void setCounts(const ItemsConfig& items) {
_opaque.setCounts(items._opaque);
_transparent.setCounts(items._transparent);
_overlay3D.setCounts(items._overlay3D);
@ -75,7 +75,7 @@ public:
float _exposure = 0.0;
};
RenderContext(RenderArgs* args, ItemsMeta items, Tone tone) : _args{args}, _items{items}, _tone{tone} {};
RenderContext(RenderArgs* args, ItemsConfig items, Tone tone) : _args{args}, _items{items}, _tone{tone} {};
RenderContext() : RenderContext(nullptr, {}, {}) {};
inline RenderArgs* getArgs() { return _args; }
@ -83,7 +83,7 @@ public:
inline bool getDrawHitEffect() { return _drawHitEffect; }
inline bool getOcclusionStatus() { return _occlusionStatus; }
inline bool getFxaaStatus() { return _fxaaStatus; }
inline ItemsMeta& getItemsMeta() { return _items; }
inline ItemsConfig& getItemsConfig() { return _items; }
inline Tone& getTone() { return _tone; }
void setOptions(int drawStatus, bool drawHitEffect, bool occlusion, bool fxaa, bool showOwned);
@ -100,7 +100,7 @@ protected:
bool _occlusionStatus = false;
bool _fxaaStatus = false;
ItemsMeta _items;
ItemsConfig _items;
Tone _tone;
};
typedef std::shared_ptr<RenderContext> RenderContextPointer;