Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -55,7 +55,6 @@ · 54 unmodified lines | ||
| 55 | 55 | #include <AccountManager.h> |
| 56 | 56 | #include <AddressManager.h> |
| 57 | 57 | #include <CursorManager.h> |
| 58 | −#include <AmbientOcclusionEffect.h> | |
| 59 | 58 | #include <AudioInjector.h> |
| 60 | 59 | #include <AutoUpdater.h> |
| 61 | 60 | #include <DeferredLightingEffect.h> |
| @@ -266,7 +265,6 @@ bool setupEssentials(int& argc, char** argv) { · 204 unmodified lines | ||
| 266 | 265 | auto audio = DependencyManager::set<AudioClient>(); |
| 267 | 266 | auto audioScope = DependencyManager::set<AudioScope>(); |
| 268 | 267 | auto deferredLightingEffect = DependencyManager::set<DeferredLightingEffect>(); |
| 269 | − auto ambientOcclusionEffect = DependencyManager::set<AmbientOcclusionEffect>(); | |
| 270 | 268 | auto textureCache = DependencyManager::set<TextureCache>(); |
| 271 | 269 | auto animationCache = DependencyManager::set<AnimationCache>(); |
| 272 | 270 | auto ddeFaceTracker = DependencyManager::set<DdeFaceTracker>(); |
| @@ -1255,12 +1253,6 @@ void Application::keyPressEvent(QKeyEvent* event) { · 982 unmodified lines | ||
| 1255 | 1253 | Menu::getInstance()->triggerOption(MenuOption::Stars); |
| 1256 | 1254 | break; |
| 1257 | 1255 | |
| 1258 | − case Qt::Key_W: | |
| 1259 | − if (isOption && !isShifted && !isMeta) { | |
| 1260 | − Menu::getInstance()->triggerOption(MenuOption::Wireframe); | |
| 1261 | − } | |
| 1262 | − break; | |
| 1263 | − | |
| 1264 | 1256 | case Qt::Key_S: |
| 1265 | 1257 | if (isShifted && isMeta && !isOption) { |
| 1266 | 1258 | Menu::getInstance()->triggerOption(MenuOption::SuppressShortTimings); |
| @@ -2154,7 +2146,6 @@ void Application::init() { · 887 unmodified lines | ||
| 2154 | 2146 | _environment.init(); |
| 2155 | 2147 | |
| 2156 | 2148 | DependencyManager::get<DeferredLightingEffect>()->init(this); |
| 2157 | − DependencyManager::get<AmbientOcclusionEffect>()->init(this); | |
| 2158 | 2149 | |
| 2159 | 2150 | // TODO: move _myAvatar out of Application. Move relevant code to MyAvataar or AvatarManager |
| 2160 | 2151 | DependencyManager::get<AvatarManager>()->init(); |
| @@ -3278,10 +3269,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 1117 unmodified lines | ||
| 3278 | 3269 | |
| 3279 | 3270 | } |
| 3280 | 3271 | |
| 3281 | − if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) { | |
| 3282 | − glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); | |
| 3283 | − } | |
| 3284 | − | |
| 3285 | 3272 | // Assuming nothing get's rendered through that |
| 3286 | 3273 | if (!selfAvatarOnly) { |
| 3287 | 3274 | if (DependencyManager::get<SceneScriptingInterface>()->shouldRenderEntities()) { |
| @@ -3302,14 +3289,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 14 unmodified lines | ||
| 3302 | 3289 | renderArgs->_debugFlags = renderDebugFlags; |
| 3303 | 3290 | _entities.render(renderArgs); |
| 3304 | 3291 | } |
| 3305 | − | |
| 3306 | − // render the ambient occlusion effect if enabled | |
| 3307 | − if (Menu::getInstance()->isOptionChecked(MenuOption::AmbientOcclusion)) { | |
| 3308 | − PerformanceTimer perfTimer("ambientOcclusion"); | |
| 3309 | − PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), | |
| 3310 | − "Application::displaySide() ... AmbientOcclusion..."); | |
| 3311 | − DependencyManager::get<AmbientOcclusionEffect>()->render(); | |
| 3312 | − } | |
| 3313 | 3292 | } |
| 3314 | 3293 | |
| 3315 | 3294 | // Make sure the WorldBox is in the scene |
| @@ -3400,10 +3379,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 84 unmodified lines | ||
| 3400 | 3379 | } |
| 3401 | 3380 | } |
| 3402 | 3381 | |
| 3403 | − if (Menu::getInstance()->isOptionChecked(MenuOption::Wireframe)) { | |
| 3404 | − glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); | |
| 3405 | − } | |
| 3406 | − | |
| 3407 | 3382 | activeRenderingThread = nullptr; |
| 3408 | 3383 | } |
| 3409 | 3384 | |