forked from teamnwah/openmw-tes3coop
first settings test (config file has to be created manually)
This commit is contained in:
scrawl
parent
308df7caa8
commit
6091a0504d
4 changed files with 135 additions and 122 deletions
|
|
@ -20,6 +20,7 @@
|
||||||
#include <components/esm/esm_reader.hpp>
|
#include <components/esm/esm_reader.hpp>
|
||||||
#include <components/files/fixedpath.hpp>
|
#include <components/files/fixedpath.hpp>
|
||||||
#include <components/files/configurationmanager.hpp>
|
#include <components/files/configurationmanager.hpp>
|
||||||
|
#include <components/settings/settings.hpp>
|
||||||
|
|
||||||
#include <components/nifbullet/bullet_nif_loader.hpp>
|
#include <components/nifbullet/bullet_nif_loader.hpp>
|
||||||
#include <components/nifogre/ogre_nif_loader.hpp>
|
#include <components/nifogre/ogre_nif_loader.hpp>
|
||||||
|
|
@ -313,6 +314,17 @@ void OMW::Engine::go()
|
||||||
{
|
{
|
||||||
boost::filesystem::create_directories(configPath);
|
boost::filesystem::create_directories(configPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Settings::Manager settings;
|
||||||
|
|
||||||
|
//settings.loadDefault(defaultsettingspath);
|
||||||
|
|
||||||
|
const std::string settingspath = mCfgMgr.getUserPath().string() + "/settings.cfg";
|
||||||
|
if (boost::filesystem::exists(settingspath))
|
||||||
|
settings.loadUser(settingspath);
|
||||||
|
else
|
||||||
|
settings.copyDefaultToUserSettings();
|
||||||
|
|
||||||
mOgre->configure(!boost::filesystem::is_regular_file(mCfgMgr.getOgreConfigPath()),
|
mOgre->configure(!boost::filesystem::is_regular_file(mCfgMgr.getOgreConfigPath()),
|
||||||
mCfgMgr.getOgreConfigPath().string(),
|
mCfgMgr.getOgreConfigPath().string(),
|
||||||
mCfgMgr.getLogPath().string(),
|
mCfgMgr.getLogPath().string(),
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#include "ogre_nif_loader.hpp"
|
#include "ogre_nif_loader.hpp"
|
||||||
|
|
||||||
|
#include <components/settings/settings.hpp>
|
||||||
|
|
||||||
typedef unsigned char ubyte;
|
typedef unsigned char ubyte;
|
||||||
|
|
||||||
|
|
@ -299,138 +300,136 @@ void NIFLoader::createMaterial(const String &name,
|
||||||
material->setSelfIllumination(emissive.array[0], emissive.array[1], emissive.array[2]);
|
material->setSelfIllumination(emissive.array[0], emissive.array[1], emissive.array[2]);
|
||||||
material->setShininess(glossiness);
|
material->setShininess(glossiness);
|
||||||
|
|
||||||
// Create shader for the material
|
if (Settings::Manager::getBool("shaders", "Objects"))
|
||||||
// vertex
|
|
||||||
HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
|
|
||||||
|
|
||||||
HighLevelGpuProgramPtr vertex;
|
|
||||||
if (mgr.getByName("main_vp").isNull())
|
|
||||||
{
|
{
|
||||||
vertex = mgr.createProgram("main_vp", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
|
// Create shader for the material
|
||||||
"cg", GPT_VERTEX_PROGRAM);
|
// vertex
|
||||||
vertex->setParameter("profiles", "vs_4_0 vs_2_x vp40 arbvp1");
|
HighLevelGpuProgramManager& mgr = HighLevelGpuProgramManager::getSingleton();
|
||||||
vertex->setParameter("entry_point", "main_vp");
|
|
||||||
StringUtil::StrStreamType outStream;
|
|
||||||
outStream <<
|
|
||||||
"void main_vp( \n"
|
|
||||||
" float4 position : POSITION, \n"
|
|
||||||
" float4 normal : NORMAL, \n"
|
|
||||||
" float4 colour : COLOR, \n"
|
|
||||||
" in float2 uv : TEXCOORD0, \n"
|
|
||||||
" out float2 oUV : TEXCOORD0, \n"
|
|
||||||
" out float4 oPosition : POSITION, \n"
|
|
||||||
" out float4 oPositionObjSpace : TEXCOORD1, \n"
|
|
||||||
" out float4 oNormal : TEXCOORD2, \n"
|
|
||||||
" out float oFogValue : TEXCOORD3, \n"
|
|
||||||
" out float4 oVertexColour : TEXCOORD4, \n"
|
|
||||||
" uniform float4 fogParams, \n"
|
|
||||||
" uniform float4x4 worldViewProj \n"
|
|
||||||
") \n"
|
|
||||||
"{ \n"
|
|
||||||
" oVertexColour = colour; \n"
|
|
||||||
" oUV = uv; \n"
|
|
||||||
" oNormal = normal; \n"
|
|
||||||
" oPosition = mul( worldViewProj, position ); \n"
|
|
||||||
" oFogValue = saturate((oPosition.z - fogParams.y) * fogParams.w); \n"
|
|
||||||
" oPositionObjSpace = position; \n"
|
|
||||||
"}";
|
|
||||||
vertex->setSource(outStream.str());
|
|
||||||
vertex->load();
|
|
||||||
vertex->getDefaultParameters()->setNamedAutoConstant("worldViewProj", GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);
|
|
||||||
vertex->getDefaultParameters()->setNamedAutoConstant("fogParams", GpuProgramParameters::ACT_FOG_PARAMS);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
vertex = mgr.getByName("main_vp");
|
|
||||||
material->getTechnique(0)->getPass(0)->setVertexProgram(vertex->getName());
|
|
||||||
|
|
||||||
// the number of lights to support.
|
HighLevelGpuProgramPtr vertex;
|
||||||
// when rendering an object, OGRE automatically picks the lights that are
|
if (mgr.getByName("main_vp").isNull())
|
||||||
// closest to the object being rendered. unfortunately this mechanism does
|
|
||||||
// not work perfectly for objects batched together (they will all use the same
|
|
||||||
// lights). to work around this, we are simply pushing the maximum number
|
|
||||||
// of lights here in order to minimize disappearing lights.
|
|
||||||
float num_lights;
|
|
||||||
if (GpuProgramManager::getSingleton().isSyntaxSupported("fp40") ||
|
|
||||||
GpuProgramManager::getSingleton().isSyntaxSupported("ps_4_0"))
|
|
||||||
num_lights = 8 /* 32 */;
|
|
||||||
else
|
|
||||||
num_lights = 8;
|
|
||||||
|
|
||||||
// fragment
|
|
||||||
HighLevelGpuProgramPtr fragment;
|
|
||||||
if (mgr.getByName("main_fp").isNull())
|
|
||||||
{
|
|
||||||
fragment = mgr.createProgram("main_fp", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
|
|
||||||
"cg", GPT_FRAGMENT_PROGRAM);
|
|
||||||
fragment->setParameter("profiles", "ps_4_0 ps_2_x fp40 arbfp1");
|
|
||||||
fragment->setParameter("entry_point", "main_fp");
|
|
||||||
StringUtil::StrStreamType outStream;
|
|
||||||
outStream <<
|
|
||||||
"void main_fp( \n"
|
|
||||||
" in float2 uv : TEXCOORD0, \n"
|
|
||||||
" out float4 oColor : COLOR, \n"
|
|
||||||
" uniform sampler2D texture : TEXUNIT0, \n"
|
|
||||||
" float4 positionObjSpace : TEXCOORD1, \n"
|
|
||||||
" float4 normal : TEXCOORD2, \n"
|
|
||||||
" float fogValue : TEXCOORD3, \n"
|
|
||||||
" float4 vertexColour : TEXCOORD4, \n"
|
|
||||||
" uniform float4 fogColour, \n";
|
|
||||||
|
|
||||||
for (int i=0; i<num_lights; ++i)
|
|
||||||
{
|
{
|
||||||
|
vertex = mgr.createProgram("main_vp", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
|
||||||
|
"cg", GPT_VERTEX_PROGRAM);
|
||||||
|
vertex->setParameter("profiles", "vs_4_0 vs_2_x vp40 arbvp1");
|
||||||
|
vertex->setParameter("entry_point", "main_vp");
|
||||||
|
StringUtil::StrStreamType outStream;
|
||||||
outStream <<
|
outStream <<
|
||||||
" uniform float4 lightDiffuse"<<i<<", \n"
|
"void main_vp( \n"
|
||||||
" uniform float4 lightPositionObjSpace"<<i<<", \n"
|
" float4 position : POSITION, \n"
|
||||||
" uniform float4 lightAttenuation"<<i<<", \n";
|
" float4 normal : NORMAL, \n"
|
||||||
|
" float4 colour : COLOR, \n"
|
||||||
|
" in float2 uv : TEXCOORD0, \n"
|
||||||
|
" out float2 oUV : TEXCOORD0, \n"
|
||||||
|
" out float4 oPosition : POSITION, \n"
|
||||||
|
" out float4 oPositionObjSpace : TEXCOORD1, \n"
|
||||||
|
" out float4 oNormal : TEXCOORD2, \n"
|
||||||
|
" out float oFogValue : TEXCOORD3, \n"
|
||||||
|
" out float4 oVertexColour : TEXCOORD4, \n"
|
||||||
|
" uniform float4 fogParams, \n"
|
||||||
|
" uniform float4x4 worldViewProj \n"
|
||||||
|
") \n"
|
||||||
|
"{ \n"
|
||||||
|
" oVertexColour = colour; \n"
|
||||||
|
" oUV = uv; \n"
|
||||||
|
" oNormal = normal; \n"
|
||||||
|
" oPosition = mul( worldViewProj, position ); \n"
|
||||||
|
" oFogValue = saturate((oPosition.z - fogParams.y) * fogParams.w); \n"
|
||||||
|
" oPositionObjSpace = position; \n"
|
||||||
|
"}";
|
||||||
|
vertex->setSource(outStream.str());
|
||||||
|
vertex->load();
|
||||||
|
vertex->getDefaultParameters()->setNamedAutoConstant("worldViewProj", GpuProgramParameters::ACT_WORLDVIEWPROJ_MATRIX);
|
||||||
|
vertex->getDefaultParameters()->setNamedAutoConstant("fogParams", GpuProgramParameters::ACT_FOG_PARAMS);
|
||||||
}
|
}
|
||||||
outStream <<
|
else
|
||||||
" uniform float4 lightAmbient, \n"
|
vertex = mgr.getByName("main_vp");
|
||||||
" uniform float4 ambient, \n"
|
material->getTechnique(0)->getPass(0)->setVertexProgram(vertex->getName());
|
||||||
" uniform float4 diffuse, \n"
|
|
||||||
" uniform float4 emissive \n"
|
// the number of lights to support.
|
||||||
") \n"
|
// when rendering an object, OGRE automatically picks the lights that are
|
||||||
"{ \n"
|
// closest to the object being rendered. unfortunately this mechanism does
|
||||||
" float4 tex = tex2D(texture, uv); \n"
|
// not work perfectly for objects batched together (they will all use the same
|
||||||
" float d; \n"
|
// lights). to work around this, we are simply pushing the maximum number
|
||||||
" float attn; \n"
|
// of lights here in order to minimize disappearing lights.
|
||||||
" float3 lightColour = float3(0, 0, 0); \n";
|
int num_lights = Settings::Manager::getInt("num lights", "Objects");
|
||||||
|
|
||||||
for (int i=0; i<num_lights; ++i)
|
// fragment
|
||||||
|
HighLevelGpuProgramPtr fragment;
|
||||||
|
if (mgr.getByName("main_fp").isNull())
|
||||||
{
|
{
|
||||||
|
fragment = mgr.createProgram("main_fp", ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME,
|
||||||
|
"cg", GPT_FRAGMENT_PROGRAM);
|
||||||
|
fragment->setParameter("profiles", "ps_4_0 ps_2_x fp40 arbfp1");
|
||||||
|
fragment->setParameter("entry_point", "main_fp");
|
||||||
|
StringUtil::StrStreamType outStream;
|
||||||
outStream <<
|
outStream <<
|
||||||
" float3 lightDir"<<i<<" = lightPositionObjSpace"<<i<<".xyz - (positionObjSpace.xyz * lightPositionObjSpace"<<i<<".w); \n"
|
"void main_fp( \n"
|
||||||
|
" in float2 uv : TEXCOORD0, \n"
|
||||||
|
" out float4 oColor : COLOR, \n"
|
||||||
|
" uniform sampler2D texture : TEXUNIT0, \n"
|
||||||
|
" float4 positionObjSpace : TEXCOORD1, \n"
|
||||||
|
" float4 normal : TEXCOORD2, \n"
|
||||||
|
" float fogValue : TEXCOORD3, \n"
|
||||||
|
" float4 vertexColour : TEXCOORD4, \n"
|
||||||
|
" uniform float4 fogColour, \n";
|
||||||
|
|
||||||
// pre-multiply light color with attenuation factor
|
for (int i=0; i<num_lights; ++i)
|
||||||
" d = length( lightDir"<<i<<" ); \n"
|
{
|
||||||
" attn = ( 1.0 / (( lightAttenuation"<<i<<".y ) + ( lightAttenuation"<<i<<".z * d ) + ( lightAttenuation"<<i<<".w * d * d ))); \n"
|
outStream <<
|
||||||
" lightDiffuse"<<i<<" *= attn; \n"
|
" uniform float4 lightDiffuse"<<i<<", \n"
|
||||||
|
" uniform float4 lightPositionObjSpace"<<i<<", \n"
|
||||||
|
" uniform float4 lightAttenuation"<<i<<", \n";
|
||||||
|
}
|
||||||
|
outStream <<
|
||||||
|
" uniform float4 lightAmbient, \n"
|
||||||
|
" uniform float4 ambient, \n"
|
||||||
|
" uniform float4 diffuse, \n"
|
||||||
|
" uniform float4 emissive \n"
|
||||||
|
") \n"
|
||||||
|
"{ \n"
|
||||||
|
" float4 tex = tex2D(texture, uv); \n"
|
||||||
|
" float d; \n"
|
||||||
|
" float attn; \n"
|
||||||
|
" float3 lightColour = float3(0, 0, 0); \n";
|
||||||
|
|
||||||
|
for (int i=0; i<num_lights; ++i)
|
||||||
|
{
|
||||||
|
outStream <<
|
||||||
|
" float3 lightDir"<<i<<" = lightPositionObjSpace"<<i<<".xyz - (positionObjSpace.xyz * lightPositionObjSpace"<<i<<".w); \n"
|
||||||
|
|
||||||
" lightColour.xyz += lit(dot(normalize(lightDir"<<i<<"), normalize(normal)), 0, 0).y * lightDiffuse"<<i<<".xyz;\n";
|
// pre-multiply light color with attenuation factor
|
||||||
|
" d = length( lightDir"<<i<<" ); \n"
|
||||||
|
" attn = ( 1.0 / (( lightAttenuation"<<i<<".y ) + ( lightAttenuation"<<i<<".z * d ) + ( lightAttenuation"<<i<<".w * d * d ))); \n"
|
||||||
|
" lightDiffuse"<<i<<" *= attn; \n"
|
||||||
|
|
||||||
|
" lightColour.xyz += lit(dot(normalize(lightDir"<<i<<"), normalize(normal)), 0, 0).y * lightDiffuse"<<i<<".xyz;\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
outStream <<
|
||||||
|
" float3 lightingFinal = lightColour.xyz * diffuse.xyz * vertexColour.xyz + ambient.xyz * lightAmbient.xyz + emissive.xyz; \n"
|
||||||
|
" oColor.xyz = lerp(lightingFinal * tex.xyz, fogColour, fogValue); \n"
|
||||||
|
" oColor.a = tex.a * diffuse.a * vertexColour.a; \n"
|
||||||
|
"}";
|
||||||
|
fragment->setSource(outStream.str());
|
||||||
|
fragment->load();
|
||||||
|
|
||||||
|
for (int i=0; i<num_lights; ++i)
|
||||||
|
{
|
||||||
|
fragment->getDefaultParameters()->setNamedAutoConstant("lightPositionObjSpace"+StringConverter::toString(i), GpuProgramParameters::ACT_LIGHT_POSITION_OBJECT_SPACE, i);
|
||||||
|
fragment->getDefaultParameters()->setNamedAutoConstant("lightDiffuse"+StringConverter::toString(i), GpuProgramParameters::ACT_LIGHT_DIFFUSE_COLOUR, i);
|
||||||
|
fragment->getDefaultParameters()->setNamedAutoConstant("lightAttenuation"+StringConverter::toString(i), GpuProgramParameters::ACT_LIGHT_ATTENUATION, i);
|
||||||
|
}
|
||||||
|
fragment->getDefaultParameters()->setNamedAutoConstant("emissive", GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR);
|
||||||
|
fragment->getDefaultParameters()->setNamedAutoConstant("diffuse", GpuProgramParameters::ACT_SURFACE_DIFFUSE_COLOUR);
|
||||||
|
fragment->getDefaultParameters()->setNamedAutoConstant("ambient", GpuProgramParameters::ACT_SURFACE_AMBIENT_COLOUR);
|
||||||
|
fragment->getDefaultParameters()->setNamedAutoConstant("lightAmbient", GpuProgramParameters::ACT_AMBIENT_LIGHT_COLOUR);
|
||||||
|
fragment->getDefaultParameters()->setNamedAutoConstant("fogColour", GpuProgramParameters::ACT_FOG_COLOUR);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
outStream <<
|
fragment = mgr.getByName("main_fp");
|
||||||
" float3 lightingFinal = lightColour.xyz * diffuse.xyz * vertexColour.xyz + ambient.xyz * lightAmbient.xyz + emissive.xyz; \n"
|
material->getTechnique(0)->getPass(0)->setFragmentProgram(fragment->getName());
|
||||||
" oColor.xyz = lerp(lightingFinal * tex.xyz, fogColour, fogValue); \n"
|
|
||||||
" oColor.a = tex.a * diffuse.a * vertexColour.a; \n"
|
|
||||||
"}";
|
|
||||||
fragment->setSource(outStream.str());
|
|
||||||
fragment->load();
|
|
||||||
|
|
||||||
for (int i=0; i<num_lights; ++i)
|
|
||||||
{
|
|
||||||
fragment->getDefaultParameters()->setNamedAutoConstant("lightPositionObjSpace"+StringConverter::toString(i), GpuProgramParameters::ACT_LIGHT_POSITION_OBJECT_SPACE, i);
|
|
||||||
fragment->getDefaultParameters()->setNamedAutoConstant("lightDiffuse"+StringConverter::toString(i), GpuProgramParameters::ACT_LIGHT_DIFFUSE_COLOUR, i);
|
|
||||||
fragment->getDefaultParameters()->setNamedAutoConstant("lightAttenuation"+StringConverter::toString(i), GpuProgramParameters::ACT_LIGHT_ATTENUATION, i);
|
|
||||||
}
|
|
||||||
fragment->getDefaultParameters()->setNamedAutoConstant("emissive", GpuProgramParameters::ACT_SURFACE_EMISSIVE_COLOUR);
|
|
||||||
fragment->getDefaultParameters()->setNamedAutoConstant("diffuse", GpuProgramParameters::ACT_SURFACE_DIFFUSE_COLOUR);
|
|
||||||
fragment->getDefaultParameters()->setNamedAutoConstant("ambient", GpuProgramParameters::ACT_SURFACE_AMBIENT_COLOUR);
|
|
||||||
fragment->getDefaultParameters()->setNamedAutoConstant("lightAmbient", GpuProgramParameters::ACT_AMBIENT_LIGHT_COLOUR);
|
|
||||||
fragment->getDefaultParameters()->setNamedAutoConstant("fogColour", GpuProgramParameters::ACT_FOG_COLOUR);
|
|
||||||
}
|
}
|
||||||
else
|
|
||||||
fragment = mgr.getByName("main_fp");
|
|
||||||
material->getTechnique(0)->getPass(0)->setFragmentProgram(fragment->getName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Takes a name and adds a unique part to it. This is just used to
|
// Takes a name and adds a unique part to it. This is just used to
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,7 @@ const bool Manager::getBool (const std::string& setting, const std::string& cate
|
||||||
|
|
||||||
void Manager::setString (const std::string& setting, const std::string& category, const std::string& value)
|
void Manager::setString (const std::string& setting, const std::string& category, const std::string& value)
|
||||||
{
|
{
|
||||||
|
bool found=false;
|
||||||
Ogre::ConfigFile::SettingsIterator it = mFile.getSettingsIterator(category);
|
Ogre::ConfigFile::SettingsIterator it = mFile.getSettingsIterator(category);
|
||||||
while (it.hasMoreElements())
|
while (it.hasMoreElements())
|
||||||
{
|
{
|
||||||
|
|
@ -82,10 +83,12 @@ void Manager::setString (const std::string& setting, const std::string& category
|
||||||
{
|
{
|
||||||
mChangedSettings.push_back(std::make_pair(setting, category));
|
mChangedSettings.push_back(std::make_pair(setting, category));
|
||||||
(*i).second = value;
|
(*i).second = value;
|
||||||
|
found = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
it.getNext();
|
it.getNext();
|
||||||
}
|
}
|
||||||
|
assert(found && "Attempting to change a non-existing setting");
|
||||||
}
|
}
|
||||||
|
|
||||||
void Manager::setInt (const std::string& setting, const std::string& category, const int value)
|
void Manager::setInt (const std::string& setting, const std::string& category, const int value)
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,6 @@ namespace Settings
|
||||||
class Manager
|
class Manager
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
static Ogre::ConfigFile mFile;
|
static Ogre::ConfigFile mFile;
|
||||||
static Ogre::ConfigFile mDefaultFile;
|
static Ogre::ConfigFile mDefaultFile;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue