Merge pull request #242 from Unity-Technologies/UNI-24636-1.2.0b1-forum-release

UNI-24636 1.2.0b1 forum release

Author: vkovec

.gitignore

@@ -20,7 +20,8 @@
 **/.idea/
 
 ## Unity ##
-*.meta
+[Aa]ssets/**/*.meta
+![Aa]ssets/FbxExporters/**/*.meta
 [Pp]rojectSettings/*.asset
 [Pp]rojectSettings/*.txt
 

Assets/FbxExporters/Editor.meta

@@ -180,6 +180,43 @@ public override void OnInspectorGUI() {
             }
             EditorGUI.EndDisabledGroup ();
 
+            EditorGUILayout.Space ();
+
+            EditorGUI.indentLevel--;
+            EditorGUILayout.LabelField ("FBX Prefab Component Updater", EditorStyles.boldLabel);
+            EditorGUI.indentLevel++;
+
+            EditorGUILayout.Space ();
+
+            var repairMissingScripts = new GUIContent (
+                                       "Run Component Updater",
+                                        "If the forum package 1.1.0b1 was previously installed, then links to the FbxPrefab component " +
+                                        "in assets created with the FBX exporter will need updating.\n" +
+                                        "Run this button to update all FbxPrefab references in text serialized prefabs and scene files.");
+
+            if (GUILayout.Button (repairMissingScripts)) {
+                var componentUpdater = new FbxExporters.Editor.RepairMissingScripts ();
+                var filesToRepairCount = componentUpdater.GetAssetsToRepairCount ();
+                var dialogTitle = "FBX Prefab Component Updater";
+                if (filesToRepairCount > 0) {
+                    bool result = UnityEditor.EditorUtility.DisplayDialog (dialogTitle,
+                        string.Format("Found {0} prefab(s) and/or scene(s) with components requiring update.\n\n" +
+                        "If you choose 'Go Ahead', the FbxPrefab components in these assets " +
+                        "will be automatically updated to work with the latest FBX exporter.\n" +
+                            "You should make a backup before proceeding.", filesToRepairCount),
+                        "I Made a Backup. Go Ahead!", "No Thanks");
+                    if (result) {
+                        componentUpdater.ReplaceGUIDInTextAssets ();
+                    } else {
+                        var assetsToRepair = componentUpdater.GetAssetsToRepair ();
+                        Debug.LogFormat ("Failed to update the FbxPrefab components in the following files:\n{0}", string.Join ("\n", assetsToRepair));
+                    }
+                } else {
+                    UnityEditor.EditorUtility.DisplayDialog (dialogTitle,
+                        "Couldn't find any prefabs or scenes that require updating", "Ok");
+                }
+            }
+
             GUILayout.FlexibleSpace ();
             GUILayout.EndScrollView ();
             GUILayout.EndVertical();

Assets/FbxExporters/Editor/ConvertToModel.cs.meta

@@ -199,7 +199,7 @@ private bool ExportComponentAttributes (MeshInfo mesh, FbxMesh fbxMesh, int[] un
                 // Set the normals on Layer 0.
                 FbxLayer fbxLayer = GetOrCreateLayer(fbxMesh);
 
-                if (mesh.HasValidNormals(unmergedTriangles.Length)) {
+                if (mesh.HasValidNormals()) {
                     using (var fbxLayerElement = FbxLayerElementNormal.Create (fbxMesh, "Normals")) {
                         fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eByPolygonVertex);
                         fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eDirect);
@@ -218,7 +218,7 @@ private bool ExportComponentAttributes (MeshInfo mesh, FbxMesh fbxMesh, int[] un
                 }
 
                 /// Set the binormals on Layer 0.
-                if (mesh.HasValidBinormals(unmergedTriangles.Length)) {
+                if (mesh.HasValidBinormals()) {
                     using (var fbxLayerElement = FbxLayerElementBinormal.Create (fbxMesh, "Binormals")) {
                         fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eByPolygonVertex);
                         fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eDirect);
@@ -236,7 +236,7 @@ private bool ExportComponentAttributes (MeshInfo mesh, FbxMesh fbxMesh, int[] un
                 }
 
                 /// Set the tangents on Layer 0.
-                if (mesh.HasValidTangents(unmergedTriangles.Length)) {
+                if (mesh.HasValidTangents()) {
                     using (var fbxLayerElement = FbxLayerElementTangent.Create (fbxMesh, "Tangents")) {
                         fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eByPolygonVertex);
                         fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eDirect);
@@ -260,7 +260,7 @@ mesh.Tangents [unityTriangle] [2]
 
                 exportedAttribute |= ExportUVs (fbxMesh, mesh, unmergedTriangles);
 
-                if (mesh.HasValidVertexColors(unmergedTriangles.Length)) {
+                if (mesh.HasValidVertexColors()) {
                     using (var fbxLayerElement = FbxLayerElementVertexColor.Create (fbxMesh, "VertexColors")) {
                         fbxLayerElement.SetMappingMode (FbxLayerElement.EMappingMode.eByPolygonVertex);
                         fbxLayerElement.SetReferenceMode (FbxLayerElement.EReferenceMode.eIndexToDirect);
@@ -1463,9 +1463,7 @@ public Vector3 [] Binormals {
                             var normals = Normals;
                             var tangents = Tangents;
 
-                            if (IsValidArray<Vector3>(normals) &&
-                                IsValidArray<Vector4>(tangents, normals.Length)
-                            ) {
+                            if (HasValidNormals() && HasValidTangents()) {
                                 m_Binormals = new Vector3 [normals.Length];
 
                                 for (int i = 0; i < normals.Length; i++)
@@ -1546,34 +1544,22 @@ public MeshInfo (Mesh mesh, Material[] materials)
                     }
                 }
 
-                /// <summary>
-                /// Determines whether this instance is a valid array with the specified length.
-                /// </summary>
-                /// <returns><c>true</c> if this instance is valid array; otherwise, <c>false</c>.</returns>
-                /// <param name="array">Array.</param>
-                /// <param name="expectedLength">Expected length.</param>
-                /// <typeparam name="T">The 1st type parameter.</typeparam>
-                public static bool IsValidArray<T>(T[] array, int expectedLength = -1)
-                {
-                    return array != null &&
-                        array.Length > 0 &&
-                        (expectedLength >= 0 ? array.Length == expectedLength : true);
-                }
-
-                public bool HasValidNormals(int expectedLength){
-                    return IsValidArray<Vector3> (Normals, expectedLength);
+                public bool HasValidNormals(){
+                    return Normals != null && Normals.Length > 0;
                 }
 
-                public bool HasValidBinormals(int expectedLength){
-                    return IsValidArray<Vector3> (Binormals, expectedLength);
+                public bool HasValidBinormals(){
+                    return HasValidNormals () &&
+                        HasValidTangents () &&
+                        Binormals != null;
                 }
 
-                public bool HasValidTangents(int expectedLength){
-                    return IsValidArray<Vector4> (Tangents, expectedLength);
+                public bool HasValidTangents(){
+                    return Tangents != null && Tangents.Length > 0;
                 }
 
-                public bool HasValidVertexColors(int expectedLength){
-                    return IsValidArray<Color32> (VertexColors, expectedLength);
+                public bool HasValidVertexColors(){
+                    return VertexColors != null && VertexColors.Length > 0;
                 }
             }
 

Assets/FbxExporters/Editor/EditorRotate.cs.meta

@@ -0,0 +1,174 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using System.IO;
+
+namespace FbxExporters.Editor
+{
+    public class RepairMissingScripts
+    {
+        private const string m_forumPackageGUID = "2d81c55c4d9d85146b1d2de96e084b63";
+        private const string m_currentPackageGUID = "628ffbda3fdf4df4588770785d91a698";
+
+        private const string m_fbxPrefabDLLFileId = "69888640";
+
+        private const string m_idFormat = "{{fileID: {0}, guid: {1}, type:";
+
+        private static string m_forumPackageSearchID;
+
+        private static string ForumPackageSearchID {
+            get {
+                if (string.IsNullOrEmpty (m_forumPackageSearchID)) {
+                    m_forumPackageSearchID = string.Format (m_idFormat, m_fbxPrefabDLLFileId, m_forumPackageGUID);
+                }
+                return m_forumPackageSearchID;
+            }
+        }
+
+        private static string m_currentPackageSearchID;
+
+        private static string CurrentPackageSearchID {
+            get {
+                if (string.IsNullOrEmpty (m_currentPackageSearchID)) {
+                    m_currentPackageSearchID = string.Format (m_idFormat, m_fbxPrefabDLLFileId, m_currentPackageGUID);
+                }
+                return m_currentPackageSearchID;
+            }
+        }
+
+        private string[] m_assetsToRepair;
+        private string[] AssetsToRepair{
+            get{
+                if (m_assetsToRepair == null) {
+                    m_assetsToRepair = FindAssetsToRepair ();
+                }
+                return m_assetsToRepair;
+            }
+        }
+
+        public int GetAssetsToRepairCount(){
+            return AssetsToRepair.Length;
+        }
+
+        public string[] GetAssetsToRepair(){
+            return AssetsToRepair;
+        }
+
+        public static string[] FindAssetsToRepair()
+        {
+            // search project for assets containing old GUID
+
+            // ignore if forced binary
+            if (UnityEditor.EditorSettings.serializationMode == SerializationMode.ForceBinary) {
+                return new string[]{};
+            }
+
+            // check all scenes and prefabs
+            string[] searchFilePatterns = new string[]{ "*.prefab", "*.unity" };
+
+            List<string> assetsToRepair = new List<string> ();
+            foreach (string searchPattern in searchFilePatterns) {
+                foreach (string file in Directory.GetFiles(Application.dataPath, searchPattern, SearchOption.AllDirectories)) {
+                    if (AssetNeedsRepair (file)) {
+                        assetsToRepair.Add (file);
+                    }
+                }
+            }
+            return assetsToRepair.ToArray ();
+        }
+
+        private static bool AssetNeedsRepair(string filePath)
+        {
+            try{
+                using(var sr = new StreamReader (filePath)){
+                    if(sr.Peek() > -1){
+                        var firstLine = sr.ReadLine();
+                        if(!firstLine.StartsWith("%YAML")){
+                            sr.Close();
+                            return false;
+                        }
+                    }
+
+                    var contents = sr.ReadToEnd();
+                    if(contents.Contains(ForumPackageSearchID)){
+                        sr.Close();
+                        return true;
+                    }
+                }
+            }
+            catch(IOException e){
+                Debug.LogError (string.Format ("Failed to check file for component update: {0} (error={1})", filePath, e));
+            }
+            return false;
+        }
+
+        public bool ReplaceGUIDInTextAssets ()
+        {
+            bool replacedGUID = false;
+            foreach (string file in AssetsToRepair) {
+                replacedGUID |= ReplaceGUIDInFile (file);
+            }
+            if (replacedGUID) {
+                AssetDatabase.Refresh ();
+            }
+            return replacedGUID;
+        }
+
+        private static bool ReplaceGUIDInFile (string path)
+        {
+            // try to read file, assume it's a text file for now
+            bool modified = false;
+
+            try {
+                var tmpFile = Path.GetTempFileName();
+                if(string.IsNullOrEmpty(tmpFile)){
+                    return false;
+                }
+
+                using(var sr = new StreamReader (path)){
+                    // verify that this is a text file
+                    var firstLine = "";
+                    if (sr.Peek () > -1) {
+                        firstLine = sr.ReadLine ();
+                        if (!firstLine.StartsWith ("%YAML")) {
+                            sr.Close ();
+                            return false;
+                        }
+                    }
+
+                    using(var sw = new StreamWriter (tmpFile, false)){
+                        if (!string.IsNullOrEmpty (firstLine)) {
+                            sw.WriteLine (firstLine);
+                        }
+
+                        while (sr.Peek () > -1) {
+                            var line = sr.ReadLine ();
+
+                            if (line.Contains (ForumPackageSearchID)) {
+                                line = line.Replace (ForumPackageSearchID, CurrentPackageSearchID);
+                                modified = true;
+                            }
+
+                            sw.WriteLine (line);
+                        }
+                    }
+                }
+
+                if (modified) {
+                    File.Delete (path);
+                    File.Move (tmpFile, path);
+
+                    Debug.LogFormat("Updated FbxPrefab components in file {0}", path);
+                    return true;
+                } else {
+                    File.Delete (tmpFile);
+                }
+            } catch (IOException e) {
+                Debug.LogError (string.Format ("Failed to replace GUID in file {0} (error={1})", path, e));
+            }
+
+            return false;
+        }
+    }
+}