Merge pull request #13 from Unity-Technologies/UNI-20478-maintain-material-connection

UNI-20478 maintain material connection on export and reimport

Author: inwoods

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -9,13 +9,14 @@ namespace FbxExporters.EditorTools {
     [CustomEditor(typeof(ExportSettings))]
     public class ExportSettingsEditor : UnityEditor.Editor {
         public override void OnInspectorGUI() {
-            ExportSettings temp = (ExportSettings)target;
+            ExportSettings exportSettings = (ExportSettings)target;
 
-            temp.weldVertices = EditorGUILayout.Toggle ("Weld Vertices:", temp.weldVertices);
+            exportSettings.weldVertices = EditorGUILayout.Toggle ("Weld Vertices:", exportSettings.weldVertices);
+            exportSettings.embedTextures = EditorGUILayout.Toggle ("Embed Textures:", exportSettings.embedTextures);
 
             if (GUI.changed) {
-                EditorUtility.SetDirty (temp);
-                temp.Dirty ();
+                EditorUtility.SetDirty (exportSettings);
+                exportSettings.Save ();
             }
         }
     }
@@ -24,6 +25,7 @@ public override void OnInspectorGUI() {
     public class ExportSettings : FbxExporters.EditorTools.ScriptableSingleton<ExportSettings>
     {
         public bool weldVertices = true;
+        public bool embedTextures = false;
 
         [MenuItem("Edit/Project Settings/Fbx Export", priority = 300)]
         static void ShowManager()
@@ -32,7 +34,7 @@ static void ShowManager()
             Selection.activeObject = instance;
         }
 
-        public void Dirty()
+        public void Save()
         {
             instance.Save (true);
         }

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -254,7 +254,7 @@ public FbxDouble3 GetMaterialColor (Material unityMaterial, string unityPropName
             /// <summary>
             /// Export (and map) a Unity PBS material to FBX classic material
             /// </summary>
-            public FbxSurfaceMaterial ExportMaterial (Material unityMaterial, FbxScene fbxScene)
+            public FbxSurfaceMaterial ExportMaterial (Material unityMaterial, FbxScene fbxScene, FbxMesh fbxMesh)
             {
                 if (Verbose)
                     Debug.Log (string.Format ("exporting material {0}", unityMaterial.name));
@@ -292,6 +292,26 @@ public FbxSurfaceMaterial ExportMaterial (Material unityMaterial, FbxScene fbxSc
                     ExportTexture (unityMaterial, "_SpecGlosMap", fbxMaterial, FbxSurfaceMaterial.sSpecular);
                 }
 
+                // Add FbxLayerElementMaterial to layer 0 of the node
+                FbxLayer fbxLayer = fbxMesh.GetLayer (0 /* default layer */);
+                if (fbxLayer == null) {
+                    fbxMesh.CreateLayer ();
+                    fbxLayer = fbxMesh.GetLayer (0 /* default layer */);
+                }
+
+                using (var fbxLayerElement = FbxLayerElementMaterial.Create (fbxMesh, "Material")) {
+
+                    // Using all same means that the entire mesh uses the same material
+                    fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eAllSame);
+                    fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eIndexToDirect);
+
+                    FbxLayerElementArray fbxElementArray = fbxLayerElement.GetIndexArray ();
+
+                    // Map the entire geometry to the FbxNode material at index 0
+                    fbxElementArray.Add (0);
+                    fbxLayer.SetMaterials (fbxLayerElement);
+                }
+
                 MaterialMap.Add (materialName, fbxMaterial);
                 return fbxMaterial;
             }
@@ -350,7 +370,7 @@ meshInfo.Vertices [v].z
                     }
                 }
 
-                var fbxMaterial = ExportMaterial (meshInfo.Material, fbxScene);
+                var fbxMaterial = ExportMaterial (meshInfo.Material, fbxScene, fbxMesh);
                 fbxNode.AddMaterial (fbxMaterial);
 
                 /*
@@ -487,13 +507,18 @@ public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet)
                         fbxManager.SetIOSettings (FbxIOSettings.Create (fbxManager, Globals.IOSROOT));
 
                         // Export texture as embedded
-                        fbxManager.GetIOSettings ().SetBoolProp (Globals.EXP_FBX_EMBEDDED, true);
+                        if(EditorTools.ExportSettings.instance.embedTextures){
+                            fbxManager.GetIOSettings ().SetBoolProp (Globals.EXP_FBX_EMBEDDED, true);
+                        }
 
                         // Create the exporter
                         var fbxExporter = FbxExporter.Create (fbxManager, "Exporter");
 
                         // Initialize the exporter.
-                        int fileFormat = fbxManager.GetIOPluginRegistry ().FindWriterIDByDescription ("FBX ascii (*.fbx)");
+                        // fileFormat must be binary if we are embedding textures
+                        int fileFormat = EditorTools.ExportSettings.instance.embedTextures? -1 :
+                            fbxManager.GetIOPluginRegistry ().FindWriterIDByDescription ("FBX ascii (*.fbx)");
+
                         bool status = fbxExporter.Initialize (LastFilePath, fileFormat, fbxManager.GetIOSettings ());
                         // Check that initialization of the fbxExporter was successful
                         if (!status)