From 378dc7cd3afbda53114eb5b63837bc22ba345a66 Mon Sep 17 00:00:00 2001
From: David-Vodhanel <39318287+David-Vodhanel@users.noreply.github.com>
Date: Wed, 12 Jul 2023 23:54:13 -0700
Subject: [PATCH 1/4] Updates after pull from Daz
---
CMakeLists.txt | 4 ++--
include/dzbridge.h | 2 +-
src/DzBridgeDialog.cpp | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e34efc..924092b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,9 +279,9 @@ if(NOT IMATH_DIR)
endif()
set(ALEMBIC_INCLUDE "${IMATH_DIR}/include/imath" CACHE PATH "Path to IMath include folder" )
if(WIN32)
- set(ALEMBIC_LIB "${IMATH_DIR}/lib/Imath-3_1.lib" CACHE FILEPATH "Path to IMath CPU static library (Imath-3_1.lib)" )
+ set(ALEMBIC_LIB "${IMATH_DIR}/lib/Imath-3_1_d.lib" CACHE FILEPATH "Path to IMath CPU static library (Imath-3_1_d.lib)" )
elseif(APPLE)
- set(ALEMBIC_LIB "${IMATH_DIR}/lib/Imath-3_1.a" CACHE FILEPATH "Path to IMath CPU static library (Imath-3_1.a)" )
+ set(ALEMBIC_LIB "${IMATH_DIR}/lib/Imath-3_1_d.a" CACHE FILEPATH "Path to IMath CPU static library (Imath-3_1_d.a)" )
endif()
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
diff --git a/include/dzbridge.h b/include/dzbridge.h
index b7f0a25..da24cfc 100644
--- a/include/dzbridge.h
+++ b/include/dzbridge.h
@@ -15,7 +15,7 @@
#define DZ_BRIDGE_NAMESPACE DzBridgeNameSpace
//#define DZ_BRIDGE_NAMESPACE DzBridgeStatic_71fb72024b4947baa82a4780e3819776
-//#define VODSVERSION
+#define VODSVERSION
/////////////////////////////////////////////
diff --git a/src/DzBridgeDialog.cpp b/src/DzBridgeDialog.cpp
index eb15eab..c7f3f3a 100644
--- a/src/DzBridgeDialog.cpp
+++ b/src/DzBridgeDialog.cpp
@@ -195,6 +195,7 @@ To find out more about Daz Bridges, go to 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);
@@ -221,7 +223,9 @@ To find out more about Daz Bridges, go to addRow("", m_BridgeVersionLabel);
+#ifndef VODSVERSION
advancedLayout->addRow("Install Destination Plugin", m_wTargetPluginInstaller);
+#endif
advancedLayout->addRow("", m_OpenIntermediateFolderButton);
showTargetPluginInstaller(false);
advancedLayout->addRow("FBX Version", fbxVersionCombo);
From 785495398df65462ee179c55fdfb4a8451c52121 Mon Sep 17 00:00:00 2001
From: David-Vodhanel <39318287+David-Vodhanel@users.noreply.github.com>
Date: Sun, 13 Aug 2023 13:59:17 -0700
Subject: [PATCH 2/4] Initialize interface variables to null
---
include/DzBridgeAction.h | 6 ++--
include/DzBridgeDialog.h | 62 ++++++++++++++++++++--------------------
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/include/DzBridgeAction.h b/include/DzBridgeAction.h
index 167f695..80ea374 100644
--- a/include/DzBridgeAction.h
+++ b/include/DzBridgeAction.h
@@ -96,9 +96,9 @@ namespace DzBridgeNameSpace
DzNode* Child;
};
- DzBridgeDialog* m_bridgeDialog;
- DzBridgeSubdivisionDialog* m_subdivisionDialog;
- DzBridgeMorphSelectionDialog* m_morphSelectionDialog;
+ DzBridgeDialog* m_bridgeDialog = nullptr;
+ DzBridgeSubdivisionDialog* m_subdivisionDialog = nullptr;
+ DzBridgeMorphSelectionDialog* m_morphSelectionDialog = 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 09efd46..ab2691d 100644
--- a/include/DzBridgeDialog.h
+++ b/include/DzBridgeDialog.h
@@ -91,44 +91,44 @@ namespace DzBridgeNameSpace
virtual void HandleAssetTypeComboChange(int state);
protected:
- 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;
- QGroupBox* advancedSettingsGroupBox;
- QWidget* advancedWidget;
- QComboBox* fbxVersionCombo;
- QCheckBox* showFbxDialogCheckBox;
- QCheckBox* enableNormalMapGenerationCheckBox;
- QCheckBox* exportMaterialPropertyCSVCheckBox;
- QWidget* m_wTargetPluginInstaller;
- QPushButton* m_TargetPluginInstallerButton;
- QComboBox* m_TargetSoftwareVersionCombo;
- QLabel* m_BridgeVersionLabel;
- QLabel* m_WelcomeLabel;
- QPushButton* m_OpenIntermediateFolderButton;
+ 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;
+ 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;
+ QLabel* m_WelcomeLabel = nullptr;
+ QPushButton* m_OpenIntermediateFolderButton = 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;
QString m_sEmbeddedFilesPath = ":/DazBridge";
bool m_bDontSaveSettings = false;
From 5b8167248f59606861aa5c1561ec0d891981d2e0 Mon Sep 17 00:00:00 2001
From: David-Vodhanel <39318287+David-Vodhanel@users.noreply.github.com>
Date: Sun, 13 Aug 2023 14:00:22 -0700
Subject: [PATCH 3/4] Disable SetupMode in Vod's version and allow Advanced
Settings to retain the check value again.
---
src/DzBridgeDialog.cpp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/DzBridgeDialog.cpp b/src/DzBridgeDialog.cpp
index c7f3f3a..5e50463 100644
--- a/src/DzBridgeDialog.cpp
+++ b/src/DzBridgeDialog.cpp
@@ -48,6 +48,10 @@ DzBridgeDialog::DzBridgeDialog(QWidget *parent, const QString &windowTitle) :
m_bSetupMode = true;
}
+#ifdef VODSVERSION
+ m_bSetupMode = false;
+#endif
+
assetNameEdit = nullptr;
// projectEdit = nullptr;
// projectButton = nullptr;
@@ -338,11 +342,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);
From ee61b73dfcd6be3cc0c1d3ed65859bca920c424b Mon Sep 17 00:00:00 2001
From: David-Vodhanel <39318287+David-Vodhanel@users.noreply.github.com>
Date: Sun, 13 Aug 2023 14:01:04 -0700
Subject: [PATCH 4/4] Update gitignore to ignore local Visual Studio solution
files.
---
.gitignore | 6 ++++++
1 file changed, 6 insertions(+)
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