From 5a1ce4943e7edce1e68da8f953f925b84e0b4878 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sun, 19 Oct 2014 13:41:56 +0200
Subject: [PATCH] added advance 3D rendering user settings section
---
apps/opencs/editor.cpp | 2 +-
apps/opencs/model/settings/usersettings.cpp | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index 360a7515c6..396df87cd8 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -350,7 +350,7 @@ std::auto_ptr<sh::Factory> CS::Editor::setupGraphics()
// internal setting - may be switched on or off by the use of shader configurations
sh::Factory::getInstance ().setGlobalSetting ("viewproj_fix", "false");
- std::string num_lights = mUserSettings.setting("Objects/num_lights", QString("8")).toStdString();
+ std::string num_lights = mUserSettings.setting("3d-render-adv/num_lights", QString("8")).toStdString();
sh::Factory::getInstance ().setGlobalSetting ("num_lights", num_lights);
/// \todo add more configurable shiny settings
diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
index 022d7e089d..1813a97ff7 100644
--- a/apps/opencs/model/settings/usersettings.cpp
+++ b/apps/opencs/model/settings/usersettings.cpp
@@ -63,6 +63,14 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
antialiasing->setDefaultValue (defaultValue);
}
+ declareSection ("3d-render-adv", "3D Rendering (Advanced)");
+ {
+ Setting *numLights = createSetting (Type_SpinBox, "num_lights",
+ "Number of lights per pass");
+ numLights->setDefaultValue (8);
+ numLights->setRange (1, 100);
+ }
+
declareSection ("scene-input", "Scene Input");
{
Setting *timer = createSetting (Type_SpinBox, "timer", "Input responsiveness");
@@ -142,14 +150,6 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
ritd->setDeclaredValues (values);
}
- declareSection ("Objects", "Objects");
- {
-
- Setting *numLights = createSetting (Type_SpinBox, "num_lights", "num_lights");
- numLights->setDefaultValue(8);
- numLights->setRange (0, 100);
- }
-
{
/******************************************************************
@@ -413,7 +413,7 @@ void CSMSettings::UserSettings::updateUserSetting(const QString &settingKey,
{
mSettingDefinitions->setValue (settingKey ,list);
- if(settingKey == "Objects/num_lights" && !list.empty())
+ if(settingKey == "3d-render-adv/num_lights" && !list.empty())
{
sh::Factory::getInstance ().setGlobalSetting ("num_lights", list.at(0).toStdString());
}