From ef0ff96a4432fa223a03b0e89073943b4d422f67 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 20 Oct 2017 11:46:28 -0700 Subject: [PATCH] fix the rendering of wireframe for model entities with bad model URLs --- .../entities-renderer/src/RenderableModelEntityItem.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index e9d395a857..94e88ae29c 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -905,7 +905,7 @@ using namespace render; using namespace render::entities; ItemKey ModelEntityRenderer::getKey() { - return ItemKey::Builder().withTypeMeta(); + return ItemKey::Builder().withTypeMeta().withTypeShape(); } uint32_t ModelEntityRenderer::metaFetchMetaSubItems(ItemIDs& subItems) { @@ -1255,7 +1255,8 @@ void ModelEntityRenderer::doRender(RenderArgs* args) { model = _model; }); - if (_model && _model->didVisualGeometryRequestFail()) { + // If we don't have a model, or the model doesn't have visual geometry, render our bounding box as green wireframe + if (!model || (model && model->didVisualGeometryRequestFail())) { static glm::vec4 greenColor(0.0f, 1.0f, 0.0f, 1.0f); gpu::Batch& batch = *args->_batch; batch.setModelTransform(_modelTransform); // we want to include the scale as well