diff --git a/QtMeshViewer/Form Files/SettingsWindow.ui b/QtMeshViewer/Form Files/SettingsWindow.ui index 21b5341..55ccb54 100644 --- a/QtMeshViewer/Form Files/SettingsWindow.ui +++ b/QtMeshViewer/Form Files/SettingsWindow.ui @@ -4,10 +4,10 @@ - 0 - 0 - 400 - 600 + 0 + 0 + 481 + 645 @@ -15,549 +15,557 @@ - - - Background - - - - - - false - - - - 30 - 16777215 - - - - QAbstractSpinBox::NoButtons - - - 255 - - - - - - - B: - - - - - - - false - - - 255 - - - 5 - - - Qt::Horizontal - - - - - - - false - - - 255 - - - 5 - - - Qt::Horizontal - - - - - - - auto color - - - true - - - - - - - false - - - - 30 - 16777215 - - - - QAbstractSpinBox::NoButtons - - - 255 - - - - - - - R: - - - - - - - G: - - - - - - - B: - - - - - - - - 30 - 16777215 - - - - QAbstractSpinBox::NoButtons - - - 255 - - - - - - - - 30 - 16777215 - - - - QAbstractSpinBox::NoButtons - - - 255 - - - - - - - 255 - - - 255 - - - Qt::Horizontal - - - - - - - true - - - - 30 - 16777215 - - - - QAbstractSpinBox::NoButtons - - - 255 - - - - - - - 255 - - - 204 - - - Qt::Horizontal - - - - - - - 255 - - - 127 - - - Qt::Horizontal - - - - - - - Light on: - - - - - - - Light off: - - - - - - - R: - - - - - - - false - - - - 30 - 16777215 - - - - QAbstractSpinBox::NoButtons - - - 255 - - - - - - - false - - - 255 - - - 5 - - - Qt::Horizontal - - - - - - - G: - - - - - + + + Background + + + + + + false + + + + 30 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + B: + + + + + + + false + + + 255 + + + 5 + + + Qt::Horizontal + + + + + + + false + + + 255 + + + 5 + + + Qt::Horizontal + + + + + + + auto color + + + true + + + + + + + false + + + + 30 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + R: + + + + + + + G: + + + + + + + B: + + + + + + + + 30 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 30 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + 255 + + + 255 + + + Qt::Horizontal + + + + + + + true + + + + 30 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + 255 + + + 204 + + + Qt::Horizontal + + + + + + + 255 + + + 127 + + + Qt::Horizontal + + + + + + + Light on: + + + + + + + Light off: + + + + + + + R: + + + + + + + false + + + + 30 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + false + + + 255 + + + 5 + + + Qt::Horizontal + + + + + + + G: + + + + + - - - Light - - - - - - - 30 - 16777215 - - - - QAbstractSpinBox::NoButtons - - - 255 - - - - - - - G: - - - - - - - Attenuationfactor: - - - - - - - - 30 - 16777215 - - - - QAbstractSpinBox::NoButtons - - - 255 - - - - - - - B: - - - - - - - - 30 - 16777215 - - - - QAbstractSpinBox::NoButtons - - - 255 - - - - - - - Headlight - - - - - - - Point light - - - - - - - 255 - - - 255 - - - Qt::Horizontal - - - - - - - 255 - - - 255 - - - Qt::Horizontal - - - - - - - R: - - - - - - - Directional light - - - true - - - - - - - false - - - - 55 - 16777215 - - - - 1 - - - 0.100000000000000 - - - - - - - true - - - - 55 - 16777215 - - - - 3 - - - 1.000000000000000 - - - 0.001000000000000 - - - 0.005000000000000 - - - - - - - 255 - - - 255 - - - Qt::Horizontal - - - - - - - Ambientcoefficient: - - - - - + + + Light + + + + + + + 30 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + G: + + + + + + + Attenuationfactor: + + + + + + + + 30 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + B: + + + + + + + + 30 + 16777215 + + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + Headlight + + + + + + + Point light + + + + + + + 255 + + + 255 + + + Qt::Horizontal + + + + + + + 255 + + + 255 + + + Qt::Horizontal + + + + + + + R: + + + + + + + Directional light + + + true + + + + + + + false + + + + 55 + 16777215 + + + + 1 + + + 0.100000000000000 + + + + + + + true + + + + 55 + 16777215 + + + + 3 + + + 1.000000000000000 + + + 0.001000000000000 + + + 0.005000000000000 + + + + + + + 255 + + + 255 + + + Qt::Horizontal + + + + + + + Ambientcoefficient: + + + + + - - - General - - - - - - Directory Drop Down List: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Zoom speed: - - - - - - - % - - - 200 - - - 10 - - - 100 - - - - - - - Backface Culling - - - - - - - + - - - - - - - -- - - - - - - - - + + + General + + + + + + Directory Drop Down List: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Zoom speed: + + + + + + + % + + + 200 + + + 10 + + + 100 + + + + + + + Backface Culling + + + + + + + + + + + + + + + -- + + + + + + + + + + *** "BF1_ModTools" Goes To "C:/BF1_ModTools/Assets/Shipped Worlds/" + "BF2_ModTools" Goes To "C:/BF2_ModTools/assets/Sides/" + + + + + diff --git a/QtMeshViewer/Source/SettingsManager.cpp b/QtMeshViewer/Source/SettingsManager.cpp index 66b184d..40a1d72 100644 --- a/QtMeshViewer/Source/SettingsManager.cpp +++ b/QtMeshViewer/Source/SettingsManager.cpp @@ -37,11 +37,7 @@ void SettingsManager::readFromFile() for (auto& it : lines) { - if (it.startsWith("")) - { - m_listOfDirs = QString(it.right(it.size() - it.indexOf('>') - 1)).split(";"); - } - else if (it.startsWith("")) + if (it.startsWith("")) { QList values = it.right(it.size() - it.indexOf('>') - 1).split(';'); @@ -90,6 +86,10 @@ void SettingsManager::readFromFile() { m_ambient = it.right(it.size() - it.indexOf('>') - 1).toFloat(); } + else if (it.startsWith("")) + { + m_listOfDirs = QString(it.right(it.size() - it.indexOf('>') - 1)).split(";"); + } } m_file.close();