History

Merge branch 'pr/691' into fix/URL-migrations

Kalila L committed 6 years ago

Commit b1f32dd2 parents f465ecb 929f395141 files · +178388 −6056Browse files

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

Unified · Split

interface/src/scripting/ScreenshareScriptingInterface.cpp+4−3
@@ -24,6 +24,7 @@ · 23 unmodified lines
24 24
25#include "EntityScriptingInterface.h"25#include "EntityScriptingInterface.h"
26#include "ScreenshareScriptingInterface.h"26#include "ScreenshareScriptingInterface.h"
27#include "ExternalResource.h"
27 28
28static const int SCREENSHARE_INFO_REQUEST_RETRY_TIMEOUT_MS = 300;29static const int SCREENSHARE_INFO_REQUEST_RETRY_TIMEOUT_MS = 300;
29ScreenshareScriptingInterface::ScreenshareScriptingInterface() {30ScreenshareScriptingInterface::ScreenshareScriptingInterface() {
@@ -109,7 +110,7 @@ void ScreenshareScriptingInterface::requestScreenshareInfo() { · 79 unmodified lines
109 // See `DomainServer::screensharePresence()` for more info about that.110 // See `DomainServer::screensharePresence()` for more info about that.
110 111
111 QString currentDomainID = uuidStringWithoutCurlyBraces(addressManager->getDomainID());112 QString currentDomainID = uuidStringWithoutCurlyBraces(addressManager->getDomainID());
112 QString requestURLPath = "api/v1/domains/%1/screenshare";113 QString requestURLPath = "/api/v1/domains/%1/screenshare";
113 JSONCallbackParameters callbackParams;114 JSONCallbackParameters callbackParams;
114 callbackParams.callbackReceiver = this;115 callbackParams.callbackReceiver = this;
115 callbackParams.jsonCallbackMethod = "handleSuccessfulScreenshareInfoGet";116 callbackParams.jsonCallbackMethod = "handleSuccessfulScreenshareInfoGet";
@@ -129,8 +130,8 @@ static const uint8_t LOCAL_SCREENSHARE_WEB_ENTITY_FPS = 30; · 13 unmodified lines
129// The `z` value here is dynamic.130// The `z` value here is dynamic.
130static 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);
131static 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);
132static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL =133static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content,
133 NetworkingConstants::CONTENT_CDN_URL + "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html";134 "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html");
134static const QString LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE = "local";135static const QString LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE = "local";
135void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZoneID,136void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZoneID,
136 const QUuid& smartboardEntityID,137 const QUuid& smartboardEntityID,