Showing the changes to interface/src/Application.cpp (1 of 13 files). Show all
Unified · Split
| @@ -2265,7 +2265,7 @@ void Application::update(float deltaTime) { · 2264 unmodified lines | |||
| 2265 | if (queryIsDue || viewIsDifferentEnough) { | 2265 | if (queryIsDue || viewIsDifferentEnough) { |
| 2266 | _lastQueriedTime = now; | 2266 | _lastQueriedTime = now; |
| 2267 | 2267 | ||
| 2268 | if (Menu::getInstance()->isOptionChecked(MenuOption::Entities)) { | 2268 | if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) { |
| 2269 | queryOctree(NodeType::EntityServer, PacketTypeEntityQuery, _entityServerJurisdictions); | 2269 | queryOctree(NodeType::EntityServer, PacketTypeEntityQuery, _entityServerJurisdictions); |
| 2270 | } | 2270 | } |
| 2271 | _lastQueriedViewFrustum = _viewFrustum; | 2271 | _lastQueriedViewFrustum = _viewFrustum; |
| @@ -2978,7 +2978,7 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 706 unmodified lines | |||
| 2978 | DependencyManager::get<GeometryCache>()->renderSphere(originSphereRadius, 15, 15, glm::vec4(1.0f, 0.0f, 0.0f, 1.0f)); | 2978 | DependencyManager::get<GeometryCache>()->renderSphere(originSphereRadius, 15, 15, glm::vec4(1.0f, 0.0f, 0.0f, 1.0f)); |
| 2979 | 2979 | ||
| 2980 | // render models... | 2980 | // render models... |
| 2981 | if (Menu::getInstance()->isOptionChecked(MenuOption::Entities)) { | 2981 | if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) { |
| 2982 | PerformanceTimer perfTimer("entities"); | 2982 | PerformanceTimer perfTimer("entities"); |
| 2983 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | 2983 | PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), |
| 2984 | "Application::displaySide() ... entities..."); | 2984 | "Application::displaySide() ... entities..."); |
| @@ -3003,17 +3003,15 @@ void Application::displaySide(Camera& theCamera, bool selfAvatarOnly, RenderArgs · 18 unmodified lines | |||
| 3003 | DependencyManager::get<AmbientOcclusionEffect>()->render(); | 3003 | DependencyManager::get<AmbientOcclusionEffect>()->render(); |
| 3004 | } | 3004 | } |
| 3005 | } | 3005 | } |
| 3006 | 3006 | ||
| 3007 | |||
| 3008 | |||
| 3009 | bool mirrorMode = (theCamera.getMode() == CAMERA_MODE_MIRROR); | 3007 | bool mirrorMode = (theCamera.getMode() == CAMERA_MODE_MIRROR); |
| 3008 | |||
| 3010 | { | 3009 | { |
| 3011 | PerformanceTimer perfTimer("avatars"); | 3010 | PerformanceTimer perfTimer("avatars"); |
| 3012 | DependencyManager::get<AvatarManager>()->renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE, | 3011 | DependencyManager::get<AvatarManager>()->renderAvatars(mirrorMode ? Avatar::MIRROR_RENDER_MODE : Avatar::NORMAL_RENDER_MODE, |
| 3013 | false, selfAvatarOnly); | 3012 | false, selfAvatarOnly); |
| 3014 | } | 3013 | } |
| 3015 | 3014 | ||
| 3016 | |||
| 3017 | { | 3015 | { |
| 3018 | DependencyManager::get<DeferredLightingEffect>()->setAmbientLightMode(getRenderAmbientLight()); | 3016 | DependencyManager::get<DeferredLightingEffect>()->setAmbientLightMode(getRenderAmbientLight()); |
| 3019 | auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage(); | 3017 | auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage(); |