fix fading and highlighting issues

SamGondelman committed 8 years ago

Commit 09ea32d1 parent 5652fa010 files · +123 −105Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 10 files). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+1−1

@@ -826,7 +826,7 @@ render::ShapePipelinePointer GeometryCache::getFadingShapePipeline(bool textured · 825 unmodified lines
826	bool unlit, bool depthBias) {	826	bool unlit, bool depthBias) {
827	auto fadeEffect = DependencyManager::get<FadeEffect>();	827	auto fadeEffect = DependencyManager::get<FadeEffect>();
828	auto fadeBatchSetter = fadeEffect->getBatchSetter();	828	auto fadeBatchSetter = fadeEffect->getBatchSetter();
829	auto fadeItemSetter = fadeEffect->getItemStoredSetter();	829	auto fadeItemSetter = fadeEffect->getItemUniformSetter();
830	return std::make_shared<render::ShapePipeline>(getSimplePipeline(textured, transparent, culled, unlit, depthBias, true), nullptr,	830	return std::make_shared<render::ShapePipeline>(getSimplePipeline(textured, transparent, culled, unlit, depthBias, true), nullptr,
831	[fadeBatchSetter, fadeItemSetter](const render::ShapePipeline& shapePipeline, gpu::Batch& batch, render::Args* args) {	831	[fadeBatchSetter, fadeItemSetter](const render::ShapePipeline& shapePipeline, gpu::Batch& batch, render::Args* args) {
832	batch.setResourceTexture(gr::Texture::MaterialAlbedo, DependencyManager::get<TextureCache>()->getWhiteTexture());	832	batch.setResourceTexture(gr::Texture::MaterialAlbedo, DependencyManager::get<TextureCache>()->getWhiteTexture());