Case 22065: Fix mac warnings
Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -2331,7 +2331,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 2330 unmodified lines | |||
| 2331 | DependencyManager::get<PickManager>()->setPrecisionPicking(rayPickID, value); | 2331 | DependencyManager::get<PickManager>()->setPrecisionPicking(rayPickID, value); |
| 2332 | }); | 2332 | }); |
| 2333 | 2333 | ||
| 2334 | EntityItem::setBillboardRotationOperator([this](const glm::vec3& position, const glm::quat& rotation, BillboardMode billboardMode, const glm::vec3& frustumPos) { | 2334 | EntityItem::setBillboardRotationOperator([](const glm::vec3& position, const glm::quat& rotation, BillboardMode billboardMode, const glm::vec3& frustumPos) { |
| 2335 | if (billboardMode == BillboardMode::YAW) { | 2335 | if (billboardMode == BillboardMode::YAW) { |
| 2336 | //rotate about vertical to face the camera | 2336 | //rotate about vertical to face the camera |
| 2337 | glm::vec3 dPosition = frustumPos - position; | 2337 | glm::vec3 dPosition = frustumPos - position; |
| @@ -2359,7 +2359,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 21 unmodified lines | |||
| 2359 | 2359 | ||
| 2360 | DependencyManager::get<UsersScriptingInterface>()->setKickConfirmationOperator([this] (const QUuid& nodeID) { userKickConfirmation(nodeID); }); | 2360 | DependencyManager::get<UsersScriptingInterface>()->setKickConfirmationOperator([this] (const QUuid& nodeID) { userKickConfirmation(nodeID); }); |
| 2361 | 2361 | ||
| 2362 | render::entities::WebEntityRenderer::setAcquireWebSurfaceOperator([this](const QString& url, bool htmlContent, QSharedPointer<OffscreenQmlSurface>& webSurface, bool& cachedWebSurface) { | 2362 | render::entities::WebEntityRenderer::setAcquireWebSurfaceOperator([=](const QString& url, bool htmlContent, QSharedPointer<OffscreenQmlSurface>& webSurface, bool& cachedWebSurface) { |
| 2363 | bool isTablet = url == TabletScriptingInterface::QML; | 2363 | bool isTablet = url == TabletScriptingInterface::QML; |
| 2364 | if (htmlContent) { | 2364 | if (htmlContent) { |
| 2365 | webSurface = DependencyManager::get<OffscreenQmlSurfaceCache>()->acquire(render::entities::WebEntityRenderer::QML); | 2365 | webSurface = DependencyManager::get<OffscreenQmlSurfaceCache>()->acquire(render::entities::WebEntityRenderer::QML); |
| @@ -2399,7 +2399,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 33 unmodified lines | |||
| 2399 | const uint8_t TABLET_FPS = 90; | 2399 | const uint8_t TABLET_FPS = 90; |
| 2400 | webSurface->setMaxFps(isTablet ? TABLET_FPS : DEFAULT_MAX_FPS); | 2400 | webSurface->setMaxFps(isTablet ? TABLET_FPS : DEFAULT_MAX_FPS); |
| 2401 | }); | 2401 | }); |
| 2402 | render::entities::WebEntityRenderer::setReleaseWebSurfaceOperator([this](QSharedPointer<OffscreenQmlSurface>& webSurface, bool& cachedWebSurface, std::vector<QMetaObject::Connection>& connections) { | 2402 | render::entities::WebEntityRenderer::setReleaseWebSurfaceOperator([=](QSharedPointer<OffscreenQmlSurface>& webSurface, bool& cachedWebSurface, std::vector<QMetaObject::Connection>& connections) { |
| 2403 | QQuickItem* rootItem = webSurface->getRootItem(); | 2403 | QQuickItem* rootItem = webSurface->getRootItem(); |
| 2404 | 2404 | ||
| 2405 | // Fix for crash in QtWebEngineCore when rapidly switching domains | 2405 | // Fix for crash in QtWebEngineCore when rapidly switching domains |