diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp index a5a7cab8d4..6566bd8d51 100644 --- a/apps/launcher/advancedpage.cpp +++ b/apps/launcher/advancedpage.cpp @@ -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 { 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 { 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) { postprocessLiveReloadCheckBox->setEnabled(checked); diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp index 6a3f8319d2..20b44ff9da 100644 --- a/apps/launcher/advancedpage.hpp +++ b/apps/launcher/advancedpage.hpp @@ -29,7 +29,6 @@ namespace Launcher void on_skipMenuCheckBox_stateChanged(int state); void on_runScriptAfterStartupBrowseButton_clicked(); void slotAnimSourcesToggled(bool checked); - void slotViewOverShoulderToggled(bool checked); void slotPostProcessToggled(bool checked); private: diff --git a/docs/source/reference/modding/settings/camera.rst b/docs/source/reference/modding/settings/camera.rst index fe6217b22b..5011885919 100644 --- a/docs/source/reference/modding/settings/camera.rst +++ b/docs/source/reference/modding/settings/camera.rst @@ -1,6 +1,9 @@ Camera Settings ############### +.. note:: + Some camera settings are available only in the in-game settings menu. See the tab "Scripts/OpenMW Camera". + 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. -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 --------- diff --git a/files/settings-default.cfg b/files/settings-default.cfg index da50ca5fc7..3f4446535e 100644 --- a/files/settings-default.cfg +++ b/files/settings-default.cfg @@ -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. 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 z = true diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui index 520b089965..66ebd90a80 100644 --- a/files/ui/advancedpage.ui +++ b/files/ui/advancedpage.ui @@ -827,147 +827,6 @@ - - - Camera - - - - - - <html><head/><body><p>This setting controls third person view mode.</p><p>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. -</p></body></html> - - - View over the shoulder - - - - - - - <html><head/><body><p>When player is close to an obstacle, automatically switches camera to the shoulder that is farther away from the obstacle.</p></body></html> - - - Auto switch shoulder - - - - - - - 20 - - - 0 - - - 0 - - - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Default shoulder: - - - - - - - 0 - - - - Right - - - - - Left - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - <html><head/><body><p>If enabled then the character rotation is not synchonized with the camera rotation while the character doesn't move and not in combat mode.</p></body></html> - - - Preview if stand still - - - - - - - <html><head/><body><p>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.</p></body></html> - - - Deferred preview rotation - - - - - - - <html><head/><body><p>Enables head bobbing when move in first person mode.</p></body></html> - - - Head bobbing in 1st person mode - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - Interface