History

Prototype for moving content away from hifi infrastructure

Dale Glass committed 6 years ago

Commit c65cc951 parent 68cefda5 files · +213 −4Browse files

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

Unified · Split

interface/src/scripting/ScreenshareScriptingInterface.cpp+3−2
@@ -23,6 +23,7 @@ · 22 unmodified lines
23 23
24#include "EntityScriptingInterface.h"24#include "EntityScriptingInterface.h"
25#include "ScreenshareScriptingInterface.h"25#include "ScreenshareScriptingInterface.h"
26#include "ExternalResource.h"
26 27
27static const int SCREENSHARE_INFO_REQUEST_RETRY_TIMEOUT_MS = 300;28static const int SCREENSHARE_INFO_REQUEST_RETRY_TIMEOUT_MS = 300;
28ScreenshareScriptingInterface::ScreenshareScriptingInterface() {29ScreenshareScriptingInterface::ScreenshareScriptingInterface() {
@@ -128,8 +129,8 @@ static const uint8_t LOCAL_SCREENSHARE_WEB_ENTITY_FPS = 30; · 99 unmodified lines
128// The `z` value here is dynamic.129// The `z` value here is dynamic.
129static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION(0.0128f, -0.0918f, 0.0f);130static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION(0.0128f, -0.0918f, 0.0f);
130static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS(3.6790f, 2.0990f, 0.0100f);131static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS(3.6790f, 2.0990f, 0.0100f);
131static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL =132static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::Content,
132 "https://content.highfidelity.com/Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html";133 "Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html");
133static const QString LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE = "local";134static const QString LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE = "local";
134void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZoneID,135void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZoneID,
135 const QUuid& smartboardEntityID,136 const QUuid& smartboardEntityID,