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

Merge pull request #14124 from SamGondelman/particle

Browse source 
Don't render particles without textures
This commit is contained in:
John Conklin II 2018-10-17 11:17:23 -07:00 committed by GitHub
commit 7b226aa559
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
View file

@ -320,7 +320,7 @@ void ParticleEffectEntityRenderer::stepSimulation() {
} }
void ParticleEffectEntityRenderer::doRender(RenderArgs* args) { void ParticleEffectEntityRenderer::doRender(RenderArgs* args) {
if (!_visible) { if (!_visible || !(_networkTexture && _networkTexture->isLoaded())) {
return; return;
} }
@ -328,11 +328,7 @@ void ParticleEffectEntityRenderer::doRender(RenderArgs* args) {
stepSimulation(); stepSimulation();
gpu::Batch& batch = *args->_batch; gpu::Batch& batch = *args->_batch;
if (_networkTexture && _networkTexture->isLoaded()) {
batch.setResourceTexture(0, _networkTexture->getGPUTexture()); batch.setResourceTexture(0, _networkTexture->getGPUTexture());
} else {
batch.setResourceTexture(0, DependencyManager::get<TextureCache>()->getWhiteTexture());
}
Transform transform; Transform transform;
// The particles are in world space, so the transform is unused, except for the rotation, which we use // The particles are in world space, so the transform is unused, except for the rotation, which we use