mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 11:06:43 +00:00
Code Issues Releases Wiki Activity

Fix far clip distance (again), workaround for broken settings minimum value.

Browse source
This commit is contained in:
cc9cii 2014-09-29 08:17:51 +10:00
parent 54c77cf875
commit 7675df60ba
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/opencs/model/settings/usersettings.cpp
View file

@ -56,7 +56,7 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
numLights->setDefaultValue(8); numLights->setDefaultValue(8);
numLights->setEditorSetting(true); numLights->setEditorSetting(true);
numLights->setColumnSpan (1); numLights->setColumnSpan (1);
numLights->setMinimum (2); numLights->setMinimum (0);
numLights->setMaximum (100); // FIXME: not sure what the max value should be numLights->setMaximum (100); // FIXME: not sure what the max value should be
numLights->setWidgetWidth (10); numLights->setWidgetWidth (10);
numLights->setViewLocation(1, 2); numLights->setViewLocation(1, 2);
@ -79,6 +79,7 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
fastFactor->setEditorSetting(true); fastFactor->setEditorSetting(true);
fastFactor->setColumnSpan (1); fastFactor->setColumnSpan (1);
fastFactor->setMinimum (1); fastFactor->setMinimum (1);
fastFactor->setSpecialValueText ("1"); // FIXME: workaround
fastFactor->setMaximum (100); // FIXME: not sure what the max value should be fastFactor->setMaximum (100); // FIXME: not sure what the max value should be
fastFactor->setWidgetWidth (10); fastFactor->setWidgetWidth (10);
fastFactor->setViewLocation(1, 2); fastFactor->setViewLocation(1, 2);
@ -109,6 +110,7 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
maxSubView->setEditorSetting(true); maxSubView->setEditorSetting(true);
maxSubView->setColumnSpan (1); maxSubView->setColumnSpan (1);
maxSubView->setMinimum (1); maxSubView->setMinimum (1);
maxSubView->setSpecialValueText ("1");
maxSubView->setMaximum (256); // FIXME: not sure what the max value should be maxSubView->setMaximum (256); // FIXME: not sure what the max value should be
maxSubView->setWidgetWidth (10); maxSubView->setWidgetWidth (10);
maxSubView->setViewLocation(1, 2); maxSubView->setViewLocation(1, 2);
@ -118,6 +120,7 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
minWidth->setEditorSetting(true); minWidth->setEditorSetting(true);
minWidth->setColumnSpan (1); minWidth->setColumnSpan (1);
minWidth->setMinimum (50); minWidth->setMinimum (50);
minWidth->setSpecialValueText ("50");
minWidth->setMaximum (10000); // FIXME: not sure what the max value should be minWidth->setMaximum (10000); // FIXME: not sure what the max value should be
minWidth->setWidgetWidth (10); minWidth->setWidgetWidth (10);
minWidth->setViewLocation(2, 2); minWidth->setViewLocation(2, 2);

2
apps/opencs/view/render/scenewidget.cpp
View file

@ -412,7 +412,7 @@ namespace CSVRender
if(key.contains(QRegExp("^\\b(Objects|Shader|Scene)", Qt::CaseInsensitive))) if(key.contains(QRegExp("^\\b(Objects|Shader|Scene)", Qt::CaseInsensitive)))
flagAsModified(); flagAsModified();
if(key == "Objects/far clip distance" && !list.empty()) if(key == "Scene/far clip distance" && !list.empty())
{ {
if(mCamera->getFarClipDistance() != list.at(0).toFloat()) if(mCamera->getFarClipDistance() != list.at(0).toFloat())
mCamera->setFarClipDistance(list.at(0).toFloat()); mCamera->setFarClipDistance(list.at(0).toFloat());