From 5136477be7f24e1cee9b7ec990932648e3f245c6 Mon Sep 17 00:00:00 2001 From: Vish Atlu Date: Wed, 22 Dec 2021 11:49:56 -0800 Subject: [PATCH 1/2] Renamed file names. --- .../support/DAZ/o3deBridge/Daz to O3DE.dsa | 24 +++++++++---------- .../{DzO3DEAutoWeight.dsa => AutoWeight.dsa} | 0 .../{DzO3DEDforce.dsa => Dforce.dsa} | 0 .../{DzO3DEDialog.dsa => Dialog.dsa} | 5 ++-- ...{DzO3DEEnvironment.dsa => Environment.dsa} | 0 ...{DzO3DEBridgeExporter.dsa => Exporter.dsa} | 0 .../{DzO3DEFigure.dsa => Figure.dsa} | 0 .../{DzO3DEHelpers.dsa => Helpers.dsa} | 0 ...ionDialog.dsa => MorphSelectionDialog.dsa} | 0 .../{DzO3DEMorphs.dsa => Morphs.dsa} | 0 .../{DzO3DEPose.dsa => Pose.dsa} | 0 .../{DzO3DEScene.dsa => Scene.dsa} | 0 ...{DzO3DESubdivision.dsa => Subdivision.dsa} | 0 ...visionDialog.dsa => SubdivisionDialog.dsa} | 0 .../{DzO3DEWriter.dsa => Writer.dsa} | 0 15 files changed, 14 insertions(+), 15 deletions(-) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEAutoWeight.dsa => AutoWeight.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEDforce.dsa => Dforce.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEDialog.dsa => Dialog.dsa} (98%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEEnvironment.dsa => Environment.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEBridgeExporter.dsa => Exporter.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEFigure.dsa => Figure.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEHelpers.dsa => Helpers.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEMorphSelectionDialog.dsa => MorphSelectionDialog.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEMorphs.dsa => Morphs.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEPose.dsa => Pose.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEScene.dsa => Scene.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DESubdivision.dsa => Subdivision.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DESubdivisionDialog.dsa => SubdivisionDialog.dsa} (100%) rename Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/{DzO3DEWriter.dsa => Writer.dsa} (100%) diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/Daz to O3DE.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/Daz to O3DE.dsa index 69992af..0a2b5c4 100644 --- a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/Daz to O3DE.dsa +++ b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/Daz to O3DE.dsa @@ -12,18 +12,18 @@ if( g_sScriptPath === "" ){ g_oFileInfo.deleteLater(); // Global Includes -var g_sBridgeHelpers = String( "%2/dzBridgeUtils/Dz%1Helpers.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgeEnv = String( "%2/dzBridgeUtils/Dz%1Environment.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgeScene = String( "%2/dzBridgeUtils/Dz%1Scene.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgePose = String( "%2/dzBridgeUtils/Dz%1Morphs.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgeMorphs = String( "%2/dzBridgeUtils/Dz%1Pose.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgeAutoWeight = String( "%2/dzBridgeUtils/Dz%1AutoWeight.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgeExporter = String( "%2/dzBridgeUtils/Dz%1BridgeExporter.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgeDialog = String( "%2/dzBridgeUtils/Dz%1Dialog.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ) -var g_sBridgeWriter = String( "%2/dzBridgeUtils/Dz%1Writer.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgeFigure = String( "%2/dzBridgeUtils/Dz%1Figure.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgeSubdiv = String( "%2/dzBridgeUtils/Dz%1Subdivision.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); -var g_sBridgeDforce = String( "%2/dzBridgeUtils/Dz%1Dforce.dsa" ).arg( g_sBridge ).arg( g_sScriptPath ); +var g_sBridgeHelpers = String( "%1/dzBridgeUtils/Helpers.dsa" ).arg( g_sScriptPath ); +var g_sBridgeEnv = String( "%1/dzBridgeUtils/Environment.dsa" ).arg( g_sScriptPath ); +var g_sBridgeScene = String( "%1/dzBridgeUtils/Scene.dsa" ).arg( g_sScriptPath ); +var g_sBridgePose = String( "%1/dzBridgeUtils/Morphs.dsa" ).arg( g_sScriptPath ); +var g_sBridgeMorphs = String( "%1/dzBridgeUtils/Pose.dsa" ).arg( g_sScriptPath ); +var g_sBridgeAutoWeight = String( "%1/dzBridgeUtils/AutoWeight.dsa" ).arg( g_sScriptPath ); +var g_sBridgeExporter = String( "%1/dzBridgeUtils/Exporter.dsa" ).arg( g_sScriptPath ); +var g_sBridgeDialog = String( "%1/dzBridgeUtils/Dialog.dsa" ).arg( g_sScriptPath ) +var g_sBridgeWriter = String( "%1/dzBridgeUtils/Writer.dsa" ).arg( g_sScriptPath ); +var g_sBridgeFigure = String( "%1/dzBridgeUtils/Figure.dsa" ).arg( g_sScriptPath ); +var g_sBridgeSubdiv = String( "%1/dzBridgeUtils/Subdivision.dsa" ).arg( g_sScriptPath ); +var g_sBridgeDforce = String( "%1/dzBridgeUtils/Dforce.dsa" ).arg( g_sScriptPath ); include( g_sBridgeHelpers ); // Dependencies : ... include( g_sBridgeDforce ); // Dependencies : ... diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEAutoWeight.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/AutoWeight.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEAutoWeight.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/AutoWeight.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEDforce.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Dforce.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEDforce.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Dforce.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEDialog.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Dialog.dsa similarity index 98% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEDialog.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Dialog.dsa index 42bda36..63a6913 100644 --- a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEDialog.dsa +++ b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Dialog.dsa @@ -1,5 +1,4 @@ -var g_sBridge = "O3DE" /** * Contains the Dialogs for the User to Control * @class @@ -28,8 +27,8 @@ function DzBridgeDialog( oBridgeExporter ) this.bAutoWeights; this.bNewSubdiv; - this.sMorphDialog = String( "/dzBridgeUtils/Dz%1MorphSelectionDialog" ).arg( g_sBridge ) - this.sSubdivDialog = String( "/dzBridgeUtils/Dz%1SubdivisionDialog" ).arg( g_sBridge ) + this.sMorphDialog = String( "/dzBridgeUtils/MorphSelectionDialog" ) + this.sSubdivDialog = String( "/dzBridgeUtils/SubdivisionDialog" ) this.sPresetPath = oBridgeExporter.sPresetPath; this.aExportableProperties = []; diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEEnvironment.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Environment.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEEnvironment.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Environment.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEBridgeExporter.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Exporter.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEBridgeExporter.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Exporter.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEFigure.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Figure.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEFigure.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Figure.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEHelpers.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Helpers.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEHelpers.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Helpers.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEMorphSelectionDialog.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/MorphSelectionDialog.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEMorphSelectionDialog.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/MorphSelectionDialog.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEMorphs.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Morphs.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEMorphs.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Morphs.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEPose.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Pose.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEPose.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Pose.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEScene.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Scene.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEScene.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Scene.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DESubdivision.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Subdivision.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DESubdivision.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Subdivision.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DESubdivisionDialog.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/SubdivisionDialog.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DESubdivisionDialog.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/SubdivisionDialog.dsa diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEWriter.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Writer.dsa similarity index 100% rename from Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/DzO3DEWriter.dsa rename to Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Writer.dsa From daa93cb568f379913f2b657a99ad44b6fcb8a53f Mon Sep 17 00:00:00 2001 From: Vish Atlu Date: Wed, 22 Dec 2021 13:22:28 -0800 Subject: [PATCH 2/2] Fix issue where the textures wont export in default the state. --- .../scripts/support/DAZ/o3deBridge/dzBridgeUtils/Scene.dsa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Scene.dsa b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Scene.dsa index 34a1054..5d3d942 100644 --- a/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Scene.dsa +++ b/Daz Studio/appdir_common/scripts/support/DAZ/o3deBridge/dzBridgeUtils/Scene.dsa @@ -30,7 +30,7 @@ DzBridgeScene.superclass = DzBridgeHelpers.prototype; "bIncludeSubdiv" : false, "bIncludeAnim" : false, "bIncludeMorphs" : false, - "bCollectTextures" : false, + "bCollectTextures" : true, "bRemoveIncompatible" : false, "bAutoWeights" : false, "bNewSubdiv" : false,