diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5d50a1c9fe..52677abff6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1635,6 +1635,8 @@ void Application::paintGL() { return; } + DependencyManager::get()->cameraPosition = getMyAvatar()->getPosition(); + _inPaint = true; Finally clearFlag([this] { _inPaint = false; }); diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.h b/libraries/entities-renderer/src/EntityTreeRenderer.h index 4111207e00..ec14e2f269 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.h +++ b/libraries/entities-renderer/src/EntityTreeRenderer.h @@ -46,6 +46,8 @@ public: virtual PacketType getExpectedPacketType() const { return PacketType::EntityData; } virtual void setTree(OctreePointer newTree); + glm::vec3 cameraPosition {}; + void shutdown(); void update(); diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index e36c9d8d40..1ddc3cda47 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -827,7 +827,7 @@ void Model::setURL(const QUrl& url) { deleteGeometry(); auto resource = DependencyManager::get()->getGeometryResource(url); - resource->setLoadPriority(this, priority); + resource->setLoadPriority(this, _loadingPriority); _renderWatcher.setResource(resource); onInvalidate(); } diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index 4b93d19d35..0ddfcd32c3 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -238,7 +238,7 @@ public: // returns 'true' if needs fullUpdate after geometry change bool updateGeometry(); - float setLoadingPriority(float priority) { _loadingPriority = priority; } + void setLoadingPriority(float priority) { _loadingPriority = priority; } public slots: void loadURLFinished(bool success);