Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 10:49:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved getShadowEnabled out of Menu

Browse source 
Moved to Application
This commit is contained in:
Atlante45 2015-01-18 05:52:19 -08:00
parent df69466887
commit 488d8a03d5
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -664,7 +664,7 @@ void Application::paintGL() {
_myCamera.update(1.0f / _fps); _myCamera.update(1.0f / _fps);
} }
if (Menu::getInstance()->getShadowsEnabled()) { if (getShadowsEnabled()) {
updateShadowMap(); updateShadowMap();
} }
@ -2957,7 +2957,9 @@ void Application::computeOffAxisFrustum(float& left, float& right, float& bottom
} }
bool Application::getShadowsEnabled() { bool Application::getShadowsEnabled() {
return Menu::getInstance()->getShadowsEnabled(); Menu* menubar = Menu::getInstance();
return menubar->isOptionChecked(MenuOption::SimpleShadows) ||
menubar->isOptionChecked(MenuOption::CascadedShadows);
} }
bool Application::getCascadeShadowsEnabled() { bool Application::getCascadeShadowsEnabled() {

4
interface/src/Menu.cpp
View file

@ -1090,10 +1090,6 @@ void Menu::showEditEntitiesHelp() {
InfoView::forcedShow(INFO_EDIT_ENTITIES_PATH); InfoView::forcedShow(INFO_EDIT_ENTITIES_PATH);
} }
bool Menu::getShadowsEnabled() const {
return isOptionChecked(MenuOption::SimpleShadows) || isOptionChecked(MenuOption::CascadedShadows);
}
void Menu::bumpSettings() { void Menu::bumpSettings() {
Application::getInstance()->bumpSettings(); Application::getInstance()->bumpSettings();
} }

2
interface/src/Menu.h
View file

@ -136,8 +136,6 @@ public:
const QString& getScriptsLocation() const { return _scriptsLocation; } const QString& getScriptsLocation() const { return _scriptsLocation; }
void setScriptsLocation(const QString& scriptsLocation); void setScriptsLocation(const QString& scriptsLocation);
bool getShadowsEnabled() const;
#if defined(Q_OS_MAC) || defined(Q_OS_WIN) #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
SpeechRecognizer* getSpeechRecognizer() { return &_speechRecognizer; } SpeechRecognizer* getSpeechRecognizer() { return &_speechRecognizer; }
#endif #endif