mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-04-05 17:29:18 +02:00
Remove hifi-screenshare
Cherry picked and updated from Tivoli dd5b6ea6ee5597a06603e16509640e7ed18106bb Co-authored-by: Julian Groß <julian.g@posteo.de>
This commit is contained in:
Maki
HifiExperiments
parent
e7f7314b37
commit
5e35f76668
29 changed files with 28 additions and 3341 deletions
|
|
@ -256,12 +256,6 @@ else()
|
||||||
set(MOBILE 0)
|
set(MOBILE 0)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(SCREENSHARE 0)
|
|
||||||
if (APPLE AND NOT CLIENT_ONLY)
|
|
||||||
# Don't include Screenshare in OSX client-only builds.
|
|
||||||
set(SCREENSHARE 1)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Use default time server if none defined in environment
|
# Use default time server if none defined in environment
|
||||||
set_from_env(TIMESERVER_URL TIMESERVER_URL "http://timestamp.comodoca.com?td=sha256")
|
set_from_env(TIMESERVER_URL TIMESERVER_URL "http://timestamp.comodoca.com?td=sha256")
|
||||||
|
|
||||||
|
|
@ -462,10 +456,6 @@ if (BUILD_GPU_FRAME_PLAYER_ONLY)
|
||||||
add_subdirectory(tools/gpu-frame-player)
|
add_subdirectory(tools/gpu-frame-player)
|
||||||
else()
|
else()
|
||||||
|
|
||||||
if (SCREENSHARE)
|
|
||||||
add_subdirectory(screenshare)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway
|
# BUILD_TOOLS option will be handled inside the tools's CMakeLists.txt because 'scribe' tool is required for build anyway
|
||||||
add_subdirectory(tools)
|
add_subdirectory(tools)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,10 +90,7 @@ using std::static_pointer_cast;
|
||||||
struct FindContainingZone {
|
struct FindContainingZone {
|
||||||
glm::vec3 position;
|
glm::vec3 position;
|
||||||
bool isInPriorityZone { false };
|
bool isInPriorityZone { false };
|
||||||
bool isInScreenshareZone { false };
|
|
||||||
float priorityZoneVolume { std::numeric_limits<float>::max() };
|
float priorityZoneVolume { std::numeric_limits<float>::max() };
|
||||||
float screenshareZoneVolume { priorityZoneVolume };
|
|
||||||
EntityItemID screenshareZoneid{};
|
|
||||||
|
|
||||||
static bool operation(const OctreeElementPointer& element, void* extraData) {
|
static bool operation(const OctreeElementPointer& element, void* extraData) {
|
||||||
auto findContainingZone = static_cast<FindContainingZone*>(extraData);
|
auto findContainingZone = static_cast<FindContainingZone*>(extraData);
|
||||||
|
|
@ -103,19 +100,12 @@ struct FindContainingZone {
|
||||||
if (item->getType() == EntityTypes::Zone && item->contains(findContainingZone->position)) {
|
if (item->getType() == EntityTypes::Zone && item->contains(findContainingZone->position)) {
|
||||||
auto zoneItem = static_pointer_cast<ZoneEntityItem>(item);
|
auto zoneItem = static_pointer_cast<ZoneEntityItem>(item);
|
||||||
auto avatarPriorityProperty = zoneItem->getAvatarPriority();
|
auto avatarPriorityProperty = zoneItem->getAvatarPriority();
|
||||||
auto screenshareProperty = zoneItem->getScreenshare();
|
|
||||||
float volume = zoneItem->getVolumeEstimate();
|
float volume = zoneItem->getVolumeEstimate();
|
||||||
if (avatarPriorityProperty != COMPONENT_MODE_INHERIT
|
if (avatarPriorityProperty != COMPONENT_MODE_INHERIT
|
||||||
&& volume < findContainingZone->priorityZoneVolume) { // Smaller volume wins
|
&& volume < findContainingZone->priorityZoneVolume) { // Smaller volume wins
|
||||||
findContainingZone->isInPriorityZone = avatarPriorityProperty == COMPONENT_MODE_ENABLED;
|
findContainingZone->isInPriorityZone = avatarPriorityProperty == COMPONENT_MODE_ENABLED;
|
||||||
findContainingZone->priorityZoneVolume = volume;
|
findContainingZone->priorityZoneVolume = volume;
|
||||||
}
|
}
|
||||||
if (screenshareProperty != COMPONENT_MODE_INHERIT
|
|
||||||
&& volume < findContainingZone->screenshareZoneVolume) {
|
|
||||||
findContainingZone->isInScreenshareZone = screenshareProperty == COMPONENT_MODE_ENABLED;
|
|
||||||
findContainingZone->screenshareZoneVolume = volume;
|
|
||||||
findContainingZone->screenshareZoneid = zoneItem->getEntityItemID();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return true; // Keep recursing
|
return true; // Keep recursing
|
||||||
|
|
@ -157,18 +147,6 @@ int AvatarMixerClientData::parseData(ReceivedMessage& message, const WorkerShare
|
||||||
if (currentlyHasPriority != _avatar->getHasPriority()) {
|
if (currentlyHasPriority != _avatar->getHasPriority()) {
|
||||||
_avatar->setHasPriority(currentlyHasPriority);
|
_avatar->setHasPriority(currentlyHasPriority);
|
||||||
}
|
}
|
||||||
bool isInScreenshareZone = findContainingZone.isInScreenshareZone;
|
|
||||||
if (isInScreenshareZone != _avatar->isInScreenshareZone()
|
|
||||||
|| findContainingZone.screenshareZoneid != _avatar->getScreenshareZone()) {
|
|
||||||
_avatar->setInScreenshareZone(isInScreenshareZone);
|
|
||||||
_avatar->setScreenshareZone(findContainingZone.screenshareZoneid);
|
|
||||||
const QUuid& zoneId = isInScreenshareZone ? findContainingZone.screenshareZoneid : QUuid();
|
|
||||||
auto nodeList = DependencyManager::get<NodeList>();
|
|
||||||
auto packet = NLPacket::create(PacketType::AvatarZonePresence, 2 * NUM_BYTES_RFC4122_UUID, true);
|
|
||||||
packet->write(_avatar->getSessionUUID().toRfc4122());
|
|
||||||
packet->write(zoneId.toRfc4122());
|
|
||||||
nodeList->sendPacket(std::move(packet), nodeList->getDomainSockAddr());
|
|
||||||
}
|
|
||||||
_avatar->setNeedsHeroCheck(false);
|
_avatar->setNeedsHeroCheck(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,16 +29,37 @@ public:
|
||||||
bool needsIdentityUpdate() const { return _needsIdentityUpdate; }
|
bool needsIdentityUpdate() const { return _needsIdentityUpdate; }
|
||||||
void setNeedsIdentityUpdate(bool value = true) { _needsIdentityUpdate = value; }
|
void setNeedsIdentityUpdate(bool value = true) { _needsIdentityUpdate = value; }
|
||||||
|
|
||||||
bool isInScreenshareZone() const { return _inScreenshareZone; }
|
void processCertifyEvents();
|
||||||
void setInScreenshareZone(bool value = true) { _inScreenshareZone = value; }
|
void processChallengeResponse(ReceivedMessage& response);
|
||||||
const QUuid& getScreenshareZone() const { return _screenshareZone; }
|
|
||||||
void setScreenshareZone(QUuid zone) { _screenshareZone = zone; }
|
void stopChallengeTimer();
|
||||||
|
|
||||||
|
// Avatar certification/verification:
|
||||||
|
enum VerifyState {
|
||||||
|
nonCertified, requestingFST, receivedFST, staticValidation, requestingOwner, ownerResponse,
|
||||||
|
challengeClient, verified, verificationFailed, verificationSucceeded, error
|
||||||
|
};
|
||||||
|
Q_ENUM(VerifyState)
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool _needsHeroCheck { false };
|
bool _needsHeroCheck { false };
|
||||||
bool _needsIdentityUpdate { false };
|
bool _needsIdentityUpdate { false };
|
||||||
bool _inScreenshareZone { false };
|
|
||||||
QUuid _screenshareZone;
|
bool generateFSTHash();
|
||||||
|
bool validateFSTHash(const QString& publicKey) const;
|
||||||
|
QByteArray canonicalJson(const QString fstFile);
|
||||||
|
void requestCurrentOwnership();
|
||||||
|
void sendOwnerChallenge();
|
||||||
|
|
||||||
|
static const QString VERIFY_FAIL_MODEL;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void fstRequestComplete();
|
||||||
|
void ownerRequestComplete();
|
||||||
|
void challengeTimeout();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void startChallengeTimer();
|
||||||
};
|
};
|
||||||
|
|
||||||
using MixerAvatarSharedPointer = std::shared_ptr<MixerAvatar>;
|
using MixerAvatarSharedPointer = std::shared_ptr<MixerAvatar>;
|
||||||
|
|
|
||||||
|
|
@ -133,7 +133,6 @@ macro(SET_PACKAGING_PARAMETERS)
|
||||||
|
|
||||||
set(CONSOLE_INSTALL_DIR ".")
|
set(CONSOLE_INSTALL_DIR ".")
|
||||||
set(INTERFACE_INSTALL_DIR ".")
|
set(INTERFACE_INSTALL_DIR ".")
|
||||||
set(SCREENSHARE_INSTALL_DIR ".")
|
|
||||||
set(NITPICK_INSTALL_DIR ".")
|
set(NITPICK_INSTALL_DIR ".")
|
||||||
|
|
||||||
if (CLIENT_ONLY)
|
if (CLIENT_ONLY)
|
||||||
|
|
@ -143,27 +142,20 @@ macro(SET_PACKAGING_PARAMETERS)
|
||||||
endif()
|
endif()
|
||||||
set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}")
|
set(CONSOLE_INSTALL_APP_PATH "${CONSOLE_INSTALL_DIR}/${CONSOLE_EXEC_NAME}")
|
||||||
|
|
||||||
set(SCREENSHARE_EXEC_NAME "hifi-screenshare.app")
|
|
||||||
set(SCREENSHARE_INSTALL_APP_PATH "${SCREENSHARE_INSTALL_DIR}/${SCREENSHARE_EXEC_NAME}")
|
|
||||||
|
|
||||||
set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")
|
set(CONSOLE_APP_CONTENTS "${CONSOLE_INSTALL_APP_PATH}/Contents")
|
||||||
set(COMPONENT_APP_PATH "${CONSOLE_APP_CONTENTS}/MacOS/Components.app")
|
set(COMPONENT_APP_PATH "${CONSOLE_APP_CONTENTS}/MacOS/Components.app")
|
||||||
set(COMPONENT_INSTALL_DIR "${COMPONENT_APP_PATH}/Contents/MacOS")
|
set(COMPONENT_INSTALL_DIR "${COMPONENT_APP_PATH}/Contents/MacOS")
|
||||||
set(CONSOLE_PLUGIN_INSTALL_DIR "${COMPONENT_APP_PATH}/Contents/PlugIns")
|
set(CONSOLE_PLUGIN_INSTALL_DIR "${COMPONENT_APP_PATH}/Contents/PlugIns")
|
||||||
|
|
||||||
set(SCREENSHARE_APP_CONTENTS "${SCREENSHARE_INSTALL_APP_PATH}/Contents")
|
|
||||||
|
|
||||||
set(INTERFACE_INSTALL_APP_PATH "${INTERFACE_INSTALL_DIR}/${INTERFACE_BUNDLE_NAME}.app")
|
set(INTERFACE_INSTALL_APP_PATH "${INTERFACE_INSTALL_DIR}/${INTERFACE_BUNDLE_NAME}.app")
|
||||||
set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns")
|
set(INTERFACE_ICON_FILENAME "${INTERFACE_ICON_PREFIX}.icns")
|
||||||
set(NITPICK_ICON_FILENAME "${NITPICK_ICON_PREFIX}.icns")
|
set(NITPICK_ICON_FILENAME "${NITPICK_ICON_PREFIX}.icns")
|
||||||
else ()
|
else ()
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(CONSOLE_INSTALL_DIR "server-console")
|
set(CONSOLE_INSTALL_DIR "server-console")
|
||||||
set(SCREENSHARE_INSTALL_DIR "hifi-screenshare")
|
|
||||||
set(NITPICK_INSTALL_DIR "nitpick")
|
set(NITPICK_INSTALL_DIR "nitpick")
|
||||||
else ()
|
else ()
|
||||||
set(CONSOLE_INSTALL_DIR ".")
|
set(CONSOLE_INSTALL_DIR ".")
|
||||||
set(SCREENSHARE_INSTALL_DIR ".")
|
|
||||||
set(NITPICK_INSTALL_DIR ".")
|
set(NITPICK_INSTALL_DIR ".")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|
@ -177,7 +169,6 @@ macro(SET_PACKAGING_PARAMETERS)
|
||||||
set(NITPICK_ICON_FILENAME "${NITPICK_ICON_PREFIX}.ico")
|
set(NITPICK_ICON_FILENAME "${NITPICK_ICON_PREFIX}.ico")
|
||||||
|
|
||||||
set(CONSOLE_EXEC_NAME "server-console.exe")
|
set(CONSOLE_EXEC_NAME "server-console.exe")
|
||||||
set(SCREENSHARE_EXEC_NAME "hifi-screenshare.exe")
|
|
||||||
|
|
||||||
set(DS_EXEC_NAME "domain-server.exe")
|
set(DS_EXEC_NAME "domain-server.exe")
|
||||||
set(AC_EXEC_NAME "assignment-client.exe")
|
set(AC_EXEC_NAME "assignment-client.exe")
|
||||||
|
|
|
||||||
|
|
@ -3813,72 +3813,4 @@ void DomainServer::processAvatarZonePresencePacket(QSharedPointer<ReceivedMessag
|
||||||
qCWarning(domain_server) << "Ignoring null avatar presence";
|
qCWarning(domain_server) << "Ignoring null avatar presence";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
static const int SCREENSHARE_EXPIRATION_SECONDS = 24 * 60 * 60;
|
|
||||||
screensharePresence(zoneID.isNull() ? "" : zoneID.toString(), avatarID, SCREENSHARE_EXPIRATION_SECONDS);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DomainServer::screensharePresence(QString roomname, QUuid avatarID, int expirationSeconds) {
|
|
||||||
if (!DependencyManager::get<AccountManager>()->hasValidAccessToken()) {
|
|
||||||
static std::once_flag presenceAuthorityWarning;
|
|
||||||
std::call_once(presenceAuthorityWarning, [] {
|
|
||||||
qCDebug(domain_server) << "No authority to send screensharePresence.";
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
|
|
||||||
auto matchingNode = limitedNodeList->nodeWithUUID(avatarID);
|
|
||||||
if (!matchingNode) {
|
|
||||||
qCWarning(domain_server) << "Ignoring avatar presence for unknown avatar ID" << avatarID;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
QString verifiedUsername = matchingNode->getPermissions().getVerifiedUserName();
|
|
||||||
if (verifiedUsername.isEmpty()) { // Silently bail for users who are not logged in.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
JSONCallbackParameters callbackParams;
|
|
||||||
callbackParams.callbackReceiver = this;
|
|
||||||
callbackParams.jsonCallbackMethod = "handleSuccessfulScreensharePresence";
|
|
||||||
callbackParams.errorCallbackMethod = "handleFailedScreensharePresence";
|
|
||||||
// Construct `callbackData`, which is data that will be available to the callback functions.
|
|
||||||
// In this case, the "success" callback needs access to the "roomname" (the zone ID) and the
|
|
||||||
// relevant avatar's UUID.
|
|
||||||
QJsonObject callbackData;
|
|
||||||
callbackData.insert("roomname", roomname);
|
|
||||||
callbackData.insert("avatarID", avatarID.toString());
|
|
||||||
callbackParams.callbackData = callbackData;
|
|
||||||
const QString PATH = "/api/v1/domains/%1/screenshare";
|
|
||||||
QString domain_id = uuidStringWithoutCurlyBraces(getID());
|
|
||||||
QJsonObject json, screenshare;
|
|
||||||
screenshare["username"] = verifiedUsername;
|
|
||||||
screenshare["roomname"] = roomname;
|
|
||||||
if (expirationSeconds > 0) {
|
|
||||||
screenshare["expiration"] = expirationSeconds;
|
|
||||||
}
|
|
||||||
json["screenshare"] = screenshare;
|
|
||||||
DependencyManager::get<AccountManager>()->sendRequest(
|
|
||||||
PATH.arg(domain_id),
|
|
||||||
AccountManagerAuth::Required,
|
|
||||||
QNetworkAccessManager::PostOperation,
|
|
||||||
callbackParams, QJsonDocument(json).toJson()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DomainServer::handleSuccessfulScreensharePresence(QNetworkReply* requestReply, QJsonObject callbackData) {
|
|
||||||
QJsonObject jsonObject = QJsonDocument::fromJson(requestReply->readAll()).object();
|
|
||||||
if (jsonObject["status"].toString() != "success") {
|
|
||||||
qCWarning(domain_server) << "screensharePresence api call failed:" << QJsonDocument(jsonObject).toJson(QJsonDocument::Compact);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Tell the client that we just authorized to screenshare which zone ID in which they are authorized to screenshare.
|
|
||||||
auto nodeList = DependencyManager::get<LimitedNodeList>();
|
|
||||||
auto packet = NLPacket::create(PacketType::AvatarZonePresence, NUM_BYTES_RFC4122_UUID, true);
|
|
||||||
packet->write(QUuid(callbackData["roomname"].toString()).toRfc4122());
|
|
||||||
nodeList->sendPacket(std::move(packet), *(nodeList->nodeWithUUID(QUuid(callbackData["avatarID"].toString()))));
|
|
||||||
}
|
|
||||||
|
|
||||||
void DomainServer::handleFailedScreensharePresence(QNetworkReply* requestReply) {
|
|
||||||
qCWarning(domain_server) << "screensharePresence api call failed:" << requestReply->error();
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -81,8 +81,6 @@ public:
|
||||||
|
|
||||||
bool isAssetServerEnabled();
|
bool isAssetServerEnabled();
|
||||||
|
|
||||||
void screensharePresence(QString roomname, QUuid avatarID, int expiration_seconds = 0);
|
|
||||||
|
|
||||||
static bool forceCrashReporting() { return _forceCrashReporting; }
|
static bool forceCrashReporting() { return _forceCrashReporting; }
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|
@ -132,9 +130,6 @@ private slots:
|
||||||
void handleSuccessfulICEServerAddressUpdate(QNetworkReply* requestReply);
|
void handleSuccessfulICEServerAddressUpdate(QNetworkReply* requestReply);
|
||||||
void handleFailedICEServerAddressUpdate(QNetworkReply* requestReply);
|
void handleFailedICEServerAddressUpdate(QNetworkReply* requestReply);
|
||||||
|
|
||||||
void handleSuccessfulScreensharePresence(QNetworkReply* requestReply, QJsonObject callbackData);
|
|
||||||
void handleFailedScreensharePresence(QNetworkReply* requestReply);
|
|
||||||
|
|
||||||
void updateReplicatedNodes();
|
void updateReplicatedNodes();
|
||||||
void updateDownstreamNodes();
|
void updateDownstreamNodes();
|
||||||
void updateUpstreamNodes();
|
void updateUpstreamNodes();
|
||||||
|
|
|
||||||
|
|
@ -193,9 +193,6 @@ if (NOT ANDROID)
|
||||||
add_dependencies(${TARGET_NAME} resources)
|
add_dependencies(${TARGET_NAME} resources)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (SCREENSHARE)
|
|
||||||
add_dependencies(${TARGET_NAME} screenshare)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
# These are external plugins, but we need to do the 'add dependency' here so that their
|
# These are external plugins, but we need to do the 'add dependency' here so that their
|
||||||
|
|
@ -360,15 +357,6 @@ if (APPLE)
|
||||||
"${RESOURCES_DEV_DIR}/serverless/redirect.json"
|
"${RESOURCES_DEV_DIR}/serverless/redirect.json"
|
||||||
)
|
)
|
||||||
|
|
||||||
if (SCREENSHARE)
|
|
||||||
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
|
|
||||||
# copy screenshare app to the resource folder
|
|
||||||
COMMAND "${CMAKE_COMMAND}" -E copy_directory
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/../screenshare/hifi-screenshare-darwin-x64/hifi-screenshare.app"
|
|
||||||
"${RESOURCES_DEV_DIR}/hifi-screenshare.app"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (JSDOC_ENABLED)
|
if (JSDOC_ENABLED)
|
||||||
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
|
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
|
||||||
# copy JSDoc files beside the executable
|
# copy JSDoc files beside the executable
|
||||||
|
|
|
||||||
|
|
@ -192,7 +192,6 @@
|
||||||
#include "scripting/AssetMappingsScriptingInterface.h"
|
#include "scripting/AssetMappingsScriptingInterface.h"
|
||||||
#include "scripting/ClipboardScriptingInterface.h"
|
#include "scripting/ClipboardScriptingInterface.h"
|
||||||
#include "scripting/DesktopScriptingInterface.h"
|
#include "scripting/DesktopScriptingInterface.h"
|
||||||
#include "scripting/ScreenshareScriptingInterface.h"
|
|
||||||
#include "scripting/AccountServicesScriptingInterface.h"
|
#include "scripting/AccountServicesScriptingInterface.h"
|
||||||
#include "scripting/HMDScriptingInterface.h"
|
#include "scripting/HMDScriptingInterface.h"
|
||||||
#include "scripting/MenuScriptingInterface.h"
|
#include "scripting/MenuScriptingInterface.h"
|
||||||
|
|
@ -922,7 +921,6 @@ bool setupEssentials(const QCommandLineParser& parser, bool runningMarkerExisted
|
||||||
DependencyManager::set<KeyboardScriptingInterface>();
|
DependencyManager::set<KeyboardScriptingInterface>();
|
||||||
DependencyManager::set<GrabManager>();
|
DependencyManager::set<GrabManager>();
|
||||||
DependencyManager::set<AvatarPackager>();
|
DependencyManager::set<AvatarPackager>();
|
||||||
DependencyManager::set<ScreenshareScriptingInterface>();
|
|
||||||
PlatformHelper::setup();
|
PlatformHelper::setup();
|
||||||
|
|
||||||
QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] {
|
QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] {
|
||||||
|
|
@ -3018,7 +3016,6 @@ Application::~Application() {
|
||||||
DependencyManager::destroy<SoundCache>();
|
DependencyManager::destroy<SoundCache>();
|
||||||
DependencyManager::destroy<OctreeStatsProvider>();
|
DependencyManager::destroy<OctreeStatsProvider>();
|
||||||
DependencyManager::destroy<GeometryCache>();
|
DependencyManager::destroy<GeometryCache>();
|
||||||
DependencyManager::destroy<ScreenshareScriptingInterface>();
|
|
||||||
|
|
||||||
if (auto resourceManager = DependencyManager::get<ResourceManager>()) {
|
if (auto resourceManager = DependencyManager::get<ResourceManager>()) {
|
||||||
resourceManager->cleanup();
|
resourceManager->cleanup();
|
||||||
|
|
@ -3519,7 +3516,6 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
|
||||||
surfaceContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
|
surfaceContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
|
||||||
|
|
||||||
surfaceContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
|
surfaceContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
|
||||||
surfaceContext->setContextProperty("Screenshare", DependencyManager::get<ScreenshareScriptingInterface>().data());
|
|
||||||
surfaceContext->setContextProperty("Camera", &_myCamera);
|
surfaceContext->setContextProperty("Camera", &_myCamera);
|
||||||
|
|
||||||
#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
|
#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
|
||||||
|
|
@ -3625,7 +3621,6 @@ void Application::userKickConfirmation(const QUuid& nodeID, unsigned int banFlag
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditionalContextProperties) {
|
void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditionalContextProperties) {
|
||||||
surfaceContext->setContextProperty("Screenshare", DependencyManager::get<ScreenshareScriptingInterface>().data());
|
|
||||||
surfaceContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
|
surfaceContext->setContextProperty("Users", DependencyManager::get<UsersScriptingInterface>().data());
|
||||||
surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
|
surfaceContext->setContextProperty("HMD", DependencyManager::get<HMDScriptingInterface>().data());
|
||||||
surfaceContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
|
surfaceContext->setContextProperty("UserActivityLogger", DependencyManager::get<UserActivityLoggerScriptingInterface>().data());
|
||||||
|
|
@ -7554,7 +7549,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptManagerPoint
|
||||||
scriptEngine->registerGlobalObject("AvatarList", DependencyManager::get<AvatarManager>().data());
|
scriptEngine->registerGlobalObject("AvatarList", DependencyManager::get<AvatarManager>().data());
|
||||||
|
|
||||||
scriptEngine->registerGlobalObject("Camera", &_myCamera);
|
scriptEngine->registerGlobalObject("Camera", &_myCamera);
|
||||||
scriptEngine->registerGlobalObject("Screenshare", DependencyManager::get<ScreenshareScriptingInterface>().data());
|
|
||||||
|
|
||||||
#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
|
#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
|
||||||
scriptEngine->registerGlobalObject("SpeechRecognizer", DependencyManager::get<SpeechRecognizer>().data());
|
scriptEngine->registerGlobalObject("SpeechRecognizer", DependencyManager::get<SpeechRecognizer>().data());
|
||||||
|
|
|
||||||
|
|
@ -1,354 +0,0 @@
|
||||||
//
|
|
||||||
// ScreenshareScriptingInterface.cpp
|
|
||||||
// interface/src/scripting/
|
|
||||||
//
|
|
||||||
// Created by Milad Nazeri and Zach Fox on 2019-10-23.
|
|
||||||
// Copyright 2019 High Fidelity, Inc.
|
|
||||||
//
|
|
||||||
// Distributed under the Apache License, Version 2.0.
|
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
||||||
//
|
|
||||||
|
|
||||||
#include <QJsonDocument>
|
|
||||||
#include <QJsonObject>
|
|
||||||
#include <QNetworkAccessManager>
|
|
||||||
#include <QThread>
|
|
||||||
#include <QUrl>
|
|
||||||
|
|
||||||
#include <AccountManager.h>
|
|
||||||
#include <AddressManager.h>
|
|
||||||
#include <DependencyManager.h>
|
|
||||||
#include <NetworkingConstants.h>
|
|
||||||
#include <NodeList.h>
|
|
||||||
#include <UUID.h>
|
|
||||||
|
|
||||||
#include "EntityScriptingInterface.h"
|
|
||||||
#include "ScreenshareScriptingInterface.h"
|
|
||||||
#include "ExternalResource.h"
|
|
||||||
|
|
||||||
static const int SCREENSHARE_INFO_REQUEST_RETRY_TIMEOUT_MS = 300;
|
|
||||||
ScreenshareScriptingInterface::ScreenshareScriptingInterface() {
|
|
||||||
auto esi = DependencyManager::get<EntityScriptingInterface>();
|
|
||||||
if (!esi) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This signal/slot connection is used when the screen share local web entity sends an event bridge message.
|
|
||||||
QObject::connect(esi.data(), &EntityScriptingInterface::webEventReceived, this, &ScreenshareScriptingInterface::onWebEventReceived);
|
|
||||||
|
|
||||||
_requestScreenshareInfoRetryTimer = new QTimer;
|
|
||||||
_requestScreenshareInfoRetryTimer->setSingleShot(true);
|
|
||||||
_requestScreenshareInfoRetryTimer->setInterval(SCREENSHARE_INFO_REQUEST_RETRY_TIMEOUT_MS);
|
|
||||||
connect(_requestScreenshareInfoRetryTimer, &QTimer::timeout, this, &ScreenshareScriptingInterface::requestScreenshareInfo);
|
|
||||||
|
|
||||||
// This packet listener handles the packet containing information about the latest zone ID in which we are allowed to share.
|
|
||||||
auto nodeList = DependencyManager::get<NodeList>();
|
|
||||||
PacketReceiver& packetReceiver = nodeList->getPacketReceiver();
|
|
||||||
packetReceiver.registerListener(PacketType::AvatarZonePresence,
|
|
||||||
PacketReceiver::makeUnsourcedListenerReference<ScreenshareScriptingInterface>(this, &ScreenshareScriptingInterface::processAvatarZonePresencePacketOnClient));
|
|
||||||
};
|
|
||||||
|
|
||||||
ScreenshareScriptingInterface::~ScreenshareScriptingInterface() {
|
|
||||||
stopScreenshare();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenshareScriptingInterface::processAvatarZonePresencePacketOnClient(QSharedPointer<ReceivedMessage> message) {
|
|
||||||
QUuid zone = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
|
|
||||||
|
|
||||||
if (zone.isNull()) {
|
|
||||||
qWarning() << "Ignoring avatar zone presence packet that doesn't specify a zone.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set the last known authorized screenshare zone ID to the zone that the Domain Server just told us about.
|
|
||||||
_lastAuthorizedZoneID = zone;
|
|
||||||
|
|
||||||
// If we had previously started the screenshare process but knew that we weren't going to be authorized to screenshare,
|
|
||||||
// let's continue the screenshare process here.
|
|
||||||
if (_waitingForAuthorization) {
|
|
||||||
requestScreenshareInfo();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static const int MAX_NUM_SCREENSHARE_INFO_REQUEST_RETRIES = 5;
|
|
||||||
void ScreenshareScriptingInterface::requestScreenshareInfo() {
|
|
||||||
// If the screenshare zone that we're currently in (i.e. `startScreenshare()` was called) is different from
|
|
||||||
// the zone in which we are authorized to screenshare...
|
|
||||||
// ...return early here and wait for the DS to send us a packet containing this zone's ID.
|
|
||||||
if (_screenshareZoneID != _lastAuthorizedZoneID) {
|
|
||||||
qDebug() << "Client not yet authorized to screenshare. Waiting for authorization message from domain server...";
|
|
||||||
_waitingForAuthorization = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_waitingForAuthorization = false;
|
|
||||||
|
|
||||||
_requestScreenshareInfoRetries++;
|
|
||||||
|
|
||||||
if (_requestScreenshareInfoRetries >= MAX_NUM_SCREENSHARE_INFO_REQUEST_RETRIES) {
|
|
||||||
qDebug() << "Maximum number of retries for screenshare info exceeded. Screenshare will not function.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Don't continue with any more of this logic if we can't get the `AccountManager` or `AddressManager`.
|
|
||||||
auto accountManager = DependencyManager::get<AccountManager>();
|
|
||||||
if (!accountManager) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
auto addressManager = DependencyManager::get<AddressManager>();
|
|
||||||
if (!addressManager) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Construct and send a request to the Metaverse to obtain the information
|
|
||||||
// necessary to start the screen sharing process.
|
|
||||||
// This request requires:
|
|
||||||
// 1. The domain ID of the domain in which the user's avatar is present
|
|
||||||
// 2. User authentication information that is automatically included when `sendRequest()` is passed
|
|
||||||
// with the `AccountManagerAuth::Required` argument.
|
|
||||||
// Note that this request will only return successfully if the Domain Server has already registered
|
|
||||||
// the user paired with the current domain with the Metaverse.
|
|
||||||
// See `DomainServer::screensharePresence()` for more info about that.
|
|
||||||
|
|
||||||
QString currentDomainID = uuidStringWithoutCurlyBraces(addressManager->getDomainID());
|
|
||||||
QString requestURLPath = "/api/v1/domains/%1/screenshare";
|
|
||||||
JSONCallbackParameters callbackParams;
|
|
||||||
callbackParams.callbackReceiver = this;
|
|
||||||
callbackParams.jsonCallbackMethod = "handleSuccessfulScreenshareInfoGet";
|
|
||||||
callbackParams.errorCallbackMethod = "handleFailedScreenshareInfoGet";
|
|
||||||
accountManager->sendRequest(
|
|
||||||
requestURLPath.arg(currentDomainID),
|
|
||||||
AccountManagerAuth::Required,
|
|
||||||
QNetworkAccessManager::GetOperation,
|
|
||||||
callbackParams
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const EntityTypes::EntityType LOCAL_SCREENSHARE_WEB_ENTITY_TYPE = EntityTypes::Web;
|
|
||||||
static const uint8_t LOCAL_SCREENSHARE_WEB_ENTITY_FPS = 30;
|
|
||||||
// This is going to be a good amount of work to make this work dynamically for any screensize.
|
|
||||||
// V1 will have only hardcoded values.
|
|
||||||
// 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 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,
|
|
||||||
const bool& isPresenter) {
|
|
||||||
// We must start a new QProcess from the main thread.
|
|
||||||
if (QThread::currentThread() != thread()) {
|
|
||||||
QMetaObject::invokeMethod(this, "startScreenshare", Q_ARG(const QUuid&, screenshareZoneID),
|
|
||||||
Q_ARG(const QUuid&, smartboardEntityID), Q_ARG(const bool&, isPresenter));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// These three private member variables are set now so that they may be used later during asynchronous
|
|
||||||
// callbacks.
|
|
||||||
_screenshareZoneID = screenshareZoneID;
|
|
||||||
_smartboardEntityID = smartboardEntityID;
|
|
||||||
_isPresenter = isPresenter;
|
|
||||||
|
|
||||||
// If we are presenting, and the screenshare process is already running, don't do anything else here.
|
|
||||||
if (_isPresenter && _screenshareProcess && _screenshareProcess->state() != QProcess::NotRunning) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we're presenting...
|
|
||||||
if (_isPresenter) {
|
|
||||||
// ...make sure we first reset this `std::unique_ptr`.
|
|
||||||
_screenshareProcess.reset(new QProcess(this));
|
|
||||||
|
|
||||||
// Ensure that the screenshare executable exists where we expect it to.
|
|
||||||
// Error out and reset the screen share state machine if the executable doesn't exist.
|
|
||||||
QFileInfo screenshareExecutable(SCREENSHARE_EXE_PATH);
|
|
||||||
if (!screenshareExecutable.exists() || !(screenshareExecutable.isFile() || screenshareExecutable.isBundle())) {
|
|
||||||
qDebug() << "Screenshare executable doesn't exist at" << SCREENSHARE_EXE_PATH;
|
|
||||||
stopScreenshare();
|
|
||||||
emit screenshareError();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_requestScreenshareInfoRetryTimer && _requestScreenshareInfoRetryTimer->isActive()) {
|
|
||||||
_requestScreenshareInfoRetryTimer->stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
_requestScreenshareInfoRetries = 0;
|
|
||||||
requestScreenshareInfo();
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenshareScriptingInterface::stopScreenshare() {
|
|
||||||
// We can only deal with our Screen Share `QProcess` on the main thread.
|
|
||||||
if (QThread::currentThread() != thread()) {
|
|
||||||
QMetaObject::invokeMethod(this, "stopScreenshare");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the retry timer is active, stop it.
|
|
||||||
if (_requestScreenshareInfoRetryTimer && _requestScreenshareInfoRetryTimer->isActive()) {
|
|
||||||
_requestScreenshareInfoRetryTimer->stop();
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the Screen Share process is running...
|
|
||||||
if (_screenshareProcess && _screenshareProcess->state() != QProcess::NotRunning) {
|
|
||||||
//...terminate it and make sure that scripts know we terminated it by emitting
|
|
||||||
// `screenshareProcessTerminated()`.
|
|
||||||
_screenshareProcess->terminate();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Delete the local web entity if we know about it here.
|
|
||||||
if (!_screenshareViewerLocalWebEntityUUID.isNull()) {
|
|
||||||
auto esi = DependencyManager::get<EntityScriptingInterface>();
|
|
||||||
if (esi) {
|
|
||||||
esi->deleteEntity(_screenshareViewerLocalWebEntityUUID);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset all private member variables related to screen share here.
|
|
||||||
_screenshareViewerLocalWebEntityUUID = "{00000000-0000-0000-0000-000000000000}";
|
|
||||||
_token = "";
|
|
||||||
_projectAPIKey = "";
|
|
||||||
_sessionID = "";
|
|
||||||
_isPresenter = false;
|
|
||||||
_waitingForAuthorization = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Called when the Metaverse returns the information necessary to start/view a screen share.
|
|
||||||
void ScreenshareScriptingInterface::handleSuccessfulScreenshareInfoGet(QNetworkReply* reply) {
|
|
||||||
// Read the reply and get it into a format we understand.
|
|
||||||
QString answer = reply->readAll();
|
|
||||||
QByteArray answerByteArray = answer.toUtf8();
|
|
||||||
QJsonDocument answerJSONObject = QJsonDocument::fromJson(answerByteArray);
|
|
||||||
|
|
||||||
// This Metaverse endpoint will always return a status key/value pair of "success" if things went well.
|
|
||||||
QString status = answerJSONObject["status"].toString();
|
|
||||||
if (status != "success") {
|
|
||||||
qDebug() << "Error when retrieving screenshare info via HTTP. Error:" << reply->errorString();
|
|
||||||
stopScreenshare();
|
|
||||||
emit screenshareError();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store the information necessary to start/view a screen share in these private member variables.
|
|
||||||
_token = answerJSONObject["token"].toString();
|
|
||||||
_projectAPIKey = answerJSONObject["projectApiKey"].toString();
|
|
||||||
_sessionID = answerJSONObject["sessionID"].toString();
|
|
||||||
|
|
||||||
// Make sure we have all of the info that we need.
|
|
||||||
if (_token.isEmpty() || _projectAPIKey.isEmpty() || _sessionID.isEmpty()) {
|
|
||||||
qDebug() << "Not all Screen Share information was retrieved from the backend. Stopping...";
|
|
||||||
stopScreenshare();
|
|
||||||
emit screenshareError();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we're presenting:
|
|
||||||
// 1. Build a list of arguments that we're going to pass to the screen share Electron app.
|
|
||||||
// 2. Make sure we connect a signal/slot to know when the user quits the Electron app.
|
|
||||||
// 3. Start the screen share Electron app with the list of args from (1).
|
|
||||||
if (_isPresenter) {
|
|
||||||
QStringList arguments;
|
|
||||||
arguments << " ";
|
|
||||||
arguments << "--token=" + _token << " ";
|
|
||||||
arguments << "--projectAPIKey=" + _projectAPIKey << " ";
|
|
||||||
arguments << "--sessionID=" + _sessionID << " ";
|
|
||||||
|
|
||||||
connect(_screenshareProcess.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
|
|
||||||
[=](int exitCode, QProcess::ExitStatus exitStatus) {
|
|
||||||
stopScreenshare();
|
|
||||||
emit screenshareProcessTerminated();
|
|
||||||
});
|
|
||||||
|
|
||||||
_screenshareProcess->start(SCREENSHARE_EXE_PATH, arguments);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Make sure we can grab the entity scripting interface. Error out if we can't.
|
|
||||||
auto esi = DependencyManager::get<EntityScriptingInterface>();
|
|
||||||
if (!esi) {
|
|
||||||
stopScreenshare();
|
|
||||||
emit screenshareError();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If, for some reason, we already have a record of a screen share local Web entity, delete it.
|
|
||||||
if (!_screenshareViewerLocalWebEntityUUID.isNull()) {
|
|
||||||
esi->deleteEntity(_screenshareViewerLocalWebEntityUUID);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set up the entity properties associated with the screen share local Web entity.
|
|
||||||
EntityItemProperties localScreenshareWebEntityProps;
|
|
||||||
localScreenshareWebEntityProps.setType(LOCAL_SCREENSHARE_WEB_ENTITY_TYPE);
|
|
||||||
localScreenshareWebEntityProps.setMaxFPS(LOCAL_SCREENSHARE_WEB_ENTITY_FPS);
|
|
||||||
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);
|
|
||||||
|
|
||||||
// The lines below will be used when writing the feature to support scaling the Smartboard entity to any arbitrary size.
|
|
||||||
//EntityPropertyFlags desiredSmartboardProperties;
|
|
||||||
//desiredSmartboardProperties += PROP_POSITION;
|
|
||||||
//desiredSmartboardProperties += PROP_DIMENSIONS;
|
|
||||||
//EntityItemProperties smartboardProps = esi->getEntityProperties(_smartboardEntityID, desiredSmartboardProperties);
|
|
||||||
|
|
||||||
// Add the screen share local Web entity to Interface's entity tree.
|
|
||||||
// When the Web entity loads the page specified by `LOCAL_SCREENSHARE_WEB_ENTITY_URL`, it will broadcast an Event Bridge
|
|
||||||
// message, which we will consume inside `ScreenshareScriptingInterface::onWebEventReceived()`.
|
|
||||||
_screenshareViewerLocalWebEntityUUID = esi->addEntity(localScreenshareWebEntityProps, LOCAL_SCREENSHARE_WEB_ENTITY_HOST_TYPE);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ScreenshareScriptingInterface::handleFailedScreenshareInfoGet(QNetworkReply* reply) {
|
|
||||||
if (_requestScreenshareInfoRetries >= MAX_NUM_SCREENSHARE_INFO_REQUEST_RETRIES) {
|
|
||||||
qDebug() << "Failed to get screenshare info via HTTP after" << MAX_NUM_SCREENSHARE_INFO_REQUEST_RETRIES << "retries. Error:" << reply->errorString();
|
|
||||||
stopScreenshare();
|
|
||||||
emit screenshareError();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_requestScreenshareInfoRetryTimer->start();
|
|
||||||
}
|
|
||||||
|
|
||||||
// This function will handle _all_ web events received via `EntityScriptingInterface::webEventReceived()`, including
|
|
||||||
// those not related to screen sharing.
|
|
||||||
void ScreenshareScriptingInterface::onWebEventReceived(const QUuid& entityID, const QVariant& message) {
|
|
||||||
// Bail early if the entity that sent the Web event isn't the one we care about.
|
|
||||||
if (entityID == _screenshareViewerLocalWebEntityUUID) {
|
|
||||||
// Bail early if we can't grab the Entity Scripting Interface.
|
|
||||||
auto esi = DependencyManager::get<EntityScriptingInterface>();
|
|
||||||
if (!esi) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Web events received from the screen share Web JS will always be in stringified JSON format.
|
|
||||||
QByteArray jsonByteArray = QVariant(message).toString().toUtf8();
|
|
||||||
QJsonDocument jsonObject = QJsonDocument::fromJson(jsonByteArray);
|
|
||||||
|
|
||||||
// It should never happen where the screen share Web JS sends a message without the `app` key's value
|
|
||||||
// set to "screenshare".
|
|
||||||
if (jsonObject["app"] != "screenshare") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// The screen share Web JS only sends a message with one method: "eventBridgeReady". Handle it here.
|
|
||||||
if (jsonObject["method"] == "eventBridgeReady") {
|
|
||||||
// Stuff a JSON object full of information necessary for the screen share local Web entity
|
|
||||||
// to connect to the screen share session associated with the room in which the user's avatar is standing.
|
|
||||||
QJsonObject responseObject;
|
|
||||||
responseObject.insert("app", "screenshare");
|
|
||||||
responseObject.insert("method", "receiveConnectionInfo");
|
|
||||||
QJsonObject responseObjectData;
|
|
||||||
responseObjectData.insert("token", _token);
|
|
||||||
responseObjectData.insert("projectAPIKey", _projectAPIKey);
|
|
||||||
responseObjectData.insert("sessionID", _sessionID);
|
|
||||||
responseObject.insert("data", responseObjectData);
|
|
||||||
|
|
||||||
esi->emitScriptEvent(_screenshareViewerLocalWebEntityUUID, responseObject.toVariantMap());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,93 +0,0 @@
|
||||||
//
|
|
||||||
// ScreenshareScriptingInterface.h
|
|
||||||
// interface/src/scripting/
|
|
||||||
//
|
|
||||||
// Created by Milad Nazeri and Zach Fox on 2019-10-23.
|
|
||||||
// Copyright 2019 High Fidelity, Inc.
|
|
||||||
//
|
|
||||||
// Distributed under the Apache License, Version 2.0.
|
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef hifi_ScreenshareScriptingInterface_h
|
|
||||||
#define hifi_ScreenshareScriptingInterface_h
|
|
||||||
|
|
||||||
#include <QObject>
|
|
||||||
#include <QProcess>
|
|
||||||
#include <QtCore/QCoreApplication>
|
|
||||||
#include <QNetworkReply>
|
|
||||||
#include <QtCore/QSharedPointer>
|
|
||||||
|
|
||||||
#include <PathUtils.h>
|
|
||||||
#include <ReceivedMessage.h>
|
|
||||||
|
|
||||||
class ScreenshareScriptingInterface : public QObject, public Dependency {
|
|
||||||
Q_OBJECT
|
|
||||||
Q_PROPERTY(float localWebEntityZOffset MEMBER _localWebEntityZOffset NOTIFY localWebEntityZOffsetChanged)
|
|
||||||
public:
|
|
||||||
ScreenshareScriptingInterface();
|
|
||||||
~ScreenshareScriptingInterface();
|
|
||||||
|
|
||||||
Q_INVOKABLE void startScreenshare(const QUuid& screenshareZoneID, const QUuid& smartboardEntityID, const bool& isPresenter = false);
|
|
||||||
Q_INVOKABLE void stopScreenshare();
|
|
||||||
|
|
||||||
signals:
|
|
||||||
void screenshareError();
|
|
||||||
void screenshareProcessTerminated();
|
|
||||||
void startScreenshareViewer();
|
|
||||||
void localWebEntityZOffsetChanged(const float& newZOffset);
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
void processAvatarZonePresencePacketOnClient(QSharedPointer<ReceivedMessage> message);
|
|
||||||
void onWebEventReceived(const QUuid& entityID, const QVariant& message);
|
|
||||||
void handleSuccessfulScreenshareInfoGet(QNetworkReply* reply);
|
|
||||||
void handleFailedScreenshareInfoGet(QNetworkReply* reply);
|
|
||||||
|
|
||||||
private:
|
|
||||||
#if DEV_BUILD
|
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
const QString SCREENSHARE_EXE_PATH{ PathUtils::projectRootPath() + "/screenshare/hifi-screenshare-win32-x64/hifi-screenshare.exe" };
|
|
||||||
#elif defined(Q_OS_MAC)
|
|
||||||
const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/../Resources/hifi-screenshare.app" };
|
|
||||||
#else
|
|
||||||
// This path won't exist on other platforms, so the Screenshare Scripting Interface will exit early when invoked.
|
|
||||||
const QString SCREENSHARE_EXE_PATH{ PathUtils::projectRootPath() + "/screenshare/hifi-screenshare-other-os/hifi-screenshare" };
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare.exe" };
|
|
||||||
#elif defined(Q_OS_MAC)
|
|
||||||
const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/../Resources/hifi-screenshare.app" };
|
|
||||||
#else
|
|
||||||
// This path won't exist on other platforms, so the Screenshare Scripting Interface will exit early when invoked.
|
|
||||||
const QString SCREENSHARE_EXE_PATH{ QCoreApplication::applicationDirPath() + "/hifi-screenshare/hifi-screenshare" };
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
QTimer* _requestScreenshareInfoRetryTimer{ nullptr };
|
|
||||||
int _requestScreenshareInfoRetries{ 0 };
|
|
||||||
void requestScreenshareInfo();
|
|
||||||
|
|
||||||
// Empirically determined. The default value here can be changed in Screenshare scripts, which enables faster iteration when we discover
|
|
||||||
// positional issues with various Smartboard entities.
|
|
||||||
// The following four values are closely linked:
|
|
||||||
// 1. The z-offset of whiteboard polylines (`STROKE_FORWARD_OFFSET_M` in `drawSphereClient.js`).
|
|
||||||
// 2. The z-offset of the screenshare local web entity (`LOCAL_WEB_ENTITY_Z_OFFSET` in `smartboardZoneClient.js`).
|
|
||||||
// 3. The z-offset of the screenshare "glass bezel" (`DEFAULT_SMARTBOARD_SCREENSHARE_GLASS_PROPS` in `smartboardZoneClient.js`).
|
|
||||||
// 4. The z-offset of the screenshare "status icon" (handled in the screenshare JSON file).
|
|
||||||
float _localWebEntityZOffset{ 0.0375f };
|
|
||||||
|
|
||||||
std::unique_ptr<QProcess> _screenshareProcess{ nullptr };
|
|
||||||
QUuid _screenshareViewerLocalWebEntityUUID;
|
|
||||||
QString _token{ "" };
|
|
||||||
QString _projectAPIKey{ "" };
|
|
||||||
QString _sessionID{ "" };
|
|
||||||
QUuid _screenshareZoneID;
|
|
||||||
QUuid _smartboardEntityID;
|
|
||||||
bool _isPresenter{ false };
|
|
||||||
|
|
||||||
QUuid _lastAuthorizedZoneID;
|
|
||||||
bool _waitingForAuthorization{ false };
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // hifi_ScreenshareScriptingInterface_h
|
|
||||||
|
|
@ -332,15 +332,6 @@ void EntityItemProperties::setAvatarPriorityFromString(const QString& mode) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QString EntityItemProperties::getScreenshareAsString() const { return getComponentModeAsString(_screenshare); }
|
|
||||||
void EntityItemProperties::setScreenshareFromString(const QString& mode) {
|
|
||||||
auto modeItr = stringToComponentMode.find(mode.toLower());
|
|
||||||
if (modeItr != stringToComponentMode.end()) {
|
|
||||||
_screenshare = modeItr.value();
|
|
||||||
_screenshareChanged = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void addTextEffect(QHash<QString, TextEffect>& lookup, TextEffect effect) { lookup[TextEffectHelpers::getNameForTextEffect(effect)] = effect; }
|
inline void addTextEffect(QHash<QString, TextEffect>& lookup, TextEffect effect) { lookup[TextEffectHelpers::getNameForTextEffect(effect)] = effect; }
|
||||||
const QHash<QString, TextEffect> stringToTextEffectLookup = [] {
|
const QHash<QString, TextEffect> stringToTextEffectLookup = [] {
|
||||||
QHash<QString, TextEffect> toReturn;
|
QHash<QString, TextEffect> toReturn;
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,6 @@ enum:SKYBOX_MODE prop:skyboxMode type:uint8_t default:(uint8_t)COMPONENT_MODE_IN
|
||||||
enum:HAZE_MODE prop:hazeMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum,
|
enum:HAZE_MODE prop:hazeMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum,
|
||||||
enum:BLOOM_MODE prop:bloomMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum,
|
enum:BLOOM_MODE prop:bloomMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum,
|
||||||
enum:AVATAR_PRIORITY prop:avatarPriority type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum basicProp,
|
enum:AVATAR_PRIORITY prop:avatarPriority type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum basicProp,
|
||||||
enum:SCREENSHARE prop:screenshare type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum basicProp,
|
|
||||||
enum:TONEMAPPING_MODE prop:tonemappingMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum,
|
enum:TONEMAPPING_MODE prop:tonemappingMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum,
|
||||||
enum:AMBIENT_OCCLUSION_MODE prop:ambientOcclusionMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum,
|
enum:AMBIENT_OCCLUSION_MODE prop:ambientOcclusionMode type:uint8_t default:(uint8_t)COMPONENT_MODE_INHERIT enum,
|
||||||
PolyVox
|
PolyVox
|
||||||
|
|
|
||||||
|
|
@ -915,8 +915,6 @@
|
||||||
* @property {Entities.AvatarPriorityMode} avatarPriority="inherit" - Configures the priority of updates from avatars in the
|
* @property {Entities.AvatarPriorityMode} avatarPriority="inherit" - Configures the priority of updates from avatars in the
|
||||||
* zone to other clients.
|
* zone to other clients.
|
||||||
*
|
*
|
||||||
* @property {Entities.ScreenshareMode} screenshare="inherit" - Configures a zone for screen-sharing.
|
|
||||||
*
|
|
||||||
* @example <caption>Create a zone that casts a red key light along the x-axis.</caption>
|
* @example <caption>Create a zone that casts a red key light along the x-axis.</caption>
|
||||||
* var zone = Entities.addEntity({
|
* var zone = Entities.addEntity({
|
||||||
* type: "Zone",
|
* type: "Zone",
|
||||||
|
|
|
||||||
|
|
@ -341,7 +341,6 @@ enum class EntityVersion : PacketVersion {
|
||||||
ShadowBiasAndDistance,
|
ShadowBiasAndDistance,
|
||||||
TextEntityFonts,
|
TextEntityFonts,
|
||||||
ScriptServerKinematicMotion,
|
ScriptServerKinematicMotion,
|
||||||
ScreenshareZone,
|
|
||||||
ZoneOcclusion,
|
ZoneOcclusion,
|
||||||
ModelBlendshapes,
|
ModelBlendshapes,
|
||||||
TransparentWeb,
|
TransparentWeb,
|
||||||
|
|
|
||||||
4
screenshare/.gitignore
vendored
4
screenshare/.gitignore
vendored
|
|
@ -1,4 +0,0 @@
|
||||||
hifi-screenshare-*/
|
|
||||||
hifi-screenshare*.zip
|
|
||||||
screenshare*.zip
|
|
||||||
screenshare-*/
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
set(TARGET_NAME screenshare)
|
|
||||||
|
|
||||||
add_custom_target(${TARGET_NAME}-npm-install
|
|
||||||
COMMAND npm install
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
)
|
|
||||||
add_custom_target(${TARGET_NAME}
|
|
||||||
COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
DEPENDS ${TARGET_NAME}-npm-install
|
|
||||||
)
|
|
||||||
|
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "screenshare")
|
|
||||||
set_target_properties(${TARGET_NAME}-npm-install PROPERTIES FOLDER "hidden/screenshare")
|
|
||||||
|
|
||||||
if (WIN32)
|
|
||||||
set(PACKAGED_SCREENSHARE_FOLDER "hifi-screenshare-win32-x64")
|
|
||||||
set(SCREENSHARE_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_SCREENSHARE_FOLDER}")
|
|
||||||
install(
|
|
||||||
DIRECTORY "${SCREENSHARE_DESTINATION}/"
|
|
||||||
DESTINATION ${SCREENSHARE_INSTALL_DIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
set(EXECUTABLE_PATH "${SCREENSHARE_DESTINATION}/${SCREENSHARE_EXEC_NAME}")
|
|
||||||
optional_win_executable_signing()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# DO build the Screenshare Electron app when building the `ALL_BUILD` target.
|
|
||||||
# DO build the Screenshare Electron app when a user selects "Build Solution" from within Visual Studio.
|
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL FALSE EXCLUDE_FROM_DEFAULT_BUILD FALSE)
|
|
||||||
set_target_properties(${TARGET_NAME}-npm-install PROPERTIES EXCLUDE_FROM_ALL FALSE EXCLUDE_FROM_DEFAULT_BUILD FALSE)
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
# Screen Sharing within High Fidelity
|
|
||||||
This Screen Share app, built using Electron, allows for easy desktop screen sharing when used in conjuction with various scripts in the `overte-content` repository.
|
|
||||||
|
|
||||||
# Screen Sharing Source Files
|
|
||||||
## `packager.js`
|
|
||||||
Calling npm run packager will use this file to create the actual Electron `hifi-screenshare` executable.
|
|
||||||
It will kick out a folder `hifi-screenshare-<platform>` which contains an executable.
|
|
||||||
|
|
||||||
## `src/screenshareApp.js`
|
|
||||||
The main process file to configure the electron app.
|
|
||||||
|
|
||||||
## `src/screenshareMainProcess.js`
|
|
||||||
The render file to display the app's UI.
|
|
||||||
|
|
||||||
## `screenshareApp.html`
|
|
||||||
The HTML that displays the screen selection UI and the confirmation screen UI.
|
|
||||||
1950
screenshare/package-lock.json
generated
1950
screenshare/package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,27 +0,0 @@
|
||||||
{
|
|
||||||
"name": "highfidelity_screenshare",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"description": "High Fidelity Screenshare",
|
|
||||||
"main": "src/screenshareMainProcess.js",
|
|
||||||
"scripts": {
|
|
||||||
"test": "echo \"Error: no test specified\" && exit 1",
|
|
||||||
"packager": "node packager.js"
|
|
||||||
},
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "git+https://github.com/highfidelity/hifi.git"
|
|
||||||
},
|
|
||||||
"author": "High Fidelity",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"bugs": {
|
|
||||||
"url": "https://github.com/highfidelity/hifi/issues"
|
|
||||||
},
|
|
||||||
"homepage": "https://github.com/highfidelity/hifi#readme",
|
|
||||||
"devDependencies": {
|
|
||||||
"electron": "^22.3.25",
|
|
||||||
"electron-packager": "^17.1.2"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"yargs": "^14.2.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,49 +0,0 @@
|
||||||
var packager = require('electron-packager');
|
|
||||||
var osType = require('os').type();
|
|
||||||
var argv = require('yargs').argv;
|
|
||||||
|
|
||||||
var platform = null;
|
|
||||||
if (osType == "Darwin" || osType == "Linux") {
|
|
||||||
platform = osType.toLowerCase();
|
|
||||||
} else if (osType == "Windows_NT") {
|
|
||||||
platform = "win32"
|
|
||||||
}
|
|
||||||
|
|
||||||
var NAME = "hifi-screenshare";
|
|
||||||
var options = {
|
|
||||||
dir: __dirname,
|
|
||||||
name: NAME,
|
|
||||||
version: "0.1.0",
|
|
||||||
overwrite: true,
|
|
||||||
prune: true,
|
|
||||||
arch: "x64",
|
|
||||||
platform: platform,
|
|
||||||
ignore: "electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore"
|
|
||||||
};
|
|
||||||
|
|
||||||
// setup per OS options
|
|
||||||
if (osType == "Darwin") {
|
|
||||||
options["app-bundle-id"] = "com.highfidelity.hifi-screenshare";
|
|
||||||
} else if (osType == "Windows_NT") {
|
|
||||||
options["version-string"] = {
|
|
||||||
CompanyName: "Overte",
|
|
||||||
FileDescription: "Overte Screenshare",
|
|
||||||
ProductName: NAME,
|
|
||||||
OriginalFilename: NAME + ".exe"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// check if we were passed a custom out directory, pass it along if so
|
|
||||||
if (argv.out) {
|
|
||||||
options.out = argv.out
|
|
||||||
}
|
|
||||||
|
|
||||||
// call the packager to produce the executable
|
|
||||||
packager(options)
|
|
||||||
.then(appPath => {
|
|
||||||
console.log("Wrote new app to " + appPath);
|
|
||||||
})
|
|
||||||
.catch(error => {
|
|
||||||
console.error("There was an error writing the packaged console: " + error.message);
|
|
||||||
process.exit(1);
|
|
||||||
});
|
|
||||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 658 B |
|
|
@ -1,52 +0,0 @@
|
||||||
<!--
|
|
||||||
screenshareApp.html
|
|
||||||
|
|
||||||
Created by Milad Nazeri, Rebecca Stankus, and Zach Fox 2019/11/13
|
|
||||||
Copyright 2019 High Fidelity, Inc.
|
|
||||||
|
|
||||||
Distributed under the Apache License, Version 2.0.
|
|
||||||
See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
||||||
-->
|
|
||||||
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<link href="styles.css" rel="stylesheet">
|
|
||||||
</head>
|
|
||||||
<body id="main">
|
|
||||||
<div id="title" class="text_title">
|
|
||||||
<h1>Share your screen</h1>
|
|
||||||
<h3 id="subtitle">Please select the content you'd like to share.</h3>
|
|
||||||
</div>
|
|
||||||
<button id="screenshare" onclick="stopSharing()" style="display: none;">Stop Screenshare</button>
|
|
||||||
<div id="select_screen">
|
|
||||||
<div class="scrollbar" id="style-1">
|
|
||||||
<div class="force-overflow">
|
|
||||||
<div id="selects">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div id="confirmation_screen" style="display: none;">
|
|
||||||
<div id="share_pick">
|
|
||||||
</div> <!-- share_pick -->
|
|
||||||
<div id="confirmation_text" style="color: white;">
|
|
||||||
<p>
|
|
||||||
Are you sure you'd like to share <span id="content_name">Content Name</span>?
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Others will be able to see everything contained within this view.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div id="button_selection">
|
|
||||||
<div id="yes" class="button_confirmation grey_background" onclick="screenConfirmed(true)">
|
|
||||||
YES, SHARE THIS CONTENT
|
|
||||||
</div>
|
|
||||||
<div id="no" class="button_confirmation" onclick="screenConfirmed(false)">
|
|
||||||
No, don't share this content
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div> <!-- confirmation screen -->
|
|
||||||
<script src="screenshareApp.js"></script>
|
|
||||||
<script src="https://static.opentok.com/v2/js/opentok.min.js"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
@ -1,312 +0,0 @@
|
||||||
'use strict';
|
|
||||||
// screenshareApp.js
|
|
||||||
//
|
|
||||||
// Created by Milad Nazeri, Rebecca Stankus, and Zach Fox 2019/11/13
|
|
||||||
// Copyright 2019 High Fidelity, Inc.
|
|
||||||
//
|
|
||||||
// Distributed under the Apache License, Version 2.0.
|
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
||||||
|
|
||||||
const { remote } = require('electron');
|
|
||||||
|
|
||||||
// Helpers
|
|
||||||
function handleError(error) {
|
|
||||||
if (error) {
|
|
||||||
console.error(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// When an application is picked, make sure we clear out the previous pick, toggle the page,
|
|
||||||
// and add the correct source
|
|
||||||
let currentScreensharePickID = "";
|
|
||||||
function screensharePicked(id) {
|
|
||||||
currentScreensharePickID = id;
|
|
||||||
document.getElementById("share_pick").innerHTML = "";
|
|
||||||
togglePage();
|
|
||||||
addSource(sourceMap[id], "share_pick");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Once we have confirmed that we want to share, prepare the tokbox publishing initiating
|
|
||||||
// and toggle back to the selects page
|
|
||||||
function screenConfirmed(isConfirmed) {
|
|
||||||
document.getElementById("selects").innerHTML = "";
|
|
||||||
if (isConfirmed === true){
|
|
||||||
onAccessApproved(currentScreensharePickID);
|
|
||||||
}
|
|
||||||
togglePage();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Hide/show the select page or the confirmation page
|
|
||||||
let currentPage = "mainPage";
|
|
||||||
function togglePage(){
|
|
||||||
if (currentPage === "mainPage") {
|
|
||||||
currentPage = "confirmationPage";
|
|
||||||
document.getElementById("select_screen").style.display = "none";
|
|
||||||
document.getElementById("subtitle").innerHTML = "Confirm that you'd like to share this content.";
|
|
||||||
document.getElementById("confirmation_screen").style.display = "block";
|
|
||||||
} else {
|
|
||||||
showSources();
|
|
||||||
currentPage = "mainPage";
|
|
||||||
document.getElementById("select_screen").style.display = "block";
|
|
||||||
document.getElementById("subtitle").innerHTML = "Please select the content you'd like to share.";
|
|
||||||
document.getElementById("confirmation_screen").style.display = "none";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// UI
|
|
||||||
|
|
||||||
// Render the html properly and append that to the correct parent
|
|
||||||
function addSource(source, type) {
|
|
||||||
let renderedHTML = renderSourceHTML(source);
|
|
||||||
if (type === "selects") {
|
|
||||||
document.getElementById("selects").appendChild(renderedHTML);
|
|
||||||
} else {
|
|
||||||
document.getElementById("share_pick").appendChild(renderedHTML);
|
|
||||||
document.getElementById("content_name").innerHTML = source.name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Get the html created from the source. Alter slightly depending on whether this source
|
|
||||||
// is on the selects screen, or the confirmation screen. Mainly removing highlighting.
|
|
||||||
// If there is an app Icon, then add it.
|
|
||||||
function renderSourceHTML(source) {
|
|
||||||
let type = currentPage === "confirmationPage" ? "share_pick" : "selects";
|
|
||||||
let sourceBody = document.createElement('div')
|
|
||||||
let thumbnail = source.thumbnail.toDataURL();
|
|
||||||
sourceBody.classList.add("box")
|
|
||||||
if (type === "share_pick") {
|
|
||||||
sourceBody.style.marginLeft = "0px";
|
|
||||||
}
|
|
||||||
|
|
||||||
let image = "";
|
|
||||||
if (source.appIcon) {
|
|
||||||
image = `<img class="icon" src="${source.appIcon.toDataURL()}" />`;
|
|
||||||
}
|
|
||||||
sourceBody.innerHTML = `
|
|
||||||
<div class="heading">
|
|
||||||
${image}
|
|
||||||
<span class="screen_label">${source.name}</span>
|
|
||||||
</div>
|
|
||||||
<div class="${type === "share_pick" ? "image_no_hover" : "image"}" onclick="screensharePicked('${source.id}')">
|
|
||||||
<img src="${thumbnail}" />
|
|
||||||
</div>
|
|
||||||
`
|
|
||||||
return sourceBody;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Separate out the screenshares and applications
|
|
||||||
// Make sure the screens are labeled in order
|
|
||||||
// Concact the two arrays back together and return
|
|
||||||
function sortSources() {
|
|
||||||
let screenSources = [];
|
|
||||||
let applicationSources = [];
|
|
||||||
// Difference with Mac selects:
|
|
||||||
// 1 screen = "Enitre Screen", more than one like PC "Screen 1, Screen 2..."
|
|
||||||
screenshareSourceArray.forEach((source) => {
|
|
||||||
if (source.name.match(/(entire )?screen( )?([0-9]?)/i)) {
|
|
||||||
screenSources.push(source);
|
|
||||||
} else {
|
|
||||||
applicationSources.push(source)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
screenSources.sort((a, b) => {
|
|
||||||
let aNumber = a.name.replace(/[^\d]/, "");
|
|
||||||
let bNumber = b.name.replace(/[^\d]/, "");
|
|
||||||
return aNumber - bNumber;
|
|
||||||
});
|
|
||||||
let finalSources = [...screenSources, ...applicationSources];
|
|
||||||
return finalSources;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Setup sorting the selection array, add individual sources, and update the sourceMap
|
|
||||||
function addSources() {
|
|
||||||
screenshareSourceArray = sortSources();
|
|
||||||
for (let i = 0; i < screenshareSourceArray.length; i++) {
|
|
||||||
addSource(screenshareSourceArray[i], "selects");
|
|
||||||
sourceMap[screenshareSourceArray[i].id] = screenshareSourceArray[i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// 1. Get the screens and window that are available from electron
|
|
||||||
// 2. Remove the screenshare app itself
|
|
||||||
// 3. Create a source map to help grab the correct source when picked
|
|
||||||
// 4. push all the sources for sorting to the source array
|
|
||||||
// 5. Add thse sources
|
|
||||||
const electron = require('electron');
|
|
||||||
const SCREENSHARE_TITLE = "Screen share";
|
|
||||||
const SCREENSHARE_TITLE_REGEX = new RegExp("^" + SCREENSHARE_TITLE + "$");
|
|
||||||
const IMAGE_WIDTH = 265;
|
|
||||||
const IMAGE_HEIGHT = 165;
|
|
||||||
let screenshareSourceArray = [];
|
|
||||||
let sourceMap = {};
|
|
||||||
function showSources() {
|
|
||||||
screenshareSourceArray = [];
|
|
||||||
electron.desktopCapturer.getSources({
|
|
||||||
types:['window', 'screen'],
|
|
||||||
thumbnailSize: {
|
|
||||||
width: IMAGE_WIDTH,
|
|
||||||
height: IMAGE_HEIGHT
|
|
||||||
},
|
|
||||||
fetchWindowIcons: true
|
|
||||||
}, (error, sources) => {
|
|
||||||
if (error) {
|
|
||||||
console.log("Error getting sources", error);
|
|
||||||
}
|
|
||||||
for (let source of sources) {
|
|
||||||
if (source.name.match(SCREENSHARE_TITLE_REGEX)){
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
sourceMap[source.id] = source;
|
|
||||||
screenshareSourceArray.push(source);
|
|
||||||
}
|
|
||||||
addSources();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Stop the localstream and end the tokrok publishing
|
|
||||||
let localStream;
|
|
||||||
let desktopSharing;
|
|
||||||
function stopSharing() {
|
|
||||||
desktopSharing = false;
|
|
||||||
|
|
||||||
if (localStream) {
|
|
||||||
localStream.getTracks()[0].stop();
|
|
||||||
localStream = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
document.getElementById('screenshare').style.display = "none";
|
|
||||||
stopTokBoxPublisher();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Callback to start publishing after we have setup the chromium stream
|
|
||||||
function gotStream(stream) {
|
|
||||||
if (localStream) {
|
|
||||||
stopSharing();
|
|
||||||
}
|
|
||||||
|
|
||||||
localStream = stream;
|
|
||||||
startTokboxPublisher(localStream);
|
|
||||||
|
|
||||||
stream.onended = () => {
|
|
||||||
if (desktopSharing) {
|
|
||||||
togglePage();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// After we grant access to electron, create a stream and using the callback
|
|
||||||
// start the tokbox publisher
|
|
||||||
function onAccessApproved(desktop_id) {
|
|
||||||
if (!desktop_id) {
|
|
||||||
console.log('Desktop Capture access rejected.');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
document.getElementById('screenshare').style.visibility = "block";
|
|
||||||
desktopSharing = true;
|
|
||||||
navigator.webkitGetUserMedia({
|
|
||||||
audio: false,
|
|
||||||
video: {
|
|
||||||
mandatory: {
|
|
||||||
chromeMediaSource: 'desktop',
|
|
||||||
chromeMediaSourceId: desktop_id,
|
|
||||||
maxWidth: 1280,
|
|
||||||
maxHeight: 720,
|
|
||||||
maxFrameRate: 7
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, gotStream, handleError);
|
|
||||||
remote.getCurrentWindow().minimize();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Tokbox
|
|
||||||
|
|
||||||
// Once we have the connection info, this will create the session which will allow
|
|
||||||
// us to publish a stream when we are ready
|
|
||||||
function initializeTokboxSession() {
|
|
||||||
session = OT.initSession(projectAPIKey, sessionID);
|
|
||||||
session.on('sessionDisconnected', (event) => {
|
|
||||||
console.log('You were disconnected from the session.', event.reason);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Connect to the session
|
|
||||||
session.connect(token, (error) => {
|
|
||||||
if (error) {
|
|
||||||
handleError(error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Init the tokbox publisher with our newly created stream
|
|
||||||
var publisher;
|
|
||||||
function startTokboxPublisher(stream) {
|
|
||||||
publisher = document.createElement("div");
|
|
||||||
var publisherOptions = {
|
|
||||||
audioFallbackEnabled: false,
|
|
||||||
audioSource: null,
|
|
||||||
fitMode: 'contain',
|
|
||||||
frameRate: 7,
|
|
||||||
height: 720,
|
|
||||||
insertMode: 'append',
|
|
||||||
publishAudio: false,
|
|
||||||
videoSource: stream.getVideoTracks()[0],
|
|
||||||
width: 1280
|
|
||||||
};
|
|
||||||
|
|
||||||
publisher = OT.initPublisher(publisher, publisherOptions, function(error){
|
|
||||||
if (error) {
|
|
||||||
console.log("ERROR: " + error);
|
|
||||||
} else {
|
|
||||||
session.publish(publisher, function(error) {
|
|
||||||
if (error) {
|
|
||||||
console.log("ERROR FROM Session.publish: " + error);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Kills the streaming being sent to tokbox
|
|
||||||
function stopTokBoxPublisher() {
|
|
||||||
publisher.destroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// When the app is ready, we get this info from the command line arguments.
|
|
||||||
const ipcRenderer = electron.ipcRenderer;
|
|
||||||
let projectAPIKey;
|
|
||||||
let sessionID;
|
|
||||||
let token;
|
|
||||||
let session;
|
|
||||||
ipcRenderer.on('connectionInfo', function(event, message) {
|
|
||||||
const connectionInfo = JSON.parse(message);
|
|
||||||
projectAPIKey = connectionInfo.projectAPIKey;
|
|
||||||
sessionID = connectionInfo.sessionID;
|
|
||||||
token = connectionInfo.token;
|
|
||||||
|
|
||||||
initializeTokboxSession();
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// Show the initial sources after the dom has loaded
|
|
||||||
// Sources come from electron.desktopCapturer
|
|
||||||
document.addEventListener("DOMContentLoaded", () => {
|
|
||||||
showSources();
|
|
||||||
});
|
|
||||||
|
|
@ -1,74 +0,0 @@
|
||||||
'use strict';
|
|
||||||
// screenshareMainProcess.js
|
|
||||||
//
|
|
||||||
// Milad Nazeri and Zach Fox 2019/11/13
|
|
||||||
// Copyright 2019 High Fidelity, Inc.
|
|
||||||
//
|
|
||||||
// Distributed under the Apache License, Version 2.0.
|
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
||||||
|
|
||||||
const {app, BrowserWindow, ipcMain} = require('electron');
|
|
||||||
const gotTheLock = app.requestSingleInstanceLock()
|
|
||||||
const argv = require('yargs').argv;
|
|
||||||
|
|
||||||
|
|
||||||
const connectionInfo = {
|
|
||||||
token: argv.token || "token",
|
|
||||||
projectAPIKey: argv.projectAPIKey || "projectAPIKey",
|
|
||||||
sessionID: argv.sessionID || "sessionID"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Mac and PC need slightly different width and height sizes.
|
|
||||||
const osType = require('os').type();
|
|
||||||
let width;
|
|
||||||
let height;
|
|
||||||
if (osType == "Darwin" || osType == "Linux") {
|
|
||||||
width = 960;
|
|
||||||
height = 660;
|
|
||||||
} else if (osType == "Windows_NT") {
|
|
||||||
width = 973;
|
|
||||||
height = 740;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (!gotTheLock) {
|
|
||||||
console.log("Another instance of the screenshare is already running - this instance will quit.");
|
|
||||||
app.exit(0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
let window;
|
|
||||||
const zoomFactor = 1.0;
|
|
||||||
function createWindow(){
|
|
||||||
window = new BrowserWindow({
|
|
||||||
backgroundColor: "#000000",
|
|
||||||
width: width,
|
|
||||||
height: height,
|
|
||||||
center: true,
|
|
||||||
frame: true,
|
|
||||||
useContentSize: true,
|
|
||||||
zoomFactor: zoomFactor,
|
|
||||||
resizable: false,
|
|
||||||
webPreferences: {
|
|
||||||
nodeIntegration: true
|
|
||||||
},
|
|
||||||
icon: __dirname + `/resources/interface.png`,
|
|
||||||
skipTaskbar: false,
|
|
||||||
title: "Screen share"
|
|
||||||
});
|
|
||||||
window.loadURL('file://' + __dirname + '/screenshareApp.html');
|
|
||||||
window.setMenu(null);
|
|
||||||
|
|
||||||
window.webContents.on("did-finish-load", () => {
|
|
||||||
window.webContents.send('connectionInfo', JSON.stringify(connectionInfo));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// This method will be called when Electron has finished
|
|
||||||
// initialization and is ready to create browser windows.
|
|
||||||
app.on('ready', function() {
|
|
||||||
createWindow();
|
|
||||||
window.webContents.send('connectionInfo', JSON.stringify(connectionInfo))
|
|
||||||
});
|
|
||||||
|
|
@ -1,217 +0,0 @@
|
||||||
body {
|
|
||||||
background-color: black;
|
|
||||||
box-sizing: border-box;
|
|
||||||
font-family: "FiraSans";
|
|
||||||
margin: 0px 22px 10px 22px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#confirmation_screen {
|
|
||||||
width: 100%;
|
|
||||||
display: flex;
|
|
||||||
text-align: center;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
#confirmation_text {
|
|
||||||
margin-top: 65px;
|
|
||||||
font-size: 25px;
|
|
||||||
line-height: 25px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#confirmation_text p {
|
|
||||||
margin: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#button_selection {
|
|
||||||
margin-top: 25px;
|
|
||||||
width: 100%;
|
|
||||||
display: flex;
|
|
||||||
text-align: center;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button_confirmation {
|
|
||||||
margin: 4px;
|
|
||||||
cursor: pointer;
|
|
||||||
width: 300px;
|
|
||||||
height: 32px;
|
|
||||||
line-height: 32px;
|
|
||||||
text-align: center;
|
|
||||||
vertical-align: middle;
|
|
||||||
color: white
|
|
||||||
}
|
|
||||||
|
|
||||||
.grey_background {
|
|
||||||
background-color: #191919;
|
|
||||||
}
|
|
||||||
|
|
||||||
#no {
|
|
||||||
color: rgba(1, 152, 203,0.7);
|
|
||||||
}
|
|
||||||
|
|
||||||
#no:hover {
|
|
||||||
color: rgba(1, 152, 203,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
#yes {
|
|
||||||
outline: solid white 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#yes:hover {
|
|
||||||
background: #0198CB;
|
|
||||||
}
|
|
||||||
|
|
||||||
yes:hover + #yes_background {
|
|
||||||
display: block;
|
|
||||||
}
|
|
||||||
|
|
||||||
#share_pick {
|
|
||||||
margin-top: 60px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.text_title {
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: "FiraSans";
|
|
||||||
src: url("./resources/FiraSans-Regular.ttf");
|
|
||||||
}
|
|
||||||
|
|
||||||
#title {
|
|
||||||
margin-top: 21px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
line-height: 48px;
|
|
||||||
font-size: 48px;
|
|
||||||
margin: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h3 {
|
|
||||||
line-height: 24px;
|
|
||||||
font-size: 24px;
|
|
||||||
margin: 9px 0px 0px 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#publisher {
|
|
||||||
visibility: hidden;
|
|
||||||
width: 0px;
|
|
||||||
height: 0px;
|
|
||||||
bottom: 10px;
|
|
||||||
left: 10px;
|
|
||||||
z-index: 100;
|
|
||||||
border: 3px solid white;
|
|
||||||
border-radius: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#selects {
|
|
||||||
margin-right: 19px;
|
|
||||||
padding-left: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.screen_label {
|
|
||||||
max-width: 220px;
|
|
||||||
font-size: 25px;
|
|
||||||
line-height: 25px;
|
|
||||||
color: white;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
text-overflow: ellipsis;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon {
|
|
||||||
display: inline-block;
|
|
||||||
background: #000000;
|
|
||||||
width: 20px;
|
|
||||||
height: 20px;
|
|
||||||
margin-right: 15px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.box {
|
|
||||||
height: 165px;
|
|
||||||
width: 265px;
|
|
||||||
display: inline-block;
|
|
||||||
margin-left: 35px;
|
|
||||||
margin-top: 60px;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.box:nth-child(1) {
|
|
||||||
margin-top: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.box:nth-child(2) {
|
|
||||||
margin-top: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.box:nth-child(3) {
|
|
||||||
margin-top: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.box:nth-child(3n) {
|
|
||||||
margin-right: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.box:nth-child(3n+1) {
|
|
||||||
margin-left: 0 !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.heading {
|
|
||||||
height: 35px;
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
.image {
|
|
||||||
width: 265px;
|
|
||||||
height: 165px;
|
|
||||||
max-height: 165px;
|
|
||||||
max-width: 265px;
|
|
||||||
margin: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.image:hover {
|
|
||||||
outline: solid white 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.image_no_hover {
|
|
||||||
width: 265px;
|
|
||||||
height: 165px;
|
|
||||||
max-height: 165px;
|
|
||||||
max-width: 265px;
|
|
||||||
}
|
|
||||||
|
|
||||||
img {
|
|
||||||
width: 265px;
|
|
||||||
height: 165px;
|
|
||||||
margin: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.scrollbar {
|
|
||||||
float: right;
|
|
||||||
height: 500px;
|
|
||||||
width: 100%;
|
|
||||||
overflow-y: scroll;
|
|
||||||
margin-top: 40px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#style-1::-webkit-scrollbar {
|
|
||||||
width: 9px;
|
|
||||||
overflow: scroll;
|
|
||||||
overflow-x: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
#style-1::-webkit-scrollbar-thumb {
|
|
||||||
background-color: #0198CB;
|
|
||||||
width: 9px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#style-1::-webkit-scrollbar-track {
|
|
||||||
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
|
|
||||||
background-color: #848484;
|
|
||||||
width: 9px;
|
|
||||||
}
|
|
||||||
|
|
@ -228,9 +228,6 @@
|
||||||
"avatarPriority": {
|
"avatarPriority": {
|
||||||
"tooltip": "Alter Avatars' update priorities."
|
"tooltip": "Alter Avatars' update priorities."
|
||||||
},
|
},
|
||||||
"screenshare": {
|
|
||||||
"tooltip": "Enable screen-sharing within this zone"
|
|
||||||
},
|
|
||||||
"modelURL": {
|
"modelURL": {
|
||||||
"tooltip": "A mesh model from an FBX or OBJ file."
|
"tooltip": "A mesh model from an FBX or OBJ file."
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -417,8 +417,7 @@
|
||||||
},
|
},
|
||||||
shapeType: "box",
|
shapeType: "box",
|
||||||
bloomMode: "inherit",
|
bloomMode: "inherit",
|
||||||
avatarPriority: "inherit",
|
avatarPriority: "inherit"
|
||||||
screenshare: "inherit",
|
|
||||||
},
|
},
|
||||||
Model: {
|
Model: {
|
||||||
collisionShape: "none",
|
collisionShape: "none",
|
||||||
|
|
|
||||||
|
|
@ -760,12 +760,6 @@ const GROUPS = [
|
||||||
type: "dropdown",
|
type: "dropdown",
|
||||||
options: { inherit: "Inherit", crowd: "Crowd", hero: "Hero" },
|
options: { inherit: "Inherit", crowd: "Crowd", hero: "Hero" },
|
||||||
propertyID: "avatarPriority",
|
propertyID: "avatarPriority",
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Screen-share",
|
|
||||||
type: "dropdown",
|
|
||||||
options: { inherit: "Inherit", disabled: "Off", enabled: "On" },
|
|
||||||
propertyID: "screenshare",
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue