Skip to content

Commit

Permalink
LOD gen - UI tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
danielbui78 committed Aug 30, 2023
1 parent 2bb93a1 commit 0fbe2f9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion include/DzBridgeAction.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"); }
Expand Down
2 changes: 1 addition & 1 deletion include/common_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
18 changes: 9 additions & 9 deletions src/DzBridgeLodSettingsDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ interactive realtime 3D applications.") +
helpText_LodMethod->setText(
"<p>" +
// tr("<b>STEP 1</b>: Select the method for generating LODs.")
tr("Current method for generating LODs:")
tr("Method for generating LODs:")
);
mainLayout->addWidget(helpText_LodMethod);

Expand All @@ -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);

Expand Down Expand Up @@ -107,21 +107,21 @@ as the first level of detail.")
"<p>" +
tr("<b>STEP 2</b>: Specify the LOD preset.<br><br>\
The <b>Default</b> preset will use base resolution for closeups and gradually decrease the percent mesh resolution with distance.<br><br>\
The <b>UEFN</b> preset will use base resolution for closeups, then 5000 vertex resolution for full body and gradually decrease further with distance.")
The <b>Competitive Multiplayer</b> 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();
}

Expand All @@ -140,7 +140,7 @@ void DzBridgeLodSettingsDialog::PrepareDialog()

void DzBridgeLodSettingsDialog::showEvent(QShowEvent* event)
{
resize(100, 100);
resize(sizeHint());

DzBasicDialog::showEvent(event);
}
Expand All @@ -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();
}
Expand Down

0 comments on commit 0fbe2f9

Please sign in to comment.