History

Move ExternalResource call into method

Fixes Interface crash on Windows.

David Rowe committed 6 years ago

Commit 4959ca41 parent 3344c741 file · +5 −2Browse files

Showing the changes to interface/src/scripting/ScreenshareScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

interface/src/scripting/ScreenshareScriptingInterface.cpp+5−2
@@ -130,8 +130,9 @@ static const uint8_t LOCAL_SCREENSHARE_WEB_ENTITY_FPS = 30; · 129 unmodified lines
130// The `z` value here is dynamic.130// The `z` value here is dynamic.
131static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION(0.0128f, -0.0918f, 0.0f);131static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION(0.0128f, -0.0918f, 0.0f);
132static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS(3.6790f, 2.0990f, 0.0100f);132static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS(3.6790f, 2.0990f, 0.0100f);
133static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content,133static const ExternalResource::Bucket LOCAL_SCREENSHARE_WEB_ENTITY_BUCKET = ExternalResource::Bucket::HF_Content;
134 "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html");134static const QString LOCAL_SCREENSHARE_WEB_ENTITY_PATH =
135 "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html";
135static const QString LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE = "local";136static const QString LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE = "local";
136void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZoneID,137void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZoneID,
137 const QUuid& smartboardEntityID,138 const QUuid& smartboardEntityID,
@@ -283,6 +284,8 @@ void ScreenshareScriptingInterface::handleSuccessfulScreenshareInfoGet(QNetworkR · 145 unmodified lines
283 glm::vec3 localPosition(LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION);284 glm::vec3 localPosition(LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION);
284 localPosition.z = _localWebEntityZOffset;285 localPosition.z = _localWebEntityZOffset;
285 localScreenshareWebEntityProps.setLocalPosition(localPosition);286 localScreenshareWebEntityProps.setLocalPosition(localPosition);
287 auto LOCAL_SCREENSHARE_WEB_ENTITY_URL = ExternalResource::getInstance()->getUrl(LOCAL_SCREENSHARE_WEB_ENTITY_BUCKET,
288 LOCAL_SCREENSHARE_WEB_ENTITY_PATH);
286 localScreenshareWebEntityProps.setSourceUrl(LOCAL_SCREENSHARE_WEB_ENTITY_URL);289 localScreenshareWebEntityProps.setSourceUrl(LOCAL_SCREENSHARE_WEB_ENTITY_URL);
287 localScreenshareWebEntityProps.setParentID(_smartboardEntityID);290 localScreenshareWebEntityProps.setParentID(_smartboardEntityID);
288 localScreenshareWebEntityProps.setDimensions(LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS);291 localScreenshareWebEntityProps.setDimensions(LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS);