Showing the changes to interface/src/Application.cpp (1 of 15 files). Show all
Unified · Split
| @@ -1998,20 +1998,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1997 unmodified lines | |||
| 1998 | connect(_window, SIGNAL(windowMinimizedChanged(bool)), this, SLOT(windowMinimizedChanged(bool))); | 1998 | connect(_window, SIGNAL(windowMinimizedChanged(bool)), this, SLOT(windowMinimizedChanged(bool))); |
| 1999 | qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)startupTimer.elapsed() / 1000.0); | 1999 | qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)startupTimer.elapsed() / 1000.0); |
| 2000 | 2000 | ||
| 2001 | { | ||
| 2002 | PROFILE_RANGE(render, "Process Default Skybox"); | ||
| 2003 | auto textureCache = DependencyManager::get<TextureCache>(); | ||
| 2004 | |||
| 2005 | QFileSelector fileSelector; | ||
| 2006 | fileSelector.setExtraSelectors(FileUtils::getFileSelectors()); | ||
| 2007 | auto skyboxUrl = fileSelector.select(PathUtils::resourcesPath() + "images/Default-Sky-9-cubemap.ktx"); | ||
| 2008 | |||
| 2009 | _defaultSkyboxTexture = gpu::Texture::unserialize(skyboxUrl.toStdString()); | ||
| 2010 | _defaultSkyboxAmbientTexture = _defaultSkyboxTexture; | ||
| 2011 | |||
| 2012 | _defaultSkybox->setCubemap(_defaultSkyboxTexture); | ||
| 2013 | } | ||
| 2014 | |||
| 2015 | EntityTreeRenderer::setEntitiesShouldFadeFunction([this]() { | 2001 | EntityTreeRenderer::setEntitiesShouldFadeFunction([this]() { |
| 2016 | SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer); | 2002 | SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer); |
| 2017 | return entityServerNode && !isPhysicsEnabled(); | 2003 | return entityServerNode && !isPhysicsEnabled(); |
| @@ -2461,7 +2447,6 @@ void Application::initializeGL() { · 443 unmodified lines | |||
| 2461 | DeadlockWatchdogThread::withPause([&] { | 2447 | DeadlockWatchdogThread::withPause([&] { |
| 2462 | // Set up the render engine | 2448 | // Set up the render engine |
| 2463 | render::CullFunctor cullFunctor = LODManager::shouldRender; | 2449 | render::CullFunctor cullFunctor = LODManager::shouldRender; |
| 2464 | static const QString RENDER_FORWARD = "HIFI_RENDER_FORWARD"; | ||
| 2465 | _renderEngine->addJob<UpdateSceneTask>("UpdateScene"); | 2450 | _renderEngine->addJob<UpdateSceneTask>("UpdateScene"); |
| 2466 | #ifndef Q_OS_ANDROID | 2451 | #ifndef Q_OS_ANDROID |
| 2467 | _renderEngine->addJob<SecondaryCameraRenderTask>("SecondaryCameraJob", cullFunctor, !DISABLE_DEFERRED); | 2452 | _renderEngine->addJob<SecondaryCameraRenderTask>("SecondaryCameraJob", cullFunctor, !DISABLE_DEFERRED); |