Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-30766-add-camera-export

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -1,10 +1,3 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
 using System.IO;
 using System.Collections.Generic;
 using UnityEngine;

Assets/FbxExporters/Editor/EditorRotate.cs

@@ -1,12 +1,4 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
-
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;

Assets/FbxExporters/Editor/FbxExportSettings.cs

@@ -1,10 +1,3 @@
-// ***********************************************************************
-// Copyright (c) 2017 Unity Technologies. All rights reserved.
-//
-// Licensed under the ##LICENSENAME##.
-// See LICENSE.md file in the project root for full license information.
-// ***********************************************************************
-
 using System.IO;
 using System.Collections.Generic;
 using UnityEngine;
@@ -54,6 +47,12 @@ public class ModelExporter : System.IDisposable
 
             public const string PACKAGE_UI_NAME = "FBX Exporter";
 
+            public enum ExportFormat
+            {
+                Binary = 0,
+                ASCII = 1
+            }
+
             /// <summary>
             /// name of the scene's default camera
             /// </summary>
@@ -252,7 +251,7 @@ void ExportComponentAttributes (MeshInfo mesh, FbxMesh fbxMesh, int[] unmergedTr
                     // set texture coordinates per vertex
                     FbxLayerElementArray fbxElementArray = fbxLayerElement.GetDirectArray ();
 
-                    // TODO: only copy unique UVs into this array, and index appropriately
+                    // (Uni-31596) only copy unique UVs into this array, and index appropriately
                     for (int n = 0; n < mesh.VertexColors.Length; n++) {
                         // Converting to Color from Color32, as Color32 stores the colors
                         // as ints between 0-255, while FbxColor and Color
@@ -305,7 +304,7 @@ static void ExportUVs(FbxMesh fbxMesh, MeshInfo mesh, int[] unmergedTriangles)
                         // set texture coordinates per vertex
                         FbxLayerElementArray fbxElementArray = fbxLayerElement.GetDirectArray ();
 
-                        // TODO: only copy unique UVs into this array, and index appropriately
+                        // (Uni-31596) only copy unique UVs into this array, and index appropriately
                         for (int n = 0; n < uvs[i].Length; n++) {
                             fbxElementArray.Add (new FbxVector2 (uvs[i] [n] [0],
                                 uvs[i] [n] [1]));
@@ -1118,7 +1117,11 @@ public int ExportAll (IEnumerable<UnityEngine.Object> unityExportSet)
 
                         // Initialize the exporter.
                         // fileFormat must be binary if we are embedding textures
-                        int fileFormat = fbxManager.GetIOPluginRegistry ().FindWriterIDByDescription ("FBX ascii (*.fbx)");
+                        int fileFormat = -1;
+                        if (EditorTools.ExportSettings.instance.ExportFormatSelection == (int)ExportFormat.ASCII)
+                        {
+                            fileFormat = fbxManager.GetIOPluginRegistry().FindWriterIDByDescription("FBX ascii (*.fbx)");
+                        }                        
 
                         status = fbxExporter.Initialize (m_tempFilePath, fileFormat, fbxManager.GetIOSettings ());
                         // Check that initialization of the fbxExporter was successful
@@ -1380,7 +1383,7 @@ public Vector3 [] Normals { get {
                     } }
 
                 /// <summary>
-                /// TODO: Gets the binormals for the vertices.
+                /// Gets the binormals for the vertices.
                 /// </summary>
                 /// <value>The normals.</value>
                 private Vector3[] m_Binormals;
@@ -1408,7 +1411,7 @@ public Vector3 [] Binormals {
                 }
 
                 /// <summary>
-                /// TODO: Gets the tangents for the vertices.
+                /// Gets the tangents for the vertices.
                 /// </summary>
                 /// <value>The tangents.</value>
                 private Vector4[] m_tangents;
@@ -1420,7 +1423,7 @@ public Vector4 [] Tangents { get {
                     } }
 
                 /// <summary>
-                /// TODO: Gets the vertex colors for the vertices.
+                /// Gets the vertex colors for the vertices.
                 /// </summary>
                 /// <value>The vertex colors.</value>
                 private Color32 [] m_vertexColors;

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -773,11 +773,11 @@ void ClassifyComponents(Transform newFbx, Transform prefab)
                     // same node), we line up the components in the order they
                     // appear. This never happens in stock Unity, someone must have
                     // added an AssetPostprocessor for it to occur.
-                    // TODO: do something smarter.
+                    // (Uni-31604) Improve how the auto-updater classifies components
                     //
                     // If the node isn't going to be in the prefab, we don't care
                     // about what components might be on it.
-                    foreach(var name in m_nodesInUpdatedPrefab)
+                    foreach (var name in m_nodesInUpdatedPrefab)
                     {
                         if (!m_new.HasNode(name)) {
                             // It's not in the FBX, so clearly we're not updating any components.
@@ -794,18 +794,12 @@ void ClassifyComponents(Transform newFbx, Transform prefab)
                             List<string> prefabValues = null; // get them only if we need them.
 
                             // If we have multiple identical-type components, match them up by index.
-                            // TODO: match them up to minimize the diff instead.
                             int oldN = oldValues.Count;
                             int newN = newValues.Count;
                             for(int i = 0, n = System.Math.Max(oldN, newN); i < n; ++i) {
                                 if (/* isNew */ i < newN) {
                                     var newValue = newValues[i];
-
-                                    // Special case on Transform: if we reparented
-                                    // this node then always update the transform
-                                    // (UNI-25526). That's because when we do the
-                                    // reparenting, it changes the 'prefabValue' in
-                                    // a complicated way.
+                                    
                                     var isReparentedTransform = (typename == "UnityEngine.Transform"
                                         && m_reparentings.ContainsKey(name));
 

Assets/FbxExporters/Editor/FbxPrefabAutoUpdater.cs

@@ -18,7 +18,7 @@ public override void OnInspectorGUI() {
 
             var fbxPrefabUtility = new FbxPrefabAutoUpdater.FbxPrefabUtility (fbxPrefab);
             var oldFbxAsset = fbxPrefabUtility.GetFbxAsset();
-            var newFbxAsset = EditorGUILayout.ObjectField("Source Fbx Asset", oldFbxAsset,
+            var newFbxAsset = EditorGUILayout.ObjectField(new GUIContent("Source Fbx Asset", "The FBX file that is linked to this Prefab"), oldFbxAsset,
                     typeof(GameObject), allowSceneObjects: false) as GameObject;
             if (newFbxAsset && !AssetDatabase.GetAssetPath(newFbxAsset).EndsWith(".fbx")) {
                 Debug.LogError("FbxPrefab must point to an Fbx asset (or none).");