From 10eaed71f95c6fcb4a1f47a873d5e1d1071c44a6 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 24 Aug 2017 16:00:36 -0700 Subject: [PATCH 1/5] crash on shutdown --- interface/src/Application.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index c951b25930..6a11751061 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -707,8 +707,8 @@ private: QUrl _avatarOverrideUrl; bool _saveAvatarOverrideUrl { false }; - LaserPointerManager _laserPointerManager; RayPickManager _rayPickManager; + LaserPointerManager _laserPointerManager; }; #endif // hifi_Application_h From 35459a7b93afdc51f4edec9f1f4346f591494f87 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 28 Aug 2017 17:01:01 -0700 Subject: [PATCH 2/5] cherry-pick --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index a2d2d34837..414509cf0c 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -55,6 +55,13 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf _displayModelBounds(false), _layeredZones(this) { + setMouseRayPickResultOperator([&](QUuid rayPickID) { + RayToEntityIntersectionResult entityResult; + return entityResult; + }); + setSetPrecisionPickingOperator([&](QUuid rayPickID, bool value) {}); + EntityRenderer::initEntityRenderers(); + REGISTER_ENTITY_TYPE_WITH_FACTORY(Model, RenderableModelEntityItem::factory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Light, RenderableLightEntityItem::factory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Text, RenderableTextEntityItem::factory) From b8795c3ea9b23b624f8f0fe5ad05ff0dbf4c8067 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 28 Aug 2017 17:08:59 -0700 Subject: [PATCH 3/5] remove unneeded bind-by-ref thing from lambdas --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 414509cf0c..972ca9d777 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -55,11 +55,11 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf _displayModelBounds(false), _layeredZones(this) { - setMouseRayPickResultOperator([&](QUuid rayPickID) { + setMouseRayPickResultOperator([](QUuid rayPickID) { RayToEntityIntersectionResult entityResult; return entityResult; }); - setSetPrecisionPickingOperator([&](QUuid rayPickID, bool value) {}); + setSetPrecisionPickingOperator([](QUuid rayPickID, bool value) {}); EntityRenderer::initEntityRenderers(); REGISTER_ENTITY_TYPE_WITH_FACTORY(Model, RenderableModelEntityItem::factory) From a6aa71f8fd4a73729635eac00b587f65f777d277 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Aug 2017 09:51:08 -0700 Subject: [PATCH 4/5] unmangle merge --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 972ca9d777..abb7f3bb88 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -60,7 +60,6 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf return entityResult; }); setSetPrecisionPickingOperator([](QUuid rayPickID, bool value) {}); - EntityRenderer::initEntityRenderers(); REGISTER_ENTITY_TYPE_WITH_FACTORY(Model, RenderableModelEntityItem::factory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Light, RenderableLightEntityItem::factory) From 492d05301667a93eeca73e077e3ffdd6d02583ee Mon Sep 17 00:00:00 2001 From: Liv Date: Wed, 23 Aug 2017 17:38:24 -0700 Subject: [PATCH 5/5] Create home path for new content sets loaded in --- interface/src/Application.cpp | 6 +++++- interface/src/LocationBookmarks.cpp | 4 ++++ interface/src/LocationBookmarks.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d3b547a54c..ea4a3db465 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6284,7 +6284,11 @@ bool Application::askToReplaceDomainContent(const QString& url) { octreeFilePacket->write(urlData); limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode); }); - DependencyManager::get()->handleLookupString(DOMAIN_SPAWNING_POINT); + auto addressManager = DependencyManager::get(); + addressManager->handleLookupString(DOMAIN_SPAWNING_POINT); + QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT; + qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress; + DependencyManager::get()->setHomeLocationToAddress(newHomeAddress); methodDetails = "SuccessfulRequestToReplaceContent"; } else { methodDetails = "UserDeclinedToReplaceContent"; diff --git a/interface/src/LocationBookmarks.cpp b/interface/src/LocationBookmarks.cpp index eee6cdf3c8..b234f8c07b 100644 --- a/interface/src/LocationBookmarks.cpp +++ b/interface/src/LocationBookmarks.cpp @@ -63,6 +63,10 @@ void LocationBookmarks::setHomeLocation() { Bookmarks::addBookmarkToFile(HOME_BOOKMARK, bookmarkAddress); } +void LocationBookmarks::setHomeLocationToAddress(const QVariant& address) { + Bookmarks::insert("Home", address); +} + void LocationBookmarks::teleportToBookmark() { QAction* action = qobject_cast(sender()); QString address = action->data().toString(); diff --git a/interface/src/LocationBookmarks.h b/interface/src/LocationBookmarks.h index 6cac56ae04..9a800ba35e 100644 --- a/interface/src/LocationBookmarks.h +++ b/interface/src/LocationBookmarks.h @@ -27,6 +27,7 @@ public: public slots: void addBookmark(); + void setHomeLocationToAddress(const QVariant& address); protected: void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& address) override;