Showing the changes to interface/src/scripting/ScreenshareScriptingInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -90,7 +90,7 @@ static const EntityTypes::EntityType LOCAL_SCREENSHARE_WEB_ENTITY_TYPE = EntityT · 89 unmodified lines | |||
| 90 | static const uint8_t LOCAL_SCREENSHARE_WEB_ENTITY_FPS = 30; | 90 | static const uint8_t LOCAL_SCREENSHARE_WEB_ENTITY_FPS = 30; |
| 91 | // This is going to be a good amount of work to make this work dynamically for any screensize. | 91 | // This is going to be a good amount of work to make this work dynamically for any screensize. |
| 92 | // V1 will have only hardcoded values. | 92 | // V1 will have only hardcoded values. |
| 93 | static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION(0.0128f, -0.0918f, 0.0771f); | 93 | static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_LOCAL_POSITION(0.0128f, -0.0918f, 0.0711f); |
| 94 | static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS(3.6790f, 2.0990f, 0.0100f); | 94 | static const glm::vec3 LOCAL_SCREENSHARE_WEB_ENTITY_DIMENSIONS(3.6790f, 2.0990f, 0.0100f); |
| 95 | static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL = | 95 | static const QString LOCAL_SCREENSHARE_WEB_ENTITY_URL = |
| 96 | "https://content.highfidelity.com/Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html"; | 96 | "https://content.highfidelity.com/Experiences/Releases/usefulUtilities/smartBoard/screenshareViewer/screenshareClient.html"; |
| @@ -124,7 +124,7 @@ void ScreenshareScriptingInterface::startScreenshare(const QUuid& screenshareZon · 27 unmodified lines | |||
| 124 | // Ensure that the screenshare executable exists where we expect it to. | 124 | // Ensure that the screenshare executable exists where we expect it to. |
| 125 | // Error out and reset the screen share state machine if the executable doesn't exist. | 125 | // Error out and reset the screen share state machine if the executable doesn't exist. |
| 126 | QFileInfo screenshareExecutable(SCREENSHARE_EXE_PATH); | 126 | QFileInfo screenshareExecutable(SCREENSHARE_EXE_PATH); |
| 127 | if (!screenshareExecutable.exists() || !screenshareExecutable.isFile()) { | 127 | if (!screenshareExecutable.exists() || !(screenshareExecutable.isFile() || screenshareExecutable.isBundle())) { |
| 128 | qDebug() << "Screenshare executable doesn't exist at" << SCREENSHARE_EXE_PATH; | 128 | qDebug() << "Screenshare executable doesn't exist at" << SCREENSHARE_EXE_PATH; |
| 129 | stopScreenshare(); | 129 | stopScreenshare(); |
| 130 | emit screenshareError(); | 130 | emit screenshareError(); |