mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-01 10:06:40 +00:00
Code Issues Releases Wiki Activity

Move field of view setting to Camera section

Browse source
This commit is contained in:
scrawl 2015-12-07 16:23:06 +01:00
parent 136a425cec
commit 9621b66b78
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -207,7 +207,7 @@ namespace MWRender
mNearClip = Settings::Manager::getFloat("near clip", "Camera"); mNearClip = Settings::Manager::getFloat("near clip", "Camera");
mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera"); mViewDistance = Settings::Manager::getFloat("viewing distance", "Camera");
mFieldOfView = Settings::Manager::getFloat("field of view", "General"); mFieldOfView = Settings::Manager::getFloat("field of view", "Camera");
updateProjectionMatrix(); updateProjectionMatrix();
mStateUpdater->setFogEnd(mViewDistance); mStateUpdater->setFogEnd(mViewDistance);
@ -813,9 +813,9 @@ namespace MWRender
{ {
for (Settings::CategorySettingVector::const_iterator it = changed.begin(); it != changed.end(); ++it) for (Settings::CategorySettingVector::const_iterator it = changed.begin(); it != changed.end(); ++it)
{ {
if (it->first == "General" && it->second == "field of view") if (it->first == "Camera" && it->second == "field of view")
{ {
mFieldOfView = Settings::Manager::getFloat("field of view", "General"); mFieldOfView = Settings::Manager::getFloat("field of view", "Camera");
updateProjectionMatrix(); updateProjectionMatrix();
} }
else if (it->first == "Camera" && it->second == "viewing distance") else if (it->first == "Camera" && it->second == "viewing distance")

2
files/mygui/openmw_settings_window.layout
View file

@ -280,7 +280,7 @@
<Property key="Range" value="10000"/> <Property key="Range" value="10000"/>
<Property key="Page" value="300"/> <Property key="Page" value="300"/>
<UserString key="SettingType" value="Slider"/> <UserString key="SettingType" value="Slider"/>
<UserString key="SettingCategory" value="General"/> <UserString key="SettingCategory" value="Camera"/>
<UserString key="SettingName" value="field of view"/> <UserString key="SettingName" value="field of view"/>
<UserString key="SettingValueType" value="Float"/> <UserString key="SettingValueType" value="Float"/>
<UserString key="SettingMin" value="30"/> <UserString key="SettingMin" value="30"/>

6
files/settings-default.cfg
View file

@ -23,6 +23,9 @@ small feature culling = true
# can dramatically affect performance, see documentation for details. # can dramatically affect performance, see documentation for details.
viewing distance = 6666.0 viewing distance = 6666.0
# Camera field of view in degrees (e.g. 30.0 to 110.0).
field of view = 55.0
[Cells] [Cells]
# Adjacent exterior cells loaded (>0). Caution: this setting can # Adjacent exterior cells loaded (>0). Caution: this setting can
@ -99,9 +102,6 @@ show effect duration = false
# Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16). # Anisotropy reduces distortion in textures at low angles (e.g. 0 to 16).
anisotropy = 4 anisotropy = 4
# Camera field of view in degrees (e.g. 30.0 to 110.0).
field of view = 55.0
# File format for screenshots. (jpg, png, tga, and possibly more). # File format for screenshots. (jpg, png, tga, and possibly more).
screenshot format = png screenshot format = png