History

Moved getShadowEnabled out of Menu

Moved to Application

Atlante45 committed 11 years ago

Commit 488d8a01 parent df694663 files · +5 −9Browse files

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

Unified · Split

interface/src/Application.cpp+5−3
@@ -664,7 +664,7 @@ void Application::paintGL() { · 663 unmodified lines
664664 _myCamera.update(1.0f / _fps);
665665 }
666666
667− if (Menu::getInstance()->getShadowsEnabled()) {
667+ if (getShadowsEnabled()) {
668668 updateShadowMap();
669669 }
670670
@@ -2956,8 +2956,10 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom · 2285 unmodified lines
29562956 }
29572957 }
29582958
2959−bool Application::getShadowsEnabled() {
2960− return Menu::getInstance()->getShadowsEnabled();
2959+bool Application::getShadowsEnabled() {
2960+ Menu* menubar = Menu::getInstance();
2961+ return menubar->isOptionChecked(MenuOption::SimpleShadows) ||
2962+ menubar->isOptionChecked(MenuOption::CascadedShadows);
29612963 }
29622964
29632965 bool Application::getCascadeShadowsEnabled() {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t