UE5 preview2 2 2 2 2! please

Common/DzRuntimePluginAction.cpp

@@ -10,6 +10,7 @@
 #include <dzimageproperty.h>
 #include <dzstringproperty.h>
 #include <dznumericproperty.h>
+#include <dzfloatproperty.h>
 #include <dzcolorproperty.h>
 #include <dzstringproperty.h>
 #include <dzenumproperty.h>
@@ -87,6 +88,9 @@ void DzRuntimePluginAction::Export()
 				}
 			}
 
+			//Unlock the transform controls so the node can be moved to root
+			UnlockTranform(Node);
+
 			// Disconnect the asset being sent from everything else
 			QList<AttachmentInfo> AttachmentList;
 			DisconnectNode(Node, AttachmentList);
@@ -297,7 +301,11 @@ void DzRuntimePluginAction::ExportNode(DzNode* Node)
 		  }
 		  ExportOptions.setBoolValue("doLights", false);
 		  ExportOptions.setBoolValue("doCameras", false);
-		  ExportOptions.setBoolValue("doAnims", true);
+		  ExportOptions.setBoolValue("doAnims", false);
+		  if (AssetType == "Animation")
+		  {
+			  ExportOptions.setBoolValue("doAnims", true);
+		  }
 		  if ((AssetType == "Animation" || AssetType == "SkeletalMesh") && ExportMorphs && MorphString != "")
 		  {
 				ExportOptions.setBoolValue("doMorphs", true);
@@ -341,9 +349,29 @@ void DzRuntimePluginAction::ExportNode(DzNode* Node)
 		  dir.mkpath(CharacterFolder);
 
 		  SetExportOptions(ExportOptions);
-		  Exporter->writeFile(CharacterFBX, &ExportOptions);
 
-		  WriteConfiguration();
+		  if (ExportSubdivisions)
+		  {
+			  if (ExportBaseMesh)
+			  {
+				  QString CharacterBaseFBX = CharacterFBX;
+				  CharacterBaseFBX.replace(".fbx", "_base.fbx");
+				  Exporter->writeFile(CharacterBaseFBX, &ExportOptions);
+			  }
+			  else
+			  {
+				  QString CharacterHDFBX = CharacterFBX;
+				  CharacterHDFBX.replace(".fbx", "_HD.fbx");
+				  Exporter->writeFile(CharacterHDFBX, &ExportOptions);
+
+				  WriteConfiguration();
+			  }
+		  }
+		  else
+		  {
+			  Exporter->writeFile(CharacterFBX, &ExportOptions);
+			  WriteConfiguration();
+		  }
 
 		  // Change back material names
 		  UndoRenameDuplicateMaterials(Parent, MaterialNames, OriginalMaterialNames);
@@ -406,7 +434,8 @@ void DzRuntimePluginAction::GetScenePropList(DzNode* Node, QMap<QString, DzNode*
 	QString FileName = File.fileName();
 	QStringList Items = FileName.split("/");
 	QStringList Parts = Items[Items.count() - 1].split(".");
-	QString Name = Parts[0].remove(QRegExp("[^A-Za-z0-9_]"));
+	QString AssetID = Node->getAssetUri().getId();
+	QString Name = AssetID.remove(QRegExp("[^A-Za-z0-9_]"));
 
 	if (Figure)
 	{
@@ -592,4 +621,29 @@ bool DzRuntimePluginAction::CheckIfPoseExportIsDestructive()
 	return false;
 }
 
+void DzRuntimePluginAction::UnlockTranform(DzNode* NodeToUnlock)
+{
+	DzFloatProperty* Property = nullptr;
+	Property = NodeToUnlock->getXPosControl();
+	Property->lock(false);
+	Property = NodeToUnlock->getYPosControl();
+	Property->lock(false);	
+	Property = NodeToUnlock->getZPosControl();
+	Property->lock(false);
+
+	Property = NodeToUnlock->getXRotControl();
+	Property->lock(false);
+	Property = NodeToUnlock->getYRotControl();
+	Property->lock(false);
+	Property = NodeToUnlock->getZRotControl();
+	Property->lock(false);
+
+	Property = NodeToUnlock->getXScaleControl();
+	Property->lock(false);
+	Property = NodeToUnlock->getYScaleControl();
+	Property->lock(false);
+	Property = NodeToUnlock->getZScaleControl();
+	Property->lock(false);
+}
+
 #include "moc_DzRuntimePluginAction.cpp"

Common/DzRuntimePluginAction.h

@@ -25,6 +25,8 @@ class DzRuntimePluginAction : public DzAction {
 	 QString ImportFolder;
 	 QString CharacterFolder;
 	 QString CharacterFBX;
+	 QString CharacterBaseFBX;
+	 QString CharacterHDFBX;
 	 QString AssetType;
 	 QString MorphString;
 	 QString FBXVersion;
@@ -33,6 +35,7 @@ class DzRuntimePluginAction : public DzAction {
 
 	 bool ExportMorphs;
 	 bool ExportSubdivisions;
+	 bool ExportBaseMesh;
 	 bool ShowFbxDialog;
 	 bool ExportMaterialPropertiesCSV;
 	 DzNode* Selection;
@@ -64,4 +67,7 @@ class DzRuntimePluginAction : public DzAction {
 
 	 // For Pose exports check if writing to the timeline will alter existing keys
 	 bool CheckIfPoseExportIsDestructive();
+
+	 // Need to be able to move asset instances to origin during environment export
+	 void UnlockTranform(DzNode* NodeToUnlock);
 };

Unreal/DazStudioPlugin/DzUnrealAction.cpp

@@ -18,12 +18,15 @@
 #include <dzfigure.h>
 #include <dzfacetmesh.h>
 #include <dzbone.h>
+#include <dzgroupnode.h>
+#include <dzinstancenode.h>
 //#include <dznodeinstance.h>
 #include "idzsceneasset.h"
 #include "dzuri.h"
 
 #include "DzUnrealDialog.h"
 #include "DzUnrealAction.h"
+#include "DzUnrealMorphSelectionDialog.h"
 
 DzUnrealAction::DzUnrealAction() :
 	 DzRuntimePluginAction(tr("&Daz to Unreal"), tr("Send the selected node to Unreal."))
@@ -69,24 +72,36 @@ void DzUnrealAction::executeAction()
 	 // If the Accept button was pressed, start the export
 	 if (dlg->exec() == QDialog::Accepted)
 	 {
-		  // Collect the values from the dialog fields
-		  CharacterName = dlg->assetNameEdit->text();
-		  ImportFolder = dlg->intermediateFolderEdit->text();
-		  CharacterFolder = ImportFolder + "\\" + CharacterName + "\\";
-		  CharacterFBX = CharacterFolder + CharacterName + ".fbx";
-		  AssetType = dlg->assetTypeCombo->currentText().replace(" ", "");
-		  MorphString = dlg->GetMorphString();
-		  Port = dlg->portEdit->text().toInt();
-		  ExportMorphs = dlg->morphsEnabledCheckBox->isChecked();
-		  ExportSubdivisions = dlg->subdivisionEnabledCheckBox->isChecked();
-		  MorphMapping = dlg->GetMorphMapping();
-		  ShowFbxDialog = dlg->showFbxDialogCheckBox->isChecked();
-		  ExportMaterialPropertiesCSV = dlg->exportMaterialPropertyCSVCheckBox->isChecked();
-		  SubdivisionDialog = DzUnrealSubdivisionDialog::Get(dlg);
-		  SubdivisionDialog->LockSubdivisionProperties(ExportSubdivisions);
-		  FBXVersion = dlg->fbxVersionCombo->currentText();
-
-		  Export();
+		 // Collect the values from the dialog fields
+		 CharacterName = dlg->assetNameEdit->text();
+		 ImportFolder = dlg->intermediateFolderEdit->text();
+		 CharacterFolder = ImportFolder + "\\" + CharacterName + "\\";
+		 CharacterFBX = CharacterFolder + CharacterName + ".fbx";
+		 CharacterBaseFBX = CharacterFolder + CharacterName + "_base.fbx";
+		 CharacterHDFBX = CharacterFolder + CharacterName + "_HD.fbx";
+		 AssetType = dlg->assetTypeCombo->currentText().replace(" ", "");
+		 MorphString = dlg->GetMorphString();
+		 Port = dlg->portEdit->text().toInt();
+		 ExportMorphs = dlg->morphsEnabledCheckBox->isChecked();
+		 ExportSubdivisions = dlg->subdivisionEnabledCheckBox->isChecked();
+		 MorphMapping = dlg->GetMorphMapping();
+		 ShowFbxDialog = dlg->showFbxDialogCheckBox->isChecked();
+		 ExportMaterialPropertiesCSV = dlg->exportMaterialPropertyCSVCheckBox->isChecked();
+		 SubdivisionDialog = DzUnrealSubdivisionDialog::Get(dlg);
+		 FBXVersion = dlg->fbxVersionCombo->currentText();
+
+		 if (AssetType == "SkeletalMesh" && ExportSubdivisions)
+		 {
+			 // export base mesh
+			 ExportBaseMesh = true;
+			 SubdivisionDialog->LockSubdivisionProperties(false);
+			 Export();
+		 }
+
+		 ExportBaseMesh = false;
+		 SubdivisionDialog->LockSubdivisionProperties(ExportSubdivisions);
+		 Export();
+
 	 }
 }
 
@@ -100,6 +115,8 @@ void DzUnrealAction::WriteConfiguration()
 	 writer.addMember("Asset Name", CharacterName);
 	 writer.addMember("Asset Type", AssetType);
 	 writer.addMember("FBX File", CharacterFBX);
+	 writer.addMember("Base FBX File", CharacterBaseFBX);
+	 writer.addMember("HD FBX File", CharacterHDFBX);
 	 writer.addMember("Import Folder", CharacterFolder);
 
 	 if (AssetType != "Environment")
@@ -138,10 +155,42 @@ void DzUnrealAction::WriteConfiguration()
 					writer.finishObject();
 			  }
 		 }
-
 		 writer.finishArray();
 
-
+		 if (ExportMorphs)
+		 {
+			 DzMainWindow* mw = dzApp->getInterface();
+			 DzUnrealMorphSelectionDialog* morphDialog = DzUnrealMorphSelectionDialog::Get(mw);
+			 if (morphDialog->IsAutoJCMEnabled())
+			 {
+				 writer.startMemberArray("JointLinks", true);
+				 QList<JointLinkInfo> JointLinks = morphDialog->GetActiveJointControlledMorphs(Selection);
+				 foreach(JointLinkInfo linkInfo, JointLinks)
+				 {
+					 writer.startObject(true);
+					 writer.addMember("Bone", linkInfo.Bone);
+					 writer.addMember("Axis", linkInfo.Axis);
+					 writer.addMember("Morph", linkInfo.Morph);
+					 writer.addMember("Scalar", linkInfo.Scalar);
+					 writer.addMember("Alpha", linkInfo.Alpha);
+					 if (linkInfo.Keys.count() > 0)
+					 {
+						 writer.startMemberArray("Keys", true);
+						 foreach(JointLinkKey key, linkInfo.Keys)
+						 {
+							 writer.startObject(true);
+							 writer.addMember("Angle", key.Angle);
+							 writer.addMember("Value", key.Value);
+							 writer.finishObject();
+						 }
+						 writer.finishArray();
+					 }
+					 writer.finishObject();
+				 }
+				 writer.finishArray();
+			 }
+		 }
+
 		 writer.startMemberArray("Subdivisions", true);
 		 if (ExportSubdivisions)
 			 SubdivisionDialog->WriteSubdivisions(writer);
@@ -178,6 +227,14 @@ void DzUnrealAction::WriteConfiguration()
 
 	 DTUfile.close();
 
+	 if (AssetType != "Environment" && ExportSubdivisions)
+	 {
+		 QString CMD = "ImportFBXScene " + DTUfilename;
+		 QByteArray array = CMD.toLocal8Bit();
+		 char* cmd = array.data();
+		 int res = system(cmd);
+	 }
+
 	 // Send a message to Unreal telling it to start an import
 	 QUdpSocket* sendSocket = new QUdpSocket(this);
 	 QHostAddress* sendAddress = new QHostAddress("127.0.0.1");
@@ -330,13 +387,25 @@ void DzUnrealAction::WriteInstances(DzNode* Node, DzJsonWriter& Writer, QMap<QSt
 	DzShape* Shape = Object ? Object->getCurrentShape() : NULL;
 	DzGeometry* Geometry = Shape ? Shape->getGeometry() : NULL;
 	DzBone* Bone = qobject_cast<DzBone*>(Node);
+	DzGroupNode* GroupNode = qobject_cast<DzGroupNode*>(Node);
+	DzInstanceNode* InstanceNode = qobject_cast<DzInstanceNode*>(Node);
 
 	if (Bone == nullptr && Geometry)
 	{
 		ExportedGeometry.append(Geometry);
 		ParentID = WriteInstance(Node, Writer, ParentID);
 	}
 
+	if (GroupNode)
+	{
+		ParentID = WriteInstance(Node, Writer, ParentID);
+	}
+
+	if (InstanceNode)
+	{
+		ParentID = WriteInstance(Node, Writer, ParentID);
+	}
+
 	for (int ChildIndex = 0; ChildIndex < Node->getNumNodeChildren(); ChildIndex++)
 	{
 		DzNode* ChildNode = Node->getNodeChild(ChildIndex);
@@ -348,12 +417,26 @@ QUuid DzUnrealAction::WriteInstance(DzNode* Node, DzJsonWriter& Writer, QUuid Pa
 {
 	QString Path = Node->getAssetFileInfo().getUri().getFilePath();
 	QFile File(Path);
-	QString FileName = File.fileName();
-	QStringList Items = FileName.split("/");
-	QStringList Parts = Items[Items.count() - 1].split(".");
-	QString Name = Parts[0].remove(QRegExp("[^A-Za-z0-9_]"));
+	QString AssetID = Node->getAssetUri().getId();
+	QString Name = AssetID.remove(QRegExp("[^A-Za-z0-9_]"));
 	QUuid Uid = QUuid::createUuid();
 
+	// Group Node needs an empty InstanceAsset
+	DzGroupNode* GroupNode = qobject_cast<DzGroupNode*>(Node);
+	if (GroupNode)
+	{
+		Name = "";
+	}
+
+	// Group Node needs an empty InstanceAsset
+	DzInstanceNode* InstanceNode = qobject_cast<DzInstanceNode*>(Node);
+	if (InstanceNode)
+	{
+		AssetID = InstanceNode->getTarget()->getAssetUri().getId();
+		Name = AssetID.remove(QRegExp("[^A-Za-z0-9_]"));
+	}
+
+
 	Writer.startObject(true);
 	Writer.addMember("Version", 1);
 	Writer.addMember("InstanceLabel", Node->getLabel());