diff --git a/.gitignore b/.gitignore index 156972f..89f20c3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,9 @@ out CMakeSettings.json .DS_Store +x64/ +*.sln +*.vcxproj +*.vcxproj.filters +*.vcxproj.user +moc_*.cpp \ No newline at end of file diff --git a/include/DzBridgeAction.h b/include/DzBridgeAction.h index 434e73f..e143a90 100644 --- a/include/DzBridgeAction.h +++ b/include/DzBridgeAction.h @@ -132,10 +132,10 @@ namespace DzBridgeNameSpace DzNode* Child; }; - DzBridgeDialog* m_bridgeDialog; - DzBridgeSubdivisionDialog* m_subdivisionDialog; - DzBridgeMorphSelectionDialog* m_morphSelectionDialog; - DzBridgeLodSettingsDialog* m_wLodSettingsDialog; + DzBridgeDialog* m_bridgeDialog = nullptr; + DzBridgeSubdivisionDialog* m_subdivisionDialog = nullptr; + DzBridgeMorphSelectionDialog* m_morphSelectionDialog = nullptr; + DzBridgeLodSettingsDialog* m_wLodSettingsDialog = nullptr; int m_nNonInteractiveMode; QString m_sAssetName; // Exported Asset Name, may be separate from export filename diff --git a/include/DzBridgeDialog.h b/include/DzBridgeDialog.h index b6598df..fcbfc7b 100644 --- a/include/DzBridgeDialog.h +++ b/include/DzBridgeDialog.h @@ -104,51 +104,51 @@ namespace DzBridgeNameSpace protected: DzBridgeAction* m_BridgeAction = nullptr; - QSettings* settings; + QSettings* settings = nullptr; virtual void refreshAsset(); - QFormLayout* mainLayout; - QFormLayout* advancedLayout; - QLineEdit* assetNameEdit; - // QLineEdit* projectEdit; - // QPushButton* projectButton; - QComboBox* assetTypeCombo; - QPushButton* morphsButton; - QCheckBox* morphsEnabledCheckBox; - QPushButton* subdivisionButton; - QCheckBox* subdivisionEnabledCheckBox; - QLabel* m_WelcomeLabel; + QFormLayout* mainLayout = nullptr; + QFormLayout* advancedLayout = nullptr; + QLineEdit* assetNameEdit = nullptr; + // QLineEdit* projectEdit = nullptr; + // QPushButton* projectButton = nullptr; + QComboBox* assetTypeCombo = nullptr; + QPushButton* morphsButton = nullptr; + QCheckBox* morphsEnabledCheckBox = nullptr; + QPushButton* subdivisionButton = nullptr; + QCheckBox* subdivisionEnabledCheckBox = nullptr; + QLabel* m_WelcomeLabel = nullptr; // Advanced settings - QGroupBox* advancedSettingsGroupBox; - QWidget* advancedWidget; - QComboBox* fbxVersionCombo; - QCheckBox* showFbxDialogCheckBox; - QCheckBox* enableNormalMapGenerationCheckBox; - QCheckBox* exportMaterialPropertyCSVCheckBox; - QWidget* m_wTargetPluginInstaller; - QPushButton* m_TargetPluginInstallerButton; - QComboBox* m_TargetSoftwareVersionCombo; - QLabel* m_BridgeVersionLabel; - QPushButton* m_OpenIntermediateFolderButton; - QCheckBox* m_enableExperimentalOptionsCheckBox; + QGroupBox* advancedSettingsGroupBox = nullptr; + QWidget* advancedWidget = nullptr; + QComboBox* fbxVersionCombo = nullptr; + QCheckBox* showFbxDialogCheckBox = nullptr; + QCheckBox* enableNormalMapGenerationCheckBox = nullptr; + QCheckBox* exportMaterialPropertyCSVCheckBox = nullptr; + QWidget* m_wTargetPluginInstaller = nullptr; + QPushButton* m_TargetPluginInstallerButton = nullptr; + QComboBox* m_TargetSoftwareVersionCombo = nullptr; + QLabel* m_BridgeVersionLabel = nullptr; + QPushButton* m_OpenIntermediateFolderButton = nullptr; + QCheckBox* m_enableExperimentalOptionsCheckBox = nullptr; // Animation settings - QGroupBox* animationSettingsGroupBox; - QCheckBox* experimentalAnimationExportCheckBox; - QCheckBox* bakeAnimationExportCheckBox; - QCheckBox* faceAnimationExportCheckBox; - QCheckBox* animationExportActiveCurvesCheckBox; - QCheckBox* animationApplyBoneScaleCheckBox; + QGroupBox* animationSettingsGroupBox = nullptr; + QCheckBox* experimentalAnimationExportCheckBox = nullptr; + QCheckBox* bakeAnimationExportCheckBox = nullptr; + QCheckBox* faceAnimationExportCheckBox = nullptr; + QCheckBox* animationExportActiveCurvesCheckBox = nullptr; + QCheckBox* animationApplyBoneScaleCheckBox = nullptr; // Morph settings - QGroupBox* morphSettingsGroupBox; - QCheckBox* morphLockBoneTranslationCheckBox; + QGroupBox* morphSettingsGroupBox = nullptr; + QCheckBox* morphLockBoneTranslationCheckBox = nullptr; // LOD settings - QPushButton* m_wLodSettingsButton; - QCheckBox* m_wEnableLodCheckBox; + QPushButton* m_wLodSettingsButton = nullptr; + QCheckBox* m_wEnableLodCheckBox = nullptr; QWidget* m_wLodRowLabelWidget = nullptr; QString m_sEmbeddedFilesPath = ":/DazBridge"; diff --git a/src/DzBridgeDialog.cpp b/src/DzBridgeDialog.cpp index 4792153..62967a3 100644 --- a/src/DzBridgeDialog.cpp +++ b/src/DzBridgeDialog.cpp @@ -59,6 +59,10 @@ DzBridgeDialog::DzBridgeDialog(QWidget *parent, const QString &windowTitle) : m_bSetupMode = true; } +#ifdef VODSVERSION + m_bSetupMode = false; +#endif + assetNameEdit = nullptr; // projectEdit = nullptr; // projectButton = nullptr; @@ -248,6 +252,7 @@ better quality. **DOES NOT EXPORT MESH**"; connect(exportMaterialPropertyCSVCheckBox, SIGNAL(stateChanged(int)), this, SLOT(HandleExportMaterialPropertyCSVCheckBoxChange(int))); // Install Destination Software Bridge +#ifndef VODSVERSION m_wTargetPluginInstaller = new QWidget(); QHBoxLayout* targetPluginInstallerLayout = new QHBoxLayout(); m_TargetSoftwareVersionCombo = new QComboBox(m_wTargetPluginInstaller); @@ -257,6 +262,7 @@ better quality. **DOES NOT EXPORT MESH**"; targetPluginInstallerLayout->addWidget(m_TargetSoftwareVersionCombo, 2); targetPluginInstallerLayout->addWidget(m_TargetPluginInstallerButton, 1); m_wTargetPluginInstaller->setLayout(targetPluginInstallerLayout); +#endif // Bridge Software Version Label QString sBridgeVersionString = QString(tr("Daz Bridge Library %1 v%2.%3.%4")).arg(COMMON_MAJOR).arg(COMMON_MINOR).arg(revision).arg(COMMON_BUILD); @@ -284,7 +290,9 @@ better quality. **DOES NOT EXPORT MESH**"; // Advanced Settings Layout advancedLayout->addRow("", m_BridgeVersionLabel); +#ifndef VODSVERSION advancedLayout->addRow("Install Destination Plugin", m_wTargetPluginInstaller); +#endif advancedLayout->addRow("", m_OpenIntermediateFolderButton); showTargetPluginInstaller(false); advancedLayout->addRow("FBX Version", fbxVersionCombo); @@ -408,11 +416,11 @@ bool DzBridgeDialog::loadSavedSettings() advancedSettingsGroupBox->setChecked(true); advancedWidget->setHidden(false); } - //else if (!settings->value("ShowAdvancedSettings").isNull()) - //{ - // advancedSettingsGroupBox->setChecked(settings->value("ShowAdvancedSettings").toBool()); - // advancedWidget->setHidden(!advancedSettingsGroupBox->isChecked()); - //} + else if (!settings->value("ShowAdvancedSettings").isNull()) + { + advancedSettingsGroupBox->setChecked(settings->value("ShowAdvancedSettings").toBool()); + advancedWidget->setHidden(!advancedSettingsGroupBox->isChecked()); + } else { advancedSettingsGroupBox->setChecked(false);