From 3344c7423def9ec8754a40694024608444e29a36 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 22 Sep 2020 20:52:15 +1200 Subject: [PATCH 1/2] Fix up types --- libraries/networking/src/ExternalResource.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/networking/src/ExternalResource.h b/libraries/networking/src/ExternalResource.h index 4f410e8015..c2a08c02a5 100644 --- a/libraries/networking/src/ExternalResource.h +++ b/libraries/networking/src/ExternalResource.h @@ -151,13 +151,13 @@ private: std::mutex _bucketMutex; - QMap _bucketBases{ - { Bucket::HF_Public, NetworkingConstants::HF_PUBLIC_CDN_URL }, - { Bucket::HF_Content, NetworkingConstants::HF_CONTENT_CDN_URL }, - { Bucket::HF_Marketplace, NetworkingConstants::HF_MPASSETS_CDN_URL }, - { Bucket::Assets, NetworkingConstants::VIRCADIA_CONTENT_CDN_URL }, - { Bucket::Public, NetworkingConstants::VIRCADIA_CONTENT_CDN_URL }, - { Bucket::Content, NetworkingConstants::VIRCADIA_CONTENT_CDN_URL } + QMap _bucketBases { + { Bucket::HF_Public, QUrl(NetworkingConstants::HF_PUBLIC_CDN_URL) }, + { Bucket::HF_Content, QUrl(NetworkingConstants::HF_CONTENT_CDN_URL) }, + { Bucket::HF_Marketplace, QUrl(NetworkingConstants::HF_MPASSETS_CDN_URL) }, + { Bucket::Assets, QUrl(NetworkingConstants::VIRCADIA_CONTENT_CDN_URL) }, + { Bucket::Public, QUrl(NetworkingConstants::VIRCADIA_CONTENT_CDN_URL) }, + { Bucket::Content, QUrl(NetworkingConstants::VIRCADIA_CONTENT_CDN_URL) } }; }; From 4959ca4975a66f8a43a697a93eecf2fce6891e87 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 22 Sep 2020 20:52:52 +1200 Subject: [PATCH 2/2] Move ExternalResource call into method Fixes Interface crash on Windows. --- interface/src/scripting/ScreenshareScriptingInterface.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/interface/src/scripting/ScreenshareScriptingInterface.cpp b/interface/src/scripting/ScreenshareScriptingInterface.cpp index 4b7bbf90cc..c2d36ecef0 100644 --- a/interface/src/scripting/ScreenshareScriptingInterface.cpp +++ b/interface/src/scripting/ScreenshareScriptingInterface.cpp @@ -130,8 +130,9 @@ static const uint8_t LOCAL_SCREENSHARE_WEB_ENTITY_FPS = 30; // The `z` value here is dynamic. static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION(0.0128f, -0.0918f, 0.0f); static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS(3.6790f, 2.0990f, 0.0100f); -static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, - "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html"); +static const ExternalResource::Bucket LOCAL_SCREENSHARE_WEB_ENTITY_BUCKET = ExternalResource::Bucket::HF_Content; +static const QString LOCAL_SCREENSHARE_WEB_ENTITY_PATH = + "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html"; static const QString LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE = "local"; void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZoneID, const QUuid& smartboardEntityID, @@ -283,6 +284,8 @@ void ScreenshareScriptingInterface::handleSuccessfulScreenshareInfoGet(QNetworkR glm::vec3 localPosition(LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION); localPosition.z = _localWebEntityZOffset; localScreenshareWebEntityProps.setLocalPosition(localPosition); + auto LOCAL_SCREENSHARE_WEB_ENTITY_URL = ExternalResource::getInstance()->getUrl(LOCAL_SCREENSHARE_WEB_ENTITY_BUCKET, + LOCAL_SCREENSHARE_WEB_ENTITY_PATH); localScreenshareWebEntityProps.setSourceUrl(LOCAL_SCREENSHARE_WEB_ENTITY_URL); localScreenshareWebEntityProps.setParentID(_smartboardEntityID); localScreenshareWebEntityProps.setDimensions(LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS);