History

Merge pull request #6859 from zzmp/flag/shadows

Add shadows behind a render-menu flag

samcake committed 10 years ago

Commit 338342c2 parents 5d8828e b62fc5019 files · +129 −78Browse files

Showing the changes to interface/src/Application.cpp (1 of 19 files). Show all

Unified · Split

interface/src/Application.cpp+6−2
@@ -99,6 +99,7 @@ · 98 unmodified lines
9999 #include <plugins/PluginContainer.h>
100100 #include <plugins/PluginManager.h>
101101 #include <RenderableWebEntityItem.h>
102+#include <RenderShadowTask.h>
102103 #include <RenderDeferredTask.h>
103104 #include <ResourceCache.h>
104105 #include <RenderScriptingInterface.h>
@@ -673,7 +674,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 568 unmodified lines
673674 initializeGL();
674675
675676 // Start rendering
676− _renderEngine->addTask(make_shared<RenderDeferredTask>(LODManager::shouldRender));
677+ render::CullFunctor cullFunctor = LODManager::shouldRender;
678+ _renderEngine->addTask(make_shared<RenderShadowTask>(cullFunctor));
679+ _renderEngine->addTask(make_shared<RenderDeferredTask>(cullFunctor));
677680 _renderEngine->registerScene(_main3DScene);
678681
679682 _offscreenContext->makeCurrent();
@@ -3760,9 +3763,10 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 3080 unmodified lines
37603763 renderContext.setArgs(renderArgs);
37613764
37623765 bool occlusionStatus = Menu::getInstance()->isOptionChecked(MenuOption::DebugAmbientOcclusion);
3766+ bool shadowStatus = Menu::getInstance()->isOptionChecked(MenuOption::DebugShadows);
37633767 bool antialiasingStatus = Menu::getInstance()->isOptionChecked(MenuOption::Antialiasing);
37643768 bool showOwnedStatus = Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowOwned);
3765− renderContext.setOptions(occlusionStatus, antialiasingStatus, showOwnedStatus);
3769+ renderContext.setOptions(occlusionStatus, antialiasingStatus, showOwnedStatus, shadowStatus);
37663770
37673771 _renderEngine->setRenderContext(renderContext);
37683772