Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-03 23:03:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fading working on voxels

Browse source
This commit is contained in:
Olivier Prat 2017-07-17 14:32:05 +02:00
parent 3f8daa21ec
commit 95059e26c1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -20,6 +20,8 @@
#include <model-networking/SimpleMeshProxy.h>
#include "ModelScriptingInterface.h"
#include <FadeEffect.h>
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdouble-promotion"
@ -860,11 +862,12 @@ render::ShapePipelinePointer PolyVoxPayload::shapePipelineFactory(const render::
}
if (key.isFaded()) {
const auto& fadeEffect = DependencyManager::get<FadeEffect>();
if (key.isWireframe()) {
return std::make_shared<render::ShapePipeline>(_wireframePipelines[1], nullptr, nullptr, nullptr);
return std::make_shared<render::ShapePipeline>(_wireframePipelines[1], nullptr, fadeEffect->getBatchSetter(), fadeEffect->getItemSetter());
}
else {
return std::make_shared<render::ShapePipeline>(_pipelines[1], nullptr, nullptr, nullptr);
return std::make_shared<render::ShapePipeline>(_pipelines[1], nullptr, fadeEffect->getBatchSetter(), fadeEffect->getItemSetter());
}
}
else {