code review fixes

* small formatting fixes
* move verbose up
* move SkinnedMeshToBonesMap declaration into a function and pass it

Author: vkovec

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -37,15 +37,15 @@ public static class AnimationCurveExtension
             // This is an extension method for the AnimationCurve class
             // The first parameter takes the "this" modifier
             // and specifies the type for which the method is defined.
-            public static void Dump (this AnimationCurve animCurve, string message, float [] keyTimesExpected = null, float [] keyValuesExpected = null)
+            public static void Dump (this AnimationCurve animCurve, string message, float[] keyTimesExpected = null, float[] keyValuesExpected = null)
             {
                 int idx = 0;
                 foreach (var key in animCurve.keys) {
                     if (keyTimesExpected != null && keyValuesExpected != null) {
                         Debug.Log (string.Format ("{5} keys[{0}] {1}({3}) {2} ({4})",
-                                                  idx, key.time, key.value,
-                                                  keyTimesExpected [idx], keyValuesExpected [idx],
-                                                  message));
+                            idx, key.time, key.value,
+                            keyTimesExpected [idx], keyValuesExpected [idx],
+                            message));
                     } else {
                         Debug.Log (string.Format ("{3} keys[{0}] {1} {2}", idx, key.time, key.value, message));
                     }
@@ -128,7 +128,6 @@ static ModelExporter Create ()
             /// <summary>
             /// Which components map from Unity Object to Fbx Object
             /// </summary>
-            ///
             public enum FbxNodeRelationType
             {
                 NodeAttribute,
@@ -165,7 +164,7 @@ public enum FbxNodeRelationType
             /// <summary>
             /// Map the name of a prefab to an FbxMesh (for preserving instances) 
             /// </summary>
-            Dictionary<string, FbxMesh> SharedMeshes = new Dictionary<string, FbxMesh>();
+            Dictionary<string, FbxMesh> SharedMeshes = new Dictionary<string, FbxMesh> ();
 
             /// <summary>
             /// Map for the Name of an Object to number of objects with this name.
@@ -191,13 +190,14 @@ public static EditorTools.ExportSettings ExportSettings {
             public static Material DefaultMaterial {
                 get {
                     if (!s_defaultMaterial) {
-                        var obj = GameObject.CreatePrimitive(PrimitiveType.Quad);
-                        s_defaultMaterial = obj.GetComponent<Renderer>().sharedMaterial;
-                        Object.DestroyImmediate(obj);
+                        var obj = GameObject.CreatePrimitive (PrimitiveType.Quad);
+                        s_defaultMaterial = obj.GetComponent<Renderer> ().sharedMaterial;
+                        Object.DestroyImmediate (obj);
                     }
                     return s_defaultMaterial;
                 }
             }
+
             static Material s_defaultMaterial = null;
 
             static Dictionary<UnityEngine.LightType, FbxLight.EType> MapLightType = new Dictionary<UnityEngine.LightType, FbxLight.EType> () {
@@ -254,10 +254,10 @@ public static string GetVersionFromReadme()
                     int newLayerIndex = fbxMesh.CreateLayer();
                     if (newLayerIndex <= maxLayerIndex) {
                         // Error!
-                        throw new System.Exception(
-                                "Internal error: Unable to create mesh layer "
-                                + (maxLayerIndex + 1)
-                                + " on mesh " + fbxMesh.GetName());
+                        throw new System.Exception (
+                            "Internal error: Unable to create mesh layer "
+                            + (maxLayerIndex + 1)
+                            + " on mesh " + fbxMesh.GetName ());
                     }
                     maxLayerIndex = newLayerIndex;
                 }
@@ -773,9 +773,14 @@ SkinnedMeshRenderer unitySkin
                     return false;
                 }
 
+                if (Verbose)
+                    Debug.Log (string.Format ("exporting {0} {1}", "Skin", fbxNode.GetName ()));
+
+
+                Dictionary<SkinnedMeshRenderer, Transform[]> skinnedMeshToBonesMap;
                 // export skeleton
-                if (!ExportSkeleton (unitySkin, fbxScene)) {
-                    Debug.LogWarning("failed to export skeleton");
+                if (!ExportSkeleton (unitySkin, fbxScene, out skinnedMeshToBonesMap)) {
+                    Debug.LogWarning ("failed to export skeleton");
                     return false;
                 }
 
@@ -796,44 +801,58 @@ SkinnedMeshRenderer unitySkin
                 ExportSkin (unitySkin, meshInfo, fbxScene, fbxMesh, fbxNode);
 
                 // add bind pose
-                ExportBindPose (unitySkin, fbxNode, fbxScene);
+                ExportBindPose (unitySkin, fbxNode, fbxScene, skinnedMeshToBonesMap);
 
-                if (Verbose)
-                    Debug.Log (string.Format ("exporting {0} {1}", "Skin", fbxNode.GetName ()));
-                
                 return true;
             }
 
-            private bool IsBone(Transform t, Dictionary<Transform, int> bones){
+            /// <summary>
+            /// Determines whether this Transform is a bone.
+            /// A transform is a bone if it is in the skinned meshes bone list (represented here as a bones dict),
+            /// or if it has both an ancestor or descendant that are bones (i.e. if it is sandwiched between two bones,
+            /// it should be a bone as well).
+            /// </summary>
+            /// <returns><c>true</c> if this transform is a bone; otherwise, <c>false</c>.</returns>
+            /// <param name="t">Transform.</param>
+            /// <param name="bones">Skinned meshes bones.</param>
+            private bool IsBone (Transform t, Dictionary<Transform, int> bones)
+            {
                 if (bones.ContainsKey (t)) {
                     return true;
                 }
 
                 foreach (Transform child in t) {
                     if (IsBone (child, bones)) {
-                        //Debug.LogError ("our child is a bone: " + t.name);
                         return true;
                     }
                 }
                 return false;
             }
 
-            private Dictionary<SkinnedMeshRenderer, Transform[]> SkinnedMeshToBonesMap = new Dictionary<SkinnedMeshRenderer, Transform[]> ();
-
             /// <summary>
             /// Export bones of skinned mesh, if this is a skinned mesh with
             /// bones and bind poses.
             /// </summary>
-            private bool ExportSkeleton (SkinnedMeshRenderer skinnedMesh, FbxScene fbxScene)
+            private bool ExportSkeleton (SkinnedMeshRenderer skinnedMesh, FbxScene fbxScene, out Dictionary<SkinnedMeshRenderer, Transform[]> skinnedMeshToBonesMap)
             {
-                if (!skinnedMesh) { return false; }
+                skinnedMeshToBonesMap = new Dictionary<SkinnedMeshRenderer, Transform[]> ();
+
+                if (!skinnedMesh) {
+                    return false;
+                }
                 var bones = skinnedMesh.bones;
-                if (bones == null || bones.Length == 0) { return false; }
+                if (bones == null || bones.Length == 0) {
+                    return false;
+                }
                 var mesh = skinnedMesh.sharedMesh;
-                if (!mesh) { return false; }
+                if (!mesh) {
+                    return false;
+                }
 
                 var bindPoses = mesh.bindposes;
-                if (bindPoses == null || bindPoses.Length != bones.Length) { return false; }
+                if (bindPoses == null || bindPoses.Length != bones.Length) {
+                    return false;
+                }
 
                 // Three steps:
                 // 0. Set up the map from bone to index.
@@ -888,7 +907,7 @@ private bool ExportSkeleton (SkinnedMeshRenderer skinnedMesh, FbxScene fbxScene)
 
                 var boneList = boneSet.ToArray();
 
-                SkinnedMeshToBonesMap.Add (skinnedMesh, boneList);
+                skinnedMeshToBonesMap.Add (skinnedMesh, boneList);
 
                 // Step 2: Get bindposes
                 var boneToBindPose = new Dictionary<Transform, Matrix4x4>();
@@ -956,8 +975,8 @@ private bool ExportSkeleton (SkinnedMeshRenderer skinnedMesh, FbxScene fbxScene)
             /// Export binding of mesh to skeleton
             /// </summary>
             private bool ExportSkin (SkinnedMeshRenderer skinnedMesh, 
-                MeshInfo meshInfo, FbxScene fbxScene, FbxMesh fbxMesh,
-                FbxNode fbxRootNode)
+                                     MeshInfo meshInfo, FbxScene fbxScene, FbxMesh fbxMesh,
+                                     FbxNode fbxRootNode)
             {
                 FbxSkin fbxSkin = FbxSkin.Create (fbxScene, (skinnedMesh.name + "_Skin"));
 
@@ -1032,7 +1051,8 @@ boneWeights [i].weight3
             /// <summary>
             /// Export bind pose of mesh to skeleton
             /// </summary>
-            protected bool ExportBindPose (SkinnedMeshRenderer skinnedMesh, FbxNode fbxMeshNode, FbxScene fbxScene)
+            protected bool ExportBindPose (SkinnedMeshRenderer skinnedMesh, FbxNode fbxMeshNode,
+                                  FbxScene fbxScene, Dictionary<SkinnedMeshRenderer, Transform[]> skinnedMeshToBonesMap)
             {
                 FbxPose fbxPose = FbxPose.Create (fbxScene, fbxMeshNode.GetName());
 
@@ -1041,7 +1061,7 @@ protected bool ExportBindPose (SkinnedMeshRenderer skinnedMesh, FbxNode fbxMeshN
 
                 // assume each bone node has one weighted vertex cluster
                 Transform[] bones;
-                if (!SkinnedMeshToBonesMap.TryGetValue (skinnedMesh, out bones)) {
+                if (!skinnedMeshToBonesMap.TryGetValue (skinnedMesh, out bones)) {
                     return false;
                 }
                 for (int i = 0; i < bones.Length; i++) {
@@ -1093,13 +1113,13 @@ public static FbxDouble3 ConvertQuaternionToXYZEuler(Quaternion q)
 
             public static FbxVector4 ConvertQuaternionToXYZEuler (FbxQuaternion quat)
             {
-            	FbxAMatrix m = new FbxAMatrix ();
-            	m.SetQ (quat);
-            	var vector4 = m.GetR ();
+                FbxAMatrix m = new FbxAMatrix ();
+                m.SetQ (quat);
+                var vector4 = m.GetR ();
 
-            	// Negate the y and z values of the rotation to convert 
-            	// from Unity to Maya coordinates (left to righthanded).
-            	return new FbxVector4 (vector4.X, -vector4.Y, -vector4.Z, vector4.W);
+                // Negate the y and z values of the rotation to convert 
+                // from Unity to Maya coordinates (left to righthanded).
+                return new FbxVector4 (vector4.X, -vector4.Y, -vector4.Z, vector4.W);
             }
 
             // get a fbxNode's global default position.
@@ -1450,8 +1470,8 @@ public static bool TryGetValue(string uniPropertyName, out FbxPropertyChannelPai
                         return true;
                     }
                     if (uniPropertyName.StartsWith ("m_LocalPosition.z", ct) || uniPropertyName.EndsWith ("T.z", ct)) {
-                            prop = new FbxPropertyChannelPair ("Lcl Translation", Globals.FBXSDK_CURVENODE_COMPONENT_Z);
-                            return true;
+                        prop = new FbxPropertyChannelPair ("Lcl Translation", Globals.FBXSDK_CURVENODE_COMPONENT_Z);
+                        return true;
                     }
 
                     if (uniPropertyName.StartsWith("m_Intensity", ct))
@@ -1681,7 +1701,7 @@ protected void ExportAnimationClip (AnimationClip uniAnimClip, GameObject uniRoo
                     if (Verbose)
                     {
                         Debug.Log (string.Format ("Exporting animation curve bound to {0} {1}", 
-                                                  uniCurveBinding.propertyName, uniCurveBinding.path));
+                            uniCurveBinding.propertyName, uniCurveBinding.path));
                     }
 
                     int index = QuaternionCurve.GetQuaternionIndex (uniCurveBinding.propertyName);
@@ -1830,9 +1850,9 @@ protected int ExportNodes(
 
                 numObjectsExported++;
                 if (EditorUtility.DisplayCancelableProgressBar (
-                    ProgressBarTitle,
-                    string.Format ("Creating FbxNode {0}/{1}", numObjectsExported, objectCount),
-                    (numObjectsExported / (float)objectCount) * 0.25f)) {
+                        ProgressBarTitle,
+                        string.Format ("Creating FbxNode {0}/{1}", numObjectsExported, objectCount),
+                        (numObjectsExported / (float)objectCount) * 0.25f)) {
                     // cancel silently
                     return -1;
                 }
@@ -1866,9 +1886,9 @@ protected bool ExportComponents(FbxScene fbxScene)
                 foreach (KeyValuePair<GameObject, FbxNode> entry in MapUnityObjectToFbxNode) {
                     numObjectsExported++;
                     if (EditorUtility.DisplayCancelableProgressBar (
-                        ProgressBarTitle,
-                        string.Format ("Exporting Components for GameObject {0}/{1}", numObjectsExported, objectCount),
-                        ((numObjectsExported / (float)objectCount) * 0.25f) + 0.25f)) {
+                            ProgressBarTitle,
+                            string.Format ("Exporting Components for GameObject {0}/{1}", numObjectsExported, objectCount),
+                            ((numObjectsExported / (float)objectCount) * 0.25f) + 0.25f)) {
                         // cancel silently
                         return false;
                     }
@@ -1895,7 +1915,7 @@ protected bool ExportComponents(FbxScene fbxScene)
                     }
 
                     // now (try) export animation
-    				ExportAnimation (unityGo, fbxScene);
+                    ExportAnimation (unityGo, fbxScene);
 
                 }
                 return true;
@@ -2341,7 +2361,8 @@ public Vector3 [] Normals { get {
                             m_normals = mesh.normals;
                         }
                         return m_normals; 
-                    } }
+                    }
+                }
 
                 /// <summary>
                 /// Gets the binormals for the vertices.
@@ -2382,7 +2403,8 @@ public Vector4 [] Tangents { get {
                             m_tangents = mesh.tangents;
                         }
                         return m_tangents; 
-                    } }
+                    }
+                }
 
                 /// <summary>
                 /// Gets the vertex colors for the vertices.
@@ -2394,7 +2416,8 @@ public Color32 [] VertexColors { get {
                             m_vertexColors = mesh.colors32;
                         }
                         return m_vertexColors; 
-                    } }
+                    }
+                }
 
                 /// <summary>
                 /// Gets the uvs.
@@ -2406,7 +2429,8 @@ public Vector2 [] UV { get {
                             m_UVs = mesh.uv;
                         }
                         return m_UVs; 
-                    } }
+                    }
+                }
 
                 /// <summary>
                 /// The material(s) used.
@@ -2421,7 +2445,8 @@ public BoneWeight[] BoneWeights { get {
                             m_boneWeights = mesh.boneWeights;
                         }
                         return m_boneWeights; 
-                    } }
+                    }
+                }
 
                 /// <summary>
                 /// Set up the MeshInfo with the given mesh and materials.
@@ -2523,10 +2548,10 @@ public static void RegisterMeshCallback<T>(GetMeshForComponent<T> callback, bool
                 where T: UnityEngine.MonoBehaviour
             {
                 // Under the hood we lose type safety, but don't let the user notice!
-                RegisterMeshCallback(typeof(T),
-                        (ModelExporter exporter, MonoBehaviour component, FbxNode fbxNode) =>
-                            callback(exporter, (T)component, fbxNode),
-                        replace);
+                RegisterMeshCallback (typeof(T),
+                    (ModelExporter exporter, MonoBehaviour component, FbxNode fbxNode) =>
+                            callback (exporter, (T)component, fbxNode),
+                    replace);
             }
 
             /// <summary>
@@ -2728,6 +2753,7 @@ private static void OnExport ()
                                       : System.IO.Path.GetDirectoryName (LastFilePath);
 
                 GameObject [] selectedGOs = Selection.GetFiltered<GameObject> (SelectionMode.TopLevel);
+                GameObject[] selectedGOs = Selection.GetFiltered<GameObject> (SelectionMode.TopLevel);
                 string filename = null;
                 if (selectedGOs.Length == 1) {
                     filename = ConvertToValidFilename (selectedGOs [0].name + ".fbx");