mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 03:40:49 +00:00
Code Issues Projects Releases Wiki Activity

Remove from settings.cfg camera settings that are controlled from Lua

Browse Source
This commit is contained in:
Petr Mikheev 2022-05-21 19:49:05 +02:00
parent c548708a27
commit 65efd6f1c2
5 changed files with 3 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
apps/launcher/advancedpage.cpp
View File

@ -180,20 +180,6 @@ bool Launcher::AdvancedPage::loadSettings()
} }
} }
// Camera
{
loadSettingBool(viewOverShoulderCheckBox, "view over shoulder", "Camera");
connect(viewOverShoulderCheckBox, SIGNAL(toggled(bool)), this, SLOT(slotViewOverShoulderToggled(bool)));
viewOverShoulderVerticalLayout->setEnabled(viewOverShoulderCheckBox->checkState());
loadSettingBool(autoSwitchShoulderCheckBox, "auto switch shoulder", "Camera");
loadSettingBool(previewIfStandStillCheckBox, "preview if stand still", "Camera");
loadSettingBool(deferredPreviewRotationCheckBox, "deferred preview rotation", "Camera");
loadSettingBool(headBobbingCheckBox, "head bobbing", "Camera");
defaultShoulderComboBox->setCurrentIndex(
Settings::Manager::getVector2("view over shoulder offset", "Camera").x() >= 0 ? 0 : 1);
}
// Interface Changes // Interface Changes
{ {
loadSettingBool(showEffectDurationCheckBox, "show effect duration", "Game"); loadSettingBool(showEffectDurationCheckBox, "show effect duration", "Game");
@ -350,25 +336,6 @@ void Launcher::AdvancedPage::saveSettings()
} }
} }
// Camera
{
saveSettingBool(viewOverShoulderCheckBox, "view over shoulder", "Camera");
saveSettingBool(autoSwitchShoulderCheckBox, "auto switch shoulder", "Camera");
saveSettingBool(previewIfStandStillCheckBox, "preview if stand still", "Camera");
saveSettingBool(deferredPreviewRotationCheckBox, "deferred preview rotation", "Camera");
saveSettingBool(headBobbingCheckBox, "head bobbing", "Camera");
osg::Vec2f shoulderOffset = Settings::Manager::getVector2("view over shoulder offset", "Camera");
if (defaultShoulderComboBox->currentIndex() != (shoulderOffset.x() >= 0 ? 0 : 1))
{
if (defaultShoulderComboBox->currentIndex() == 0)
shoulderOffset.x() = std::abs(shoulderOffset.x());
else
shoulderOffset.x() = -std::abs(shoulderOffset.x());
Settings::Manager::setVector2("view over shoulder offset", "Camera", shoulderOffset);
}
}
// Interface Changes // Interface Changes
{ {
saveSettingBool(showEffectDurationCheckBox, "show effect duration", "Game"); saveSettingBool(showEffectDurationCheckBox, "show effect duration", "Game");
@ -479,11 +446,6 @@ void Launcher::AdvancedPage::slotAnimSourcesToggled(bool checked)
} }
} }
void Launcher::AdvancedPage::slotViewOverShoulderToggled(bool checked)
{
viewOverShoulderVerticalLayout->setEnabled(viewOverShoulderCheckBox->checkState());
}
void Launcher::AdvancedPage::slotPostProcessToggled(bool checked) void Launcher::AdvancedPage::slotPostProcessToggled(bool checked)
{ {
postprocessLiveReloadCheckBox->setEnabled(checked); postprocessLiveReloadCheckBox->setEnabled(checked);

1
apps/launcher/advancedpage.hpp
View File

@ -29,7 +29,6 @@ namespace Launcher
void on_skipMenuCheckBox_stateChanged(int state); void on_skipMenuCheckBox_stateChanged(int state);
void on_runScriptAfterStartupBrowseButton_clicked(); void on_runScriptAfterStartupBrowseButton_clicked();
void slotAnimSourcesToggled(bool checked); void slotAnimSourcesToggled(bool checked);
void slotViewOverShoulderToggled(bool checked);
void slotPostProcessToggled(bool checked); void slotPostProcessToggled(bool checked);
private: private:

135
docs/source/reference/modding/settings/camera.rst
View File

@ -1,6 +1,9 @@
Camera Settings Camera Settings
############### ###############
.. note::
Some camera settings are available only in the in-game settings menu. See the tab "Scripts/OpenMW Camera".
near clip near clip
--------- ---------
@ -103,138 +106,6 @@ while small values can result in the hands not being visible.
This setting can only be configured by editing the settings configuration file. This setting can only be configured by editing the settings configuration file.
third person camera distance
----------------------------
:Type: floating point
:Range: 30-800
:Default: 192.0
Distance from the camera to the character in third person mode.
This setting can be changed in game using "Zoom In" / "Zoom Out" controls.
view over shoulder
------------------
:Type: boolean
:Range: True/False
:Default: False
This setting controls third person view mode.
False: View is centered on the character's head. Crosshair is hidden.
True: In non-combat mode camera is positioned behind the character's shoulder. Crosshair is visible in third person mode as well.
This setting can be controlled in Advanced tab of the launcher.
view over shoulder offset
-------------------------
:Type: 2D vector floating point
:Range: Any
:Default: 30 -10
This setting makes sense only if 'view over shoulder' is enabled. Controls horizontal (first number) and vertical (second number) offset of the camera in third person mode.
Recommened values: 30 -10 for the right shoulder, -30 -10 for the left shoulder.
This setting can only be configured by editing the settings configuration file.
auto switch shoulder
--------------------
:Type: boolean
:Range: True/False
:Default: True
This setting makes difference only in third person mode if 'view over shoulder' is enabled.
When player is close to an obstacle, automatically switches camera to the shoulder that is farther away from the obstacle.
This setting can be controlled in Advanced tab of the launcher.
zoom out when move coef
-----------------------
:Type: floating point
:Range: Any
:Default: 20
This setting makes difference only in third person mode if 'view over shoulder' is enabled.
Slightly pulls camera away (or closer in case of negative value) when the character moves. To disable set it to zero.
This setting can only be configured by editing the settings configuration file.
preview if stand still
----------------------
:Type: boolean
:Range: True/False
:Default: False
Makes difference only in third person mode.
If enabled then the character rotation is not synchonized with the camera rotation while the character doesn't move and not in combat mode.
This setting can be controlled in Advanced tab of the launcher.
deferred preview rotation
-------------------------
:Type: boolean
:Range: True/False
:Default: True
Makes difference only in third person mode.
If enabled then the character smoothly rotates to the view direction after exiting preview or vanity mode.
If disabled then the camera rotates rather than the character.
This setting can be controlled in Advanced tab of the launcher.
head bobbing
------------
:Type: boolean
:Range: True/False
:Default: False
Enables head bobbing when move in first person mode.
This setting can be controlled in Advanced tab of the launcher.
head bobbing step
-----------------
:Type: floating point
:Range: >0
:Default: 90.0
Makes diffence only in first person mode if 'head bobbing' is enabled.
Length of each step.
This setting can only be configured by editing the settings configuration file.
head bobbing height
-------------------
:Type: floating point
:Range: Any
:Default: 3.0
Makes diffence only in first person mode if 'head bobbing' is enabled.
Amplitude of the head bobbing.
This setting can only be configured by editing the settings configuration file.
head bobbing roll
-----------------
:Type: floating point
:Range: 0-90
:Default: 0.2
Makes diffence only in first person mode if 'head bobbing' is enabled.
Maximum roll angle in degrees.
This setting can only be configured by editing the settings configuration file.
reverse z reverse z
--------- ---------

33
files/settings-default.cfg
View File

@ -26,39 +26,6 @@ field of view = 60.0
# Best to leave this at the default since vanilla assets are not complete enough to adapt to high FoV's. Too low FoV would clip the hands off screen. # Best to leave this at the default since vanilla assets are not complete enough to adapt to high FoV's. Too low FoV would clip the hands off screen.
first person field of view = 60.0 first person field of view = 60.0
# Distance from the camera to the character in third person mode.
third person camera distance = 192
# If enabled then third person camera is positioned above character's shoulder and crosshair is visible.
view over shoulder = false
# Makes sense only if 'view over shoulder' is true. First number is horizontal offset (negative value means offset to the left), second number is vertical offset.
view over shoulder offset = 30 -10
# Switch shoulder automatically when player is close to an obstacle.
auto switch shoulder = true
# Slightly pulls camera away when the character moves. Works only in 'view over shoulder' mode. Set to 0 to disable.
zoom out when move coef = 20
# Automatically enable preview mode when player doesn't move.
preview if stand still = false
# Rotate the character to the view direction after exiting preview mode.
deferred preview rotation = true
# Enables head bobbing in first person mode
head bobbing = false
# Length of each step
head bobbing step = 90.0
# Amplitude of the bobbing effect
head bobbing height = 3.0
# Maximum camera roll angle (degrees)
head bobbing roll = 0.2
# Reverse the depth range, reduces z-fighting of distant objects and terrain # Reverse the depth range, reduces z-fighting of distant objects and terrain
reverse z = true reverse z = true

141
files/ui/advancedpage.ui
View File

@ -827,147 +827,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="cameraSettings">
<attribute name="title">
<string>Camera</string>
</attribute>
<layout class="QVBoxLayout">
<item>
<widget class="QCheckBox" name="viewOverShoulderCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This setting controls third person view mode.&lt;/p&gt;&lt;p&gt;False: View is centered on the character's head. Crosshair is hidden.
True: In non-combat mode camera is positioned behind the character's shoulder. Crosshair is visible in third person mode as well.
&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>View over the shoulder</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="autoSwitchShoulderCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When player is close to an obstacle, automatically switches camera to the shoulder that is farther away from the obstacle.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Auto switch shoulder</string>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="viewOverShoulderVerticalLayout">
<property name="leftMargin">
<number>20</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="defaultShoulderHorizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="defaultShoulderLabel">
<property name="text">
<string>Default shoulder:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="defaultShoulderComboBox">
<property name="currentIndex">
<number>0</number>
</property>
<item>
<property name="text">
<string>Right</string>
</property>
</item>
<item>
<property name="text">
<string>Left</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="previewIfStandStillCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled then the character rotation is not synchonized with the camera rotation while the character doesn't move and not in combat mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Preview if stand still</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="deferredPreviewRotationCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled then the character smoothly rotates to the view direction after exiting preview or vanity mode. If disabled then the camera rotates rather than the character.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Deferred preview rotation</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="headBobbingCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables head bobbing when move in first person mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Head bobbing in 1st person mode</string>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="Interface"> <widget class="QWidget" name="Interface">
<attribute name="title"> <attribute name="title">
<string>Interface</string> <string>Interface</string>