diff --git a/include/DzBridgeAction.h b/include/DzBridgeAction.h index 770fa0c..434e73f 100644 --- a/include/DzBridgeAction.h +++ b/include/DzBridgeAction.h @@ -195,7 +195,7 @@ namespace DzBridgeNameSpace Q_INVOKABLE virtual int getELodMethodMax() { return 1; } ELodMethod m_eLodMethod = ELodMethod::Undefined; // WARNING: May need to change this to type int to support additional values in subclasses, depending on compiler handling of enum virtual ELodMethod getLodMethod() const { return m_eLodMethod; } - int m_nNumberOfLods = -1; // number of LOD levels to generate + int m_nNumberOfLods = 2; // total number of LOD levels (including Base LOD) bool m_bCreateLodGroup = false; virtual QString getActionGroup() const { return tr("Bridges"); } diff --git a/include/common_version.h b/include/common_version.h index c877d36..b363a6d 100644 --- a/include/common_version.h +++ b/include/common_version.h @@ -5,6 +5,6 @@ #define COMMON_MAJOR 2023 #define COMMON_MINOR 1 #define COMMON_REV 2 -#define COMMON_BUILD 69 +#define COMMON_BUILD 70 #define COMMON_VERSION DZ_MAKE_VERSION( COMMON_MAJOR, COMMON_MINOR, COMMON_REV, COMMON_BUILD ) diff --git a/src/DzBridgeLodSettingsDialog.cpp b/src/DzBridgeLodSettingsDialog.cpp index 5cb1ada..a16ddea 100644 --- a/src/DzBridgeLodSettingsDialog.cpp +++ b/src/DzBridgeLodSettingsDialog.cpp @@ -54,7 +54,7 @@ interactive realtime 3D applications.") + helpText_LodMethod->setText( "

" + // tr("STEP 1: Select the method for generating LODs.") - tr("Current method for generating LODs:") + tr("Method for generating LODs:") ); mainLayout->addWidget(helpText_LodMethod); @@ -63,7 +63,7 @@ interactive realtime 3D applications.") + //m_wLodMethodComboBox->addItem("Use the currently active Resolution level", QVariant(0)); //m_wLodMethodComboBox->addItem("Use pregenerated LOD mesh", QVariant(0)); //m_wLodMethodComboBox->addItem("Use Daz Decimator plugin", QVariant(1)); - m_wLodMethodComboBox->addItem("Use Unreal Engine Built-in LOD generator", QVariant(2)); + m_wLodMethodComboBox->addItem("Unreal Engine Built-in LOD generator", QVariant(2)); connect(m_wLodMethodComboBox, SIGNAL(activated(int)), this, SLOT(HandleLodMethodComboChange(int))); mainLayout->addWidget(m_wLodMethodComboBox); @@ -107,21 +107,21 @@ as the first level of detail.") "

" + tr("STEP 2: Specify the LOD preset.

\ The Default preset will use base resolution for closeups and gradually decrease the percent mesh resolution with distance.

\ -The UEFN preset will use base resolution for closeups, then 5000 vertex resolution for full body and gradually decrease further with distance.") +The Competitive Multiplayer preset will use base resolution for closeups, then 5000 vertex resolution for full body and gradually decrease further with distance.") ); mainLayout->addWidget(helpText_LodPreset); // LOD settings preset dropdown m_wLodSettingPresetComboBox = new QComboBox(this); m_wLodSettingPresetComboBox->addItem("Default", "#default"); - m_wLodSettingPresetComboBox->addItem("UEFN / Fab Marketplace", "#uefn"); + m_wLodSettingPresetComboBox->addItem("Competitive Multiplayer", "#high_performance"); mainLayout->addWidget(m_wLodSettingPresetComboBox); this->addLayout(mainLayout); - setMinimumWidth(300); - setMinimumHeight(250); - + setMinimumWidth(400); + setMinimumHeight(400); + PrepareDialog(); } @@ -140,7 +140,7 @@ void DzBridgeLodSettingsDialog::PrepareDialog() void DzBridgeLodSettingsDialog::showEvent(QShowEvent* event) { - resize(100, 100); + resize(sizeHint()); DzBasicDialog::showEvent(event); } @@ -161,7 +161,7 @@ void DzBridgeLodSettingsDialog::accept() //applyLodPresetDefault(); comboIndex = m_wLodSettingPresetComboBox->currentIndex(); QString sLodPreset = m_wLodSettingPresetComboBox->itemData(comboIndex).toString(); - if (sLodPreset.toLower().contains("#uefn")) + if (sLodPreset.toLower().contains("#high_performance")) { applyLodPresetHighPerformance(); }