From 2f16aca114194575d734fbd983a8bbb5da9fca01 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 17 Aug 2016 09:57:53 -0700 Subject: [PATCH] remove cruft and fix typo in rebase --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 2 +- libraries/entities-renderer/src/RenderableModelEntityItem.cpp | 2 ++ libraries/render-utils/src/Model.h | 3 --- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 25352255fa..bc045a99d7 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -503,7 +503,7 @@ void EntityTreeRenderer::processEraseMessage(ReceivedMessage& message, const Sha std::static_pointer_cast(_tree)->processEraseMessage(message, sourceNode); } -ModelPointer EntityTreeRenderer::allocateModel(const QString& url, loadingPriority) { +ModelPointer EntityTreeRenderer::allocateModel(const QString& url, float loadingPriority) { ModelPointer model = nullptr; // Only create and delete models on the thread that owns the EntityTreeRenderer diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index d47c9afab6..3ba48b931d 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -180,6 +180,7 @@ void RenderableModelEntityItem::doInitialModelSimulation() { _needsInitialSimulation = false; } +/* // TODO: we need a solution for changes to the postion/rotation/etc of a model... // this current code path only addresses that in this setup case... not the changing/moving case bool RenderableModelEntityItem::readyToAddToScene(RenderArgs* renderArgs) { @@ -197,6 +198,7 @@ bool RenderableModelEntityItem::readyToAddToScene(RenderArgs* renderArgs) { bool ready = !_needsInitialSimulation && _model && _model->readyToAddToScene(); return ready; } +*/ class RenderableModelEntityItemMeta { public: diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index 08a3a2fc54..ff702d1ec5 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -82,9 +82,6 @@ public: void setVisibleInScene(bool newValue, std::shared_ptr scene); bool needsFixupInScene() const; - bool readyToAddToScene(RenderArgs* renderArgs = nullptr) const { - return !_needsReload && isRenderable() && isActive(); - } bool needsReload() const { return _needsReload; } bool initWhenReady(render::ScenePointer scene); bool addToScene(std::shared_ptr scene,