Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing some warnings

Browse source
This commit is contained in:
samcake 2016-02-12 10:21:28 -08:00
parent 40455af7fc
commit 40c283cba2
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,9 +64,9 @@ RenderDeferredTask::RenderDeferredTask(CullFunctor cullFunctor) {
const int TRANSPARENT_SHAPE_BUCKET = 1; const int TRANSPARENT_SHAPE_BUCKET = 1;
const int LIGHT_BUCKET = 2; const int LIGHT_BUCKET = 2;
MultiFilterItem<NUM_FILTERS>::ItemFilterArray triageFilters = { MultiFilterItem<NUM_FILTERS>::ItemFilterArray triageFilters = {
{ ItemFilter::Builder::opaqueShape() }, ItemFilter::Builder::opaqueShape(),
{ ItemFilter::Builder::transparentShape() }, ItemFilter::Builder::transparentShape(),
{ ItemFilter::Builder::light() } ItemFilter::Builder::light()
}; };
const auto filteredItemsBuckets = addJob<MultiFilterItem<NUM_FILTERS>>("FilterSceneSelection", culledSceneSelection, triageFilters).get<MultiFilterItem<NUM_FILTERS>::ItemBoundsArray>(); const auto filteredItemsBuckets = addJob<MultiFilterItem<NUM_FILTERS>>("FilterSceneSelection", culledSceneSelection, triageFilters).get<MultiFilterItem<NUM_FILTERS>::ItemBoundsArray>();
@ -200,9 +200,6 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon
assert(renderContext->args); assert(renderContext->args);
assert(renderContext->args->_viewFrustum); assert(renderContext->args->_viewFrustum);
// render backgrounds
auto& scene = sceneContext->_scene;
auto config = std::static_pointer_cast<Config>(renderContext->jobConfig); auto config = std::static_pointer_cast<Config>(renderContext->jobConfig);

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

@ -64,13 +64,9 @@ void render::renderShapes(const SceneContextPointer& sceneContext, const RenderC
void DrawLight::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemBounds& inLights) { void DrawLight::run(const SceneContextPointer& sceneContext, const RenderContextPointer& renderContext, const ItemBounds& inLights) {
assert(renderContext->args); assert(renderContext->args);
assert(renderContext->args->_viewFrustum); assert(renderContext->args->_viewFrustum);
auto& scene = sceneContext->_scene;
RenderArgs* args = renderContext->args; RenderArgs* args = renderContext->args;
// render lights // render lights
auto& details = args->_details.edit(RenderDetails::OTHER_ITEM);
gpu::doInBatch(args->_context, [&](gpu::Batch& batch) { gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
args->_batch = &batch; args->_batch = &batch;
renderItems(sceneContext, renderContext, inLights); renderItems(sceneContext, renderContext, inLights);