Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg
Conflicts: apps/openmw/main.cppactorid
Sebastian Wick
13 years ago
commit
57ae1bdc43
@ -0,0 +1,158 @@
|
|||||||
|
#include "settings.hpp"
|
||||||
|
|
||||||
|
#include <fstream>
|
||||||
|
|
||||||
|
#include <OgreResourceGroupManager.h>
|
||||||
|
#include <OgreStringConverter.h>
|
||||||
|
|
||||||
|
using namespace Settings;
|
||||||
|
|
||||||
|
Ogre::ConfigFile Manager::mFile = Ogre::ConfigFile();
|
||||||
|
Ogre::ConfigFile Manager::mDefaultFile = Ogre::ConfigFile();
|
||||||
|
CategorySettingVector Manager::mChangedSettings = CategorySettingVector();
|
||||||
|
CategorySettingValueMap Manager::mNewSettings = CategorySettingValueMap();
|
||||||
|
|
||||||
|
void Manager::loadUser (const std::string& file)
|
||||||
|
{
|
||||||
|
mFile.load(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Manager::loadDefault (const std::string& file)
|
||||||
|
{
|
||||||
|
mDefaultFile.load(file);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Manager::saveUser(const std::string& file)
|
||||||
|
{
|
||||||
|
std::fstream fout(file.c_str(), std::ios::out);
|
||||||
|
|
||||||
|
Ogre::ConfigFile::SectionIterator seci = mFile.getSectionIterator();
|
||||||
|
|
||||||
|
while (seci.hasMoreElements())
|
||||||
|
{
|
||||||
|
Ogre::String sectionName = seci.peekNextKey();
|
||||||
|
|
||||||
|
if (sectionName.length() > 0)
|
||||||
|
fout << '\n' << '[' << seci.peekNextKey() << ']' << '\n';
|
||||||
|
|
||||||
|
Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
|
||||||
|
Ogre::ConfigFile::SettingsMultiMap::iterator i;
|
||||||
|
for (i = settings->begin(); i != settings->end(); ++i)
|
||||||
|
{
|
||||||
|
fout << i->first.c_str() << " = " << i->second.c_str() << '\n';
|
||||||
|
}
|
||||||
|
|
||||||
|
CategorySettingValueMap::iterator it = mNewSettings.begin();
|
||||||
|
while (it != mNewSettings.end())
|
||||||
|
{
|
||||||
|
if (it->first.first == sectionName)
|
||||||
|
{
|
||||||
|
fout << it->first.second << " = " << it->second << '\n';
|
||||||
|
mNewSettings.erase(it++);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
++it;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string category = "";
|
||||||
|
for (CategorySettingValueMap::iterator it = mNewSettings.begin();
|
||||||
|
it != mNewSettings.end(); ++it)
|
||||||
|
{
|
||||||
|
if (category != it->first.first)
|
||||||
|
{
|
||||||
|
category = it->first.first;
|
||||||
|
fout << '\n' << '[' << category << ']' << '\n';
|
||||||
|
}
|
||||||
|
fout << it->first.second << " = " << it->second << '\n';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const std::string Manager::getString (const std::string& setting, const std::string& category)
|
||||||
|
{
|
||||||
|
if (mNewSettings.find(std::make_pair(category, setting)) != mNewSettings.end())
|
||||||
|
return mNewSettings[std::make_pair(category, setting)];
|
||||||
|
|
||||||
|
std::string defaultval = mDefaultFile.getSetting(setting, category);
|
||||||
|
return mFile.getSetting(setting, category, defaultval);
|
||||||
|
}
|
||||||
|
|
||||||
|
const float Manager::getFloat (const std::string& setting, const std::string& category)
|
||||||
|
{
|
||||||
|
return Ogre::StringConverter::parseReal( getString(setting, category) );
|
||||||
|
}
|
||||||
|
|
||||||
|
const int Manager::getInt (const std::string& setting, const std::string& category)
|
||||||
|
{
|
||||||
|
return Ogre::StringConverter::parseInt( getString(setting, category) );
|
||||||
|
}
|
||||||
|
|
||||||
|
const bool Manager::getBool (const std::string& setting, const std::string& category)
|
||||||
|
{
|
||||||
|
return Ogre::StringConverter::parseBool( getString(setting, category) );
|
||||||
|
}
|
||||||
|
|
||||||
|
void Manager::setString (const std::string& setting, const std::string& category, const std::string& value)
|
||||||
|
{
|
||||||
|
CategorySetting s = std::make_pair(category, setting);
|
||||||
|
|
||||||
|
bool found=false;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Ogre::ConfigFile::SettingsIterator it = mFile.getSettingsIterator(category);
|
||||||
|
while (it.hasMoreElements())
|
||||||
|
{
|
||||||
|
Ogre::ConfigFile::SettingsMultiMap::iterator i = it.current();
|
||||||
|
|
||||||
|
if ((*i).first == setting)
|
||||||
|
{
|
||||||
|
if ((*i).second != value)
|
||||||
|
{
|
||||||
|
mChangedSettings.push_back(std::make_pair(category, setting));
|
||||||
|
(*i).second = value;
|
||||||
|
}
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
it.getNext();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Ogre::Exception&)
|
||||||
|
{}
|
||||||
|
|
||||||
|
if (!found)
|
||||||
|
{
|
||||||
|
if (mNewSettings.find(s) != mNewSettings.end())
|
||||||
|
{
|
||||||
|
if (mNewSettings[s] != value)
|
||||||
|
{
|
||||||
|
mChangedSettings.push_back(std::make_pair(category, setting));
|
||||||
|
mNewSettings[s] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
mNewSettings[s] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void Manager::setInt (const std::string& setting, const std::string& category, const int value)
|
||||||
|
{
|
||||||
|
setString(setting, category, Ogre::StringConverter::toString(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
void Manager::setFloat (const std::string& setting, const std::string& category, const float value)
|
||||||
|
{
|
||||||
|
setString(setting, category, Ogre::StringConverter::toString(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
void Manager::setBool (const std::string& setting, const std::string& category, const bool value)
|
||||||
|
{
|
||||||
|
setString(setting, category, Ogre::StringConverter::toString(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
const CategorySettingVector Manager::apply()
|
||||||
|
{
|
||||||
|
CategorySettingVector vec = mChangedSettings;
|
||||||
|
mChangedSettings.clear();
|
||||||
|
return vec;
|
||||||
|
}
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
#ifndef _COMPONENTS_SETTINGS_H
|
||||||
|
#define _COMPONENTS_SETTINGS_H
|
||||||
|
|
||||||
|
#include <OgreConfigFile.h>
|
||||||
|
|
||||||
|
namespace Settings
|
||||||
|
{
|
||||||
|
typedef std::pair < std::string, std::string > CategorySetting;
|
||||||
|
typedef std::vector< std::pair<std::string, std::string> > CategorySettingVector;
|
||||||
|
typedef std::map < CategorySetting, std::string > CategorySettingValueMap;
|
||||||
|
|
||||||
|
///
|
||||||
|
/// \brief Settings management (can change during runtime)
|
||||||
|
///
|
||||||
|
class Manager
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
static Ogre::ConfigFile mFile;
|
||||||
|
static Ogre::ConfigFile mDefaultFile;
|
||||||
|
|
||||||
|
static CategorySettingVector mChangedSettings;
|
||||||
|
///< tracks all the settings that were changed since the last apply() call
|
||||||
|
|
||||||
|
static CategorySettingValueMap mNewSettings;
|
||||||
|
///< tracks all the settings that are in the default file, but not in user file yet
|
||||||
|
|
||||||
|
void loadDefault (const std::string& file);
|
||||||
|
///< load file as the default settings (can be overridden by user settings)
|
||||||
|
|
||||||
|
void loadUser (const std::string& file);
|
||||||
|
///< load file as user settings
|
||||||
|
|
||||||
|
void saveUser (const std::string& file);
|
||||||
|
///< save user settings to file
|
||||||
|
|
||||||
|
static const CategorySettingVector apply();
|
||||||
|
///< returns the list of changed settings and then clears it
|
||||||
|
|
||||||
|
static const int getInt (const std::string& setting, const std::string& category);
|
||||||
|
static const float getFloat (const std::string& setting, const std::string& category);
|
||||||
|
static const std::string getString (const std::string& setting, const std::string& category);
|
||||||
|
static const bool getBool (const std::string& setting, const std::string& category);
|
||||||
|
|
||||||
|
static void setInt (const std::string& setting, const std::string& category, const int value);
|
||||||
|
static void setFloat (const std::string& setting, const std::string& category, const float value);
|
||||||
|
static void setString (const std::string& setting, const std::string& category, const std::string& value);
|
||||||
|
static void setBool (const std::string& setting, const std::string& category, const bool value);
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // _COMPONENTS_SETTINGS_H
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
[HUD]
|
||||||
|
|
||||||
|
# FPS counter
|
||||||
|
# 0: not visible
|
||||||
|
# 1: basic FPS display
|
||||||
|
# 2: advanced FPS display (batches, triangles)
|
||||||
|
fps = 0
|
||||||
|
|
||||||
|
[Objects]
|
||||||
|
|
||||||
|
shaders = true
|
||||||
|
|
||||||
|
# Max. number of lights that affect objects. Setting to 1 will only reflect sunlight
|
||||||
|
# Note: has no effect when shaders are turned off
|
||||||
|
num lights = 8
|
||||||
|
|
||||||
|
# Use static geometry for static objects. Improves rendering speed.
|
||||||
|
use static geometry = true
|
||||||
|
|
||||||
|
[Viewing distance]
|
||||||
|
|
||||||
|
# Limit the rendering distance of small objects
|
||||||
|
limit small object distance = false
|
||||||
|
|
||||||
|
# Size below which an object is considered as small
|
||||||
|
small object size = 250
|
||||||
|
|
||||||
|
# Rendering distance for small objects
|
||||||
|
small object distance = 3500
|
||||||
|
|
||||||
|
# Max viewing distance at clear weather conditions
|
||||||
|
max viewing distance = 5600
|
||||||
|
|
||||||
|
# Distance at which fog starts (proportional to viewing distance)
|
||||||
|
fog start factor = 0.5
|
||||||
|
|
||||||
|
# Distance at which fog ends (proportional to viewing distance)
|
||||||
|
fog end factor = 1.0
|
||||||
|
|
||||||
|
[Terrain]
|
||||||
|
|
||||||
|
# Max. number of lights that affect the terrain. Setting to 1 will only reflect sunlight
|
||||||
|
num lights = 8
|
||||||
Loading…
Reference in New Issue