From 053828449239ad634b631851708c0aacc1348821 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Sat, 23 Mar 2024 20:39:40 -0700 Subject: [PATCH] fix 0 update props case --- .../src/RenderableProceduralParticleEffectEntityItem.cpp | 2 +- .../src/RenderableProceduralParticleEffectEntityItem.h | 2 +- libraries/entities/src/ProceduralParticleEffectEntityItem.h | 4 ++-- .../create/entityProperties/html/js/entityProperties.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableProceduralParticleEffectEntityItem.cpp b/libraries/entities-renderer/src/RenderableProceduralParticleEffectEntityItem.cpp index c9f242b1cb..b458a6da3e 100644 --- a/libraries/entities-renderer/src/RenderableProceduralParticleEffectEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableProceduralParticleEffectEntityItem.cpp @@ -200,7 +200,7 @@ void ProceduralParticleEffectEntityRenderer::doRender(RenderArgs* args) { Q_ASSERT(args->_batch); gpu::Batch& batch = *args->_batch; - if (!_visible || (_numUpdateProps > 0 && !_updateProcedural.isReady()) || !_renderProcedural.isReady()) { + if (!_visible || _numParticles == 0 || (_numUpdateProps > 0 && !_updateProcedural.isReady()) || !_renderProcedural.isReady()) { return; } diff --git a/libraries/entities-renderer/src/RenderableProceduralParticleEffectEntityItem.h b/libraries/entities-renderer/src/RenderableProceduralParticleEffectEntityItem.h index 1445e798b1..deb3f70f33 100644 --- a/libraries/entities-renderer/src/RenderableProceduralParticleEffectEntityItem.h +++ b/libraries/entities-renderer/src/RenderableProceduralParticleEffectEntityItem.h @@ -55,7 +55,7 @@ private: bool _transparent { false }; std::array _particleBuffers; - bool _evenPass{ true }; + bool _evenPass { true }; }; } } // namespace diff --git a/libraries/entities/src/ProceduralParticleEffectEntityItem.h b/libraries/entities/src/ProceduralParticleEffectEntityItem.h index e200f00fbc..98ae8b53df 100644 --- a/libraries/entities/src/ProceduralParticleEffectEntityItem.h +++ b/libraries/entities/src/ProceduralParticleEffectEntityItem.h @@ -20,8 +20,8 @@ namespace particle { static const uint8_t DEFAULT_NUM_TRIS_PER = 1; static const uint8_t MINIMUM_TRIS_PER = 1; static const uint8_t MAXIMUM_TRIS_PER = 15; - static const uint8_t DEFAULT_NUM_UPDATE_PROPS = 1; - static const uint8_t MINIMUM_NUM_UPDATE_PROPS = 1; + static const uint8_t DEFAULT_NUM_UPDATE_PROPS = 0; + static const uint8_t MINIMUM_NUM_UPDATE_PROPS = 0; static const uint8_t MAXIMUM_NUM_UPDATE_PROPS = 5; } diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js index 0d8214795f..84c1dd468e 100644 --- a/scripts/system/create/entityProperties/html/js/entityProperties.js +++ b/scripts/system/create/entityProperties/html/js/entityProperties.js @@ -1403,7 +1403,7 @@ const GROUPS = [ label: "Update Props", type: "number-draggable", propertyID: "numUpdateProps", - min: 1, + min: 0, max: 5 }, {