mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 22:16:58 +02:00
Remove Render > Ambient Light menu
This commit is contained in:
parent
1f9324c78f
commit
7ae9752272
4 changed files with 2 additions and 59 deletions
|
@ -3817,9 +3817,9 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup the current Zone Entity lighting and skybox
|
// Setup the current Zone Entity lighting and skybox
|
||||||
// Fixme: We need a better soution through an actual render item !!!
|
|
||||||
{
|
{
|
||||||
DependencyManager::get<DeferredLightingEffect>()->setAmbientLightMode(getRenderAmbientLight());
|
// FIXME: Use a zone setting to determine the ambient light mode
|
||||||
|
DependencyManager::get<DeferredLightingEffect>()->setAmbientLightMode(-1);
|
||||||
auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
|
auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
|
||||||
DependencyManager::get<DeferredLightingEffect>()->setGlobalLight(skyStage->getSunLight()->getDirection(), skyStage->getSunLight()->getColor(), skyStage->getSunLight()->getIntensity(), skyStage->getSunLight()->getAmbientIntensity());
|
DependencyManager::get<DeferredLightingEffect>()->setGlobalLight(skyStage->getSunLight()->getDirection(), skyStage->getSunLight()->getColor(), skyStage->getSunLight()->getIntensity(), skyStage->getSunLight()->getAmbientIntensity());
|
||||||
|
|
||||||
|
@ -4630,34 +4630,6 @@ float Application::getRenderResolutionScale() const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int Application::getRenderAmbientLight() const {
|
|
||||||
if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLightGlobal)) {
|
|
||||||
return -1;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight0)) {
|
|
||||||
return 0;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight1)) {
|
|
||||||
return 1;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight2)) {
|
|
||||||
return 2;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight3)) {
|
|
||||||
return 3;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight4)) {
|
|
||||||
return 4;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight5)) {
|
|
||||||
return 5;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight6)) {
|
|
||||||
return 6;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight7)) {
|
|
||||||
return 7;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight8)) {
|
|
||||||
return 8;
|
|
||||||
} else if (Menu::getInstance()->isOptionChecked(MenuOption::RenderAmbientLight9)) {
|
|
||||||
return 9;
|
|
||||||
} else {
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Application::notifyPacketVersionMismatch() {
|
void Application::notifyPacketVersionMismatch() {
|
||||||
if (!_notifiedPacketVersionMismatchThisDomain) {
|
if (!_notifiedPacketVersionMismatchThisDomain) {
|
||||||
_notifiedPacketVersionMismatchThisDomain = true;
|
_notifiedPacketVersionMismatchThisDomain = true;
|
||||||
|
|
|
@ -352,7 +352,6 @@ private:
|
||||||
void checkSkeleton();
|
void checkSkeleton();
|
||||||
|
|
||||||
void initializeAcceptedFiles();
|
void initializeAcceptedFiles();
|
||||||
int getRenderAmbientLight() const;
|
|
||||||
|
|
||||||
void displaySide(RenderArgs* renderArgs, Camera& whichCamera, bool selfAvatarOnly = false);
|
void displaySide(RenderArgs* renderArgs, Camera& whichCamera, bool selfAvatarOnly = false);
|
||||||
|
|
||||||
|
|
|
@ -350,22 +350,6 @@ Menu::Menu() {
|
||||||
addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::WorldAxes);
|
addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::WorldAxes);
|
||||||
addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, 0, true);
|
addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, 0, true);
|
||||||
|
|
||||||
// Developer > Render > Ambient Light
|
|
||||||
MenuWrapper* ambientLightMenu = renderOptionsMenu->addMenu(MenuOption::RenderAmbientLight);
|
|
||||||
QActionGroup* ambientLightGroup = new QActionGroup(ambientLightMenu);
|
|
||||||
ambientLightGroup->setExclusive(true);
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLightGlobal, 0, true));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight0, 0, false));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight1, 0, false));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight2, 0, false));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight3, 0, false));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight4, 0, false));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight5, 0, false));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight6, 0, false));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight7, 0, false));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight8, 0, false));
|
|
||||||
ambientLightGroup->addAction(addCheckableActionToQMenuAndActionHash(ambientLightMenu, MenuOption::RenderAmbientLight9, 0, false));
|
|
||||||
|
|
||||||
// Developer > Render > Throttle FPS If Not Focus
|
// Developer > Render > Throttle FPS If Not Focus
|
||||||
addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ThrottleFPSIfNotFocus, 0, true);
|
addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::ThrottleFPSIfNotFocus, 0, true);
|
||||||
|
|
||||||
|
|
|
@ -266,18 +266,6 @@ namespace MenuOption {
|
||||||
const QString RenderResolutionHalf = "1/2";
|
const QString RenderResolutionHalf = "1/2";
|
||||||
const QString RenderResolutionThird = "1/3";
|
const QString RenderResolutionThird = "1/3";
|
||||||
const QString RenderResolutionQuarter = "1/4";
|
const QString RenderResolutionQuarter = "1/4";
|
||||||
const QString RenderAmbientLight = "Ambient Light";
|
|
||||||
const QString RenderAmbientLightGlobal = "Global";
|
|
||||||
const QString RenderAmbientLight0 = "OLD_TOWN_SQUARE";
|
|
||||||
const QString RenderAmbientLight1 = "GRACE_CATHEDRAL";
|
|
||||||
const QString RenderAmbientLight2 = "EUCALYPTUS_GROVE";
|
|
||||||
const QString RenderAmbientLight3 = "ST_PETERS_BASILICA";
|
|
||||||
const QString RenderAmbientLight4 = "UFFIZI_GALLERY";
|
|
||||||
const QString RenderAmbientLight5 = "GALILEOS_TOMB";
|
|
||||||
const QString RenderAmbientLight6 = "VINE_STREET_KITCHEN";
|
|
||||||
const QString RenderAmbientLight7 = "BREEZEWAY";
|
|
||||||
const QString RenderAmbientLight8 = "CAMPUS_SUNSET";
|
|
||||||
const QString RenderAmbientLight9 = "FUNSTON_BEACH_SUNSET";
|
|
||||||
const QString ResetAvatarSize = "Reset Avatar Size";
|
const QString ResetAvatarSize = "Reset Avatar Size";
|
||||||
const QString ResetSensors = "Reset Sensors";
|
const QString ResetSensors = "Reset Sensors";
|
||||||
const QString RunningScripts = "Running Scripts...";
|
const QString RunningScripts = "Running Scripts...";
|
||||||
|
|
Loading…
Reference in a new issue