From 2a663cbcb16352c043e38f6f6744e1615045df5d Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sun, 5 Mar 2017 19:28:15 -0800 Subject: [PATCH] cleanup --- .../entities-renderer/src/RenderableModelEntityItem.cpp | 2 +- libraries/render-utils/src/Model.cpp | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 1a6daf3d43..935dd4e796 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -418,7 +418,7 @@ void RenderableModelEntityItem::render(RenderArgs* args) { // Enqueue updates for the next frame if (_model) { -#if 1 //def WANT_EXTRA_RENDER_DEBUGGING +#ifdef WANT_EXTRA_RENDER_DEBUGGING // debugging... gpu::Batch& batch = *args->_batch; _model->renderDebugMeshBoxes(batch); diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 172290eae5..6be23ad615 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -1015,15 +1015,6 @@ void Model::simulate(float deltaTime, bool fullUpdate) { || (_snapModelToRegistrationPoint && !_snappedToRegistrationPoint); if (isActive() && fullUpdate) { - // NOTE: This is overly aggressive and we are invalidating the MeshBoxes when in fact they may not be invalid - // they really only become invalid if something about the transform to world space has changed. This is - // not too bad at this point, because it doesn't impact rendering. However it does slow down ray picking - // because ray picking needs valid boxes to work - //_calculatedMeshBoxesValid = false; - //_calculatedMeshTrianglesValid = false; - - // FIXME -- if the model URL changes, then we need to recalculate the triangle sets??!!!! - onInvalidate(); // check for scale to fit