replace FbxExporters.Editor and FbxExporters.EditorTools with UnityEditor.Formats.Fbx.Exporter

vkovec · vkovec · commit f586cc311eee · 2018-05-25T12:30:05.000-04:00
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToModel.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToModel.cs
@@ -215,7 +215,7 @@ public static GameObject GetOrCreateFbxAsset(GameObject toConvert,
                 if (string.IsNullOrEmpty(fbxFullPath)) {
                     // Generate a unique filename.
                     if (string.IsNullOrEmpty (fbxDirectoryFullPath)) {
-                        fbxDirectoryFullPath = FbxExporters.EditorTools.ExportSettings.GetFbxAbsoluteSavePath();
+                        fbxDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.GetFbxAbsoluteSavePath();
                     } else {
                         fbxDirectoryFullPath = Path.GetFullPath (fbxDirectoryFullPath);
                     }
@@ -323,7 +323,7 @@ public static GameObject ApplyOrCreatePrefab(GameObject instance,
                 if (string.IsNullOrEmpty(prefabFullPath)) {
                     // Generate a unique filename.
                     if (string.IsNullOrEmpty (prefabDirectoryFullPath)) {
-                        prefabDirectoryFullPath = FbxExporters.EditorTools.ExportSettings.GetPrefabAbsoluteSavePath();
+                        prefabDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.GetPrefabAbsoluteSavePath();
                     } else {
                         prefabDirectoryFullPath = Path.GetFullPath (prefabDirectoryFullPath);
                     }
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToPrefabEditorWindow.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToPrefabEditorWindow.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
-using FbxExporters.EditorTools;
+using UnityEditor.Formats.Fbx.Exporter;
 #if UNITY_2018_1_OR_NEWER
 using UnityEditor.Presets;
 #endif
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToPrefabSettings.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToPrefabSettings.cs
@@ -1,7 +1,7 @@
 ﻿using UnityEditor;
 using UnityEngine;
 
-namespace FbxExporters.EditorTools
+namespace UnityEditor.Formats.Fbx.Exporter
 {
     [CustomEditor (typeof(ConvertToPrefabSettings))]
     public class ConvertToPrefabSettingsEditor : UnityEditor.Editor
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ExportModelEditorWindow.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ExportModelEditorWindow.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
-using FbxExporters.EditorTools;
+using UnityEditor.Formats.Fbx.Exporter;
 #if UNITY_2018_1_OR_NEWER
 using UnityEditor.Presets;
 #endif
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ExportModelSettings.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ExportModelSettings.cs
@@ -1,7 +1,7 @@
 ﻿using UnityEditor;
 using UnityEngine;
 
-namespace FbxExporters.EditorTools
+namespace UnityEditor.Formats.Fbx.Exporter
 {
     [CustomEditor (typeof(ExportModelSettings))]
     public class ExportModelSettingsEditor : UnityEditor.Editor
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/FbxExportSettings.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/FbxExportSettings.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace FbxExporters.EditorTools {
+namespace UnityEditor.Formats.Fbx.Exporter {
 
     [CustomEditor(typeof(ExportSettings))]
     public class ExportSettingsEditor : UnityEditor.Editor {
@@ -25,7 +25,7 @@ public override void OnInspectorGUI() {
 
             scrollPos = GUILayout.BeginScrollView (scrollPos);
 
-            var version = FbxExporters.Editor.ModelExporter.GetVersionFromReadme ();
+            var version = UnityEditor.Formats.Fbx.Exporter.ModelExporter.GetVersionFromReadme ();
             if (!string.IsNullOrEmpty(version)) {
                 GUILayout.Label ("Version: " + version, EditorStyles.centeredGreyMiniLabel);
                 EditorGUILayout.Space ();
@@ -110,7 +110,7 @@ public override void OnInspectorGUI() {
                     "Install Unity Integration",
                     "Install and configure the Unity integration for the selected 3D application so that you can import and export directly with this project.");
             if (GUILayout.Button (installIntegrationContent)) {
-                EditorApplication.delayCall += FbxExporters.Editor.IntegrationsUI.InstallDCCIntegration;
+                EditorApplication.delayCall += UnityEditor.Formats.Fbx.Exporter.IntegrationsUI.InstallDCCIntegration;
             }
             EditorGUI.EndDisabledGroup ();
 
@@ -128,7 +128,7 @@ public override void OnInspectorGUI() {
                                         "Run this to update all FbxPrefab references in text serialized prefabs and scene files.");
 
             if (GUILayout.Button (repairMissingScripts)) {
-                var componentUpdater = new FbxExporters.Editor.RepairMissingScripts ();
+                var componentUpdater = new UnityEditor.Formats.Fbx.Exporter.RepairMissingScripts ();
                 var filesToRepairCount = componentUpdater.GetAssetsToRepairCount ();
                 var dialogTitle = "FBX Prefab Component Updater";
                 if (filesToRepairCount > 0) {
@@ -909,7 +909,7 @@ public static bool CanInstall()
         }
 
         public static string GetProjectRelativePath(string fullPath){
-            var assetRelativePath = FbxExporters.EditorTools.ExportSettings.ConvertToAssetRelativePath(fullPath);
+            var assetRelativePath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.ConvertToAssetRelativePath(fullPath);
             var projectRelativePath = "Assets/" + assetRelativePath;
             if (string.IsNullOrEmpty(assetRelativePath)) {
                 throw new System.Exception("Path " + fullPath + " must be in the Assets folder.");
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/FbxExporter.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/FbxExporter.cs
@@ -7,7 +7,7 @@
 using UnityEngine.Playables;
 using UnityEngine.Timeline;	
 using UnityEngine.Formats.FbxSdk;
-using FbxExporters.EditorTools;
+using UnityEditor.Formats.Fbx.Exporter;
 using FbxExporters.Visitors;
 using FbxExporters.CustomExtensions;
 
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/FbxExporterRepairMissingScripts.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/FbxExporterRepairMissingScripts.cs
@@ -4,7 +4,7 @@
 using UnityEditor;
 using System.IO;
 
-namespace FbxExporters.Editor
+namespace UnityEditor.Formats.Fbx.Exporter
 {
     public class RepairMissingScripts
     {
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/FbxPrefabAutoUpdater.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/FbxPrefabAutoUpdater.cs
@@ -3,7 +3,7 @@
 using UnityEditor;
 using System.Linq;
 using System;
-using FbxExporters.Editor;
+using UnityEditor.Formats.Fbx.Exporter;
 
 namespace FbxExporters
 {
@@ -57,7 +57,7 @@ public static string FindFbxPrefabAssetPath()
                 }
             }
             if (foundPath == "") {
-                Debug.LogWarning(string.Format("{0} not found; are you trying to uninstall {1}?", FBX_PREFAB_FILE.Substring(1), FbxExporters.Editor.ModelExporter.PACKAGE_UI_NAME));
+                Debug.LogWarning(string.Format("{0} not found; are you trying to uninstall {1}?", FBX_PREFAB_FILE.Substring(1), UnityEditor.Formats.Fbx.Exporter.ModelExporter.PACKAGE_UI_NAME));
             }
             return foundPath;
         #else
@@ -67,7 +67,7 @@ public static string FindFbxPrefabAssetPath()
             if (System.IO.File.Exists(System.IO.Path.GetFullPath(path))) {
                 return path;
             } else {
-                Debug.LogWarning(string.Format("{0} not found; are you trying to uninstall {1}?", FBX_PREFAB_FILE, FbxExporters.Editor.ModelExporter.PACKAGE_UI_NAME));
+                Debug.LogWarning(string.Format("{0} not found; are you trying to uninstall {1}?", FBX_PREFAB_FILE, UnityEditor.Formats.Fbx.Exporter.ModelExporter.PACKAGE_UI_NAME));
                 return "";
             }
         #endif
@@ -113,7 +113,7 @@ public static bool MayHaveFbxPrefabToFbxAsset(string prefabPath,
         static void OnPostprocessAllAssets(string[] imported, string[] deleted, string[] moved, string[] movedFrom)
         {
             // Do not start if Auto Updater is disabled in FBX Exporter Settings
-            if (!FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled)
+            if (!UnityEditor.Formats.Fbx.Exporter.ExportSettings.instance.autoUpdaterEnabled)
             {
                 return;
             }
@@ -293,7 +293,7 @@ public static void UpdateLinkedPrefab(GameObject prefabOrInstance)
                 // renamed nodes (or auto-update if there's nothing to rename).
                 var fbxPrefabUtility = new FbxPrefabUtility(fbxPrefabComponent);
 
-                if (FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled || runningUnitTest)
+                if (UnityEditor.Formats.Fbx.Exporter.ExportSettings.instance.autoUpdaterEnabled || runningUnitTest)
                 {
                     fbxPrefabUtility.SyncPrefab();
                 }
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/FbxPrefabInspector.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/FbxPrefabInspector.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEditor;
 
-namespace FbxExporters.EditorTools {
+namespace UnityEditor.Formats.Fbx.Exporter {
 
     [CustomEditor(typeof(FbxPrefab))]
     public class FbxPrefabInspector : UnityEditor.Editor {
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/FbxRotationCurve.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/FbxRotationCurve.cs
@@ -41,7 +41,7 @@ private Key [] ComputeKeys(UnityEngine.Quaternion restRotation, FbxNode node) {
 
                 // Find when we have keys set.
                 var keyTimes = 
-                    (FbxExporters.Editor.ModelExporter.ExportSettings.BakeAnimation) 
+                    (UnityEditor.Formats.Fbx.Exporter.ModelExporter.ExportSettings.BakeAnimation) 
                     ? ModelExporter.GetSampleTimes(m_curves, sampleRate) 
                     : ModelExporter.GetKeyTimes(m_curves);
 
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/InstallIntegration.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/InstallIntegration.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace FbxExporters.Editor
+namespace UnityEditor.Formats.Fbx.Exporter
 {
     public abstract class DCCIntegration
     {
@@ -668,15 +668,15 @@ class IntegrationsUI
         /// The path of the DCC executable.
         /// </summary>
         public static string GetDCCExe () {
-            return FbxExporters.EditorTools.ExportSettings.GetSelectedDCCPath ();
+            return UnityEditor.Formats.Fbx.Exporter.ExportSettings.GetSelectedDCCPath ();
         }
 
         /// <summary>
         /// Gets the name of the selected DCC.
         /// </summary>
         /// <returns>The DCC name.</returns>
         public static string GetDCCName() {
-            return FbxExporters.EditorTools.ExportSettings.GetSelectedDCCName ();
+            return UnityEditor.Formats.Fbx.Exporter.ExportSettings.GetSelectedDCCName ();
         }
 
         /// <summary>
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ManualUpdateEditorWindow.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ManualUpdateEditorWindow.cs
@@ -18,7 +18,7 @@ public class ManualUpdateEditorWindow : EditorWindow
 
     List<string> m_nodeNameToSuggest;
 
-    public bool Verbose { private set {;} get { return FbxExporters.EditorTools.ExportSettings.instance.Verbose; } }
+    public bool Verbose { private set {;} get { return UnityEditor.Formats.Fbx.Exporter.ExportSettings.instance.Verbose; } }
 
     public void Init(FbxPrefabAutoUpdater.FbxPrefabUtility fbxPrefabUtility, FbxPrefab fbxPrefab)
     {
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ReviewLastSavedModel.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ReviewLastSavedModel.cs
@@ -26,7 +26,7 @@ static void OnPostprocessAllAssets(
                 foreach (var assetPath in importedAssets) {
                     if (assetPath.StartsWith(tempSavePath) && assetPath.EndsWith(".fbx")) {
                         // if the instruction file exists, then run the turntable and delete the file
-                        string instructionFile = "";//FbxExporters.Editor.MayaIntegration.GetFullMayaInstructionPath ();
+                        string instructionFile = "";//UnityEditor.Formats.Fbx.Exporter.MayaIntegration.GetFullMayaInstructionPath ();
                         if(System.IO.File.Exists(instructionFile)){
                             LastSavedModel ();
                             System.IO.File.Delete (instructionFile);
@@ -93,7 +93,7 @@ private static Object LoadModel (string fbxFileName)
                 GameObject modelGO = null;
 
                 // make relative to UnityProject folder.
-                string relFileName = System.IO.Path.Combine ("Assets", FbxExporters.EditorTools.ExportSettings.ConvertToAssetRelativePath (fbxFileName));
+                string relFileName = System.IO.Path.Combine ("Assets", UnityEditor.Formats.Fbx.Exporter.ExportSettings.ConvertToAssetRelativePath (fbxFileName));
 
                 Object unityMainAsset = UnityEditor.AssetDatabase.LoadMainAssetAtPath (relFileName);
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using UnityEditor;`
`2`	`2`	`using UnityEngine;`
`3`	`3`
`4`		`-namespace FbxExporters.EditorTools`
	`4`	`+namespace UnityEditor.Formats.Fbx.Exporter`
`5`	`5`	`{`
`6`	`6`	`[CustomEditor (typeof(ConvertToPrefabSettings))]`
`7`	`7`	`public class ConvertToPrefabSettingsEditor : UnityEditor.Editor`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using UnityEditor;`
`5`	`5`	`using System.IO;`
`6`	`6`
`7`		`-namespace FbxExporters.Editor`
	`7`	`+namespace UnityEditor.Formats.Fbx.Exporter`
`8`	`8`	`{`
`9`	`9`	`public class RepairMissingScripts`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using UnityEditor;`
`4`	`4`	`using System.Linq;`
`5`	`5`	`using System;`
`6`		`-using FbxExporters.Editor;`
	`6`	`+using UnityEditor.Formats.Fbx.Exporter;`
`7`	`7`
`8`	`8`	`namespace FbxExporters`
`9`	`9`	`{`
`@@ -57,7 +57,7 @@ public static string FindFbxPrefabAssetPath()`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`	`if (foundPath == "") {`
`60`		`- Debug.LogWarning(string.Format("{0} not found; are you trying to uninstall {1}?", FBX_PREFAB_FILE.Substring(1), FbxExporters.Editor.ModelExporter.PACKAGE_UI_NAME));`
	`60`	`+ Debug.LogWarning(string.Format("{0} not found; are you trying to uninstall {1}?", FBX_PREFAB_FILE.Substring(1), UnityEditor.Formats.Fbx.Exporter.ModelExporter.PACKAGE_UI_NAME));`
`61`	`61`	`}`
`62`	`62`	`return foundPath;`
`63`	`63`	`#else`
`@@ -67,7 +67,7 @@ public static string FindFbxPrefabAssetPath()`
`67`	`67`	`if (System.IO.File.Exists(System.IO.Path.GetFullPath(path))) {`
`68`	`68`	`return path;`
`69`	`69`	`} else {`
`70`		`- Debug.LogWarning(string.Format("{0} not found; are you trying to uninstall {1}?", FBX_PREFAB_FILE, FbxExporters.Editor.ModelExporter.PACKAGE_UI_NAME));`
	`70`	`+ Debug.LogWarning(string.Format("{0} not found; are you trying to uninstall {1}?", FBX_PREFAB_FILE, UnityEditor.Formats.Fbx.Exporter.ModelExporter.PACKAGE_UI_NAME));`
`71`	`71`	`return "";`
`72`	`72`	`}`
`73`	`73`	`#endif`
`@@ -113,7 +113,7 @@ public static bool MayHaveFbxPrefabToFbxAsset(string prefabPath,`
`113`	`113`	`static void OnPostprocessAllAssets(string[] imported, string[] deleted, string[] moved, string[] movedFrom)`
`114`	`114`	`{`
`115`	`115`	`// Do not start if Auto Updater is disabled in FBX Exporter Settings`
`116`		`- if (!FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled)`
	`116`	`+ if (!UnityEditor.Formats.Fbx.Exporter.ExportSettings.instance.autoUpdaterEnabled)`
`117`	`117`	`{`
`118`	`118`	`return;`
`119`	`119`	`}`
`@@ -293,7 +293,7 @@ public static void UpdateLinkedPrefab(GameObject prefabOrInstance)`
`293`	`293`	`// renamed nodes (or auto-update if there's nothing to rename).`
`294`	`294`	`var fbxPrefabUtility = new FbxPrefabUtility(fbxPrefabComponent);`
`295`	`295`
`296`		`- if (FbxExporters.EditorTools.ExportSettings.instance.autoUpdaterEnabled \|\| runningUnitTest)`
	`296`	`+ if (UnityEditor.Formats.Fbx.Exporter.ExportSettings.instance.autoUpdaterEnabled \|\| runningUnitTest)`
`297`	`297`	`{`
`298`	`298`	`fbxPrefabUtility.SyncPrefab();`
`299`	`299`	`}`