fix FbxExportSettings.cs warnings

vkovec · vkovec · commit 319835a4518f · 2018-05-30T13:49:17.000-04:00
- convert some functions and member vars to properties
diff --git a/Assets/com.unity.formats.fbx.tests/FbxExportSettingsTest.cs b/Assets/com.unity.formats.fbx.tests/FbxExportSettingsTest.cs
@@ -166,11 +166,11 @@ public void TestGetSetFields ()
             var appDataPath = Application.dataPath.Replace (Path.AltDirectorySeparatorChar,
                     Path.DirectorySeparatorChar);
 
-            var defaultAbsolutePath = ExportSettings.GetFbxAbsoluteSavePath ();
+            var defaultAbsolutePath = ExportSettings.FbxAbsoluteSavePath;
             var dataPath = Path.GetFullPath (Path.Combine (appDataPath, ExportSettings.kDefaultSavePath));
             Assert.AreEqual (dataPath, defaultAbsolutePath);
 
-            var prefabDefaultAbsPath = ExportSettings.GetPrefabAbsoluteSavePath ();
+            var prefabDefaultAbsPath = ExportSettings.PrefabAbsoluteSavePath;
             Assert.AreEqual (dataPath, prefabDefaultAbsPath);
 
             // set; check that the saved value is platform-independent,
@@ -184,8 +184,8 @@ public void TestGetSetFields ()
             Assert.That (ExportSettings.GetRelativePrefabSavePaths () [0], Is.EqualTo (string.Format("Assets{0}a{0}b{0}c", forwardSlash)));
 
             var platformPath = Path.Combine ("a", Path.Combine ("b", "c"));
-            Assert.AreEqual (Path.Combine (appDataPath, platformPath), ExportSettings.GetFbxAbsoluteSavePath ());
-            Assert.AreEqual (Path.Combine (appDataPath, platformPath), ExportSettings.GetPrefabAbsoluteSavePath ());
+            Assert.AreEqual (Path.Combine (appDataPath, platformPath), ExportSettings.FbxAbsoluteSavePath);
+            Assert.AreEqual (Path.Combine (appDataPath, platformPath), ExportSettings.PrefabAbsoluteSavePath);
 
             ExportSettings.AddFbxSavePath ("test");
             ExportSettings.AddPrefabSavePath ("test2");
@@ -212,43 +212,43 @@ public void TestFindPreferredProgram ()
 
             ExportSettings.instance.SetDCCOptionNames (testList);
 
-            int preferred = ExportSettings.instance.GetPreferredDCCApp ();
+            int preferred = ExportSettings.instance.PreferredDCCApp;
             //While Maya 2017 and 3ds Max 2017 are tied for most recent, Maya 2017 (index 8) should win because we prefer Maya.
             Assert.AreEqual (preferred, 8);
 
             ExportSettings.instance.ClearDCCOptionNames ();
             //Try running it with an empty list
-            preferred = ExportSettings.instance.GetPreferredDCCApp ();
+            preferred = ExportSettings.instance.PreferredDCCApp;
 
             Assert.AreEqual (preferred, -1);
 
             ExportSettings.instance.SetDCCOptionNames (null);
             //Try running it with a null list
-            preferred = ExportSettings.instance.GetPreferredDCCApp ();
+            preferred = ExportSettings.instance.PreferredDCCApp;
 
             Assert.AreEqual(preferred, -1);
 
             //Testing the results of only having a mayaLT install
             ExportSettings.instance.SetDCCOptionNames(new List<string> { ExportSettings.kMayaLtOptionName + "2018" }); //hardcoded because the constant is changed in another branch but not this one at this time
-            preferred = ExportSettings.instance.GetPreferredDCCApp();
+            preferred = ExportSettings.instance.PreferredDCCApp;
 
             Assert.AreEqual(preferred, 0);
 
             //Testing the results of only having a maya install
             ExportSettings.instance.SetDCCOptionNames(new List<string> { ExportSettings.kMayaOptionName + "2018" });
-            preferred = ExportSettings.instance.GetPreferredDCCApp();
+            preferred = ExportSettings.instance.PreferredDCCApp;
 
             Assert.AreEqual(preferred, 0);
 
             //Testing the results of only having a max install
             ExportSettings.instance.SetDCCOptionNames(new List<string> { ExportSettings.kMaxOptionName + "2018" });
-            preferred = ExportSettings.instance.GetPreferredDCCApp();
+            preferred = ExportSettings.instance.PreferredDCCApp;
 
             Assert.AreEqual(preferred, 0);
 
             //Testing the preference priority
             ExportSettings.instance.SetDCCOptionNames(new List<string> { ExportSettings.kMaxOptionName + "2018", ExportSettings.kMayaOptionName + "2018", ExportSettings.kMayaLtOptionName + "2018" });
-            preferred = ExportSettings.instance.GetPreferredDCCApp();
+            preferred = ExportSettings.instance.PreferredDCCApp;
 
             Assert.AreEqual(preferred, 1);
         }
@@ -485,7 +485,7 @@ private void TestLocations(Dictionary<string,List<string>> data)
 
             if (data.ContainsKey("expected3DApp"))
             {
-                int preferred = ExportSettings.instance.GetPreferredDCCApp ();
+                int preferred = ExportSettings.instance.PreferredDCCApp;
                 Assert.AreEqual(preferred, int.Parse(data["expected3DApp"][0]) );
             }
         }
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToModel.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ConvertToModel.cs
@@ -115,7 +115,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (
             }
 
             var converted = new List<GameObject>();
-            var exportOptions = ExportSettings.instance.convertToPrefabSettings.info;
+            var exportOptions = ExportSettings.instance.ConvertToPrefabSettings.info;
             foreach (var go in toExport)
             {
                 var convertedGO = Convert(go, exportOptions: exportOptions);
@@ -261,7 +261,7 @@ internal static GameObject GetOrCreateFbxAsset(GameObject toConvert,
             if (string.IsNullOrEmpty(fbxFullPath)) {
                 // Generate a unique filename.
                 if (string.IsNullOrEmpty (fbxDirectoryFullPath)) {
-                    fbxDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.GetFbxAbsoluteSavePath();
+                    fbxDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.FbxAbsoluteSavePath;
                 } else {
                     fbxDirectoryFullPath = Path.GetFullPath (fbxDirectoryFullPath);
                 }
@@ -374,7 +374,7 @@ public static GameObject ApplyOrCreatePrefab(GameObject instance,
             if (string.IsNullOrEmpty(prefabFullPath)) {
                 // Generate a unique filename.
                 if (string.IsNullOrEmpty (prefabDirectoryFullPath)) {
-                    prefabDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.GetPrefabAbsoluteSavePath();
+                    prefabDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.PrefabAbsoluteSavePath;
                 } 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
@@ -86,7 +86,7 @@ protected override void OnEnable()
             base.OnEnable();
             if (!InnerEditor)
             {
-                InnerEditor = UnityEditor.Editor.CreateEditor(ExportSettings.instance.convertToPrefabSettings);
+                InnerEditor = UnityEditor.Editor.CreateEditor(ExportSettings.instance.ConvertToPrefabSettings);
             }
             m_prefabExtLabelWidth = FbxExtLabelStyle.CalcSize(new GUIContent(".prefab")).x;
         }
@@ -118,10 +118,10 @@ protected override bool Export()
                 return false;
             }
 
-            var fbxDirPath = ExportSettings.GetFbxAbsoluteSavePath();
+            var fbxDirPath = ExportSettings.FbxAbsoluteSavePath;
             var fbxPath = System.IO.Path.Combine(fbxDirPath, ExportFileName + ".fbx");
 
-            var prefabDirPath = ExportSettings.GetPrefabAbsoluteSavePath();
+            var prefabDirPath = ExportSettings.PrefabAbsoluteSavePath;
             var prefabPath = System.IO.Path.Combine(prefabDirPath, m_prefabFileName + ".prefab");
 
             if (ToExport == null)
@@ -175,7 +175,7 @@ protected override bool Export()
                 }
 
                 ConvertToModel.Convert(
-                    go, fbxFullPath: fbxPath, prefabFullPath: prefabPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
+                    go, fbxFullPath: fbxPath, prefabFullPath: prefabPath, exportOptions: ExportSettings.instance.ConvertToPrefabSettings.info
                 );
                 return true;
             }
@@ -185,20 +185,20 @@ protected override bool Export()
                 // Convert, automatically choosing a file path that won't clobber any existing files.
                 var go = ModelExporter.GetGameObject(obj);
                 ConvertToModel.Convert(
-                    go, fbxDirectoryFullPath: fbxDirPath, prefabDirectoryFullPath: prefabDirPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
+                    go, fbxDirectoryFullPath: fbxDirPath, prefabDirectoryFullPath: prefabDirPath, exportOptions: ExportSettings.instance.ConvertToPrefabSettings.info
                 );
             }
             return true;
         }
 
         protected override ExportOptionsSettingsSerializeBase SettingsObject
         {
-            get { return ExportSettings.instance.convertToPrefabSettings.info; }
+            get { return ExportSettings.instance.ConvertToPrefabSettings.info; }
         }
 #if UNITY_2018_1_OR_NEWER
         protected override void ShowPresetReceiver()
         {
-            ShowPresetReceiver(ExportSettings.instance.convertToPrefabSettings);
+            ShowPresetReceiver(ExportSettings.instance.ConvertToPrefabSettings);
         }
 #endif
         protected override void CreateCustomUI()
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/ExportModelEditorWindow.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/ExportModelEditorWindow.cs
@@ -478,8 +478,8 @@ protected bool IsTimelineAnim {
             set{
                 m_isTimelineAnim = value;
                 if (m_isTimelineAnim) {
-                    m_previousInclude = ExportSettings.instance.exportModelSettings.info.ModelAnimIncludeOption;
-                    ExportSettings.instance.exportModelSettings.info.SetModelAnimIncludeOption(ExportSettings.Include.Anim);
+                    m_previousInclude = ExportSettings.instance.ExportModelSettings.info.ModelAnimIncludeOption;
+                    ExportSettings.instance.ExportModelSettings.info.SetModelAnimIncludeOption(ExportSettings.Include.Anim);
                 }
                 if (InnerEditor) {
                     var exportModelSettingsEditor = InnerEditor as ExportModelSettingsEditor;
@@ -507,7 +507,7 @@ protected bool SingleHierarchyExport {
 
         protected override ExportOptionsSettingsSerializeBase SettingsObject
         {
-            get { return ExportSettings.instance.exportModelSettings.info; }
+            get { return ExportSettings.instance.ExportModelSettings.info; }
         }
 
         private ExportSettings.Include m_previousInclude = ExportSettings.Include.ModelAndAnim;
@@ -572,7 +572,7 @@ protected override void OnEnable ()
         {
             base.OnEnable ();
             if (!InnerEditor) {
-                InnerEditor = UnityEditor.Editor.CreateEditor (ExportSettings.instance.exportModelSettings);
+                InnerEditor = UnityEditor.Editor.CreateEditor (ExportSettings.instance.ExportModelSettings);
                 this.SingleHierarchyExport = m_singleHierarchyExport;
                 this.IsTimelineAnim = m_isTimelineAnim;
             }
@@ -589,7 +589,7 @@ protected void OnDisable()
         protected virtual void RestoreSettings()
         {
             if (IsTimelineAnim) {
-                ExportSettings.instance.exportModelSettings.info.SetModelAnimIncludeOption(m_previousInclude);
+                ExportSettings.instance.ExportModelSettings.info.SetModelAnimIncludeOption(m_previousInclude);
                 SaveExportSettings ();
             }
         }
@@ -600,7 +600,7 @@ protected override bool Export(){
                 Debug.LogError ("FbxExporter: Please specify an fbx filename");
                 return false;
             }
-            var folderPath = ExportSettings.GetFbxAbsoluteSavePath ();
+            var folderPath = ExportSettings.FbxAbsoluteSavePath;
             var filePath = System.IO.Path.Combine (folderPath, ExportFileName + ".fbx");
 
             if (!OverwriteExistingFile (filePath)) {
@@ -618,7 +618,7 @@ protected override bool Export(){
         #if UNITY_2018_1_OR_NEWER  
         protected override void ShowPresetReceiver ()
         {
-            ShowPresetReceiver (ExportSettings.instance.exportModelSettings);
+            ShowPresetReceiver (ExportSettings.instance.ExportModelSettings);
         }
         #endif
     }
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/FbxExportSettings.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/FbxExportSettings.cs
diff --git a/Packages/com.unity.formats.fbx/Editor/Scripts/InstallIntegration.cs b/Packages/com.unity.formats.fbx/Editor/Scripts/InstallIntegration.cs

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public static GameObject[] CreateInstantiatedModelPrefab (`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`var converted = new List<GameObject>();`
`118`		`- var exportOptions = ExportSettings.instance.convertToPrefabSettings.info;`
	`118`	`+ var exportOptions = ExportSettings.instance.ConvertToPrefabSettings.info;`
`119`	`119`	`foreach (var go in toExport)`
`120`	`120`	`{`
`121`	`121`	`var convertedGO = Convert(go, exportOptions: exportOptions);`
`@@ -261,7 +261,7 @@ internal static GameObject GetOrCreateFbxAsset(GameObject toConvert,`
`261`	`261`	`if (string.IsNullOrEmpty(fbxFullPath)) {`
`262`	`262`	`// Generate a unique filename.`
`263`	`263`	`if (string.IsNullOrEmpty (fbxDirectoryFullPath)) {`
`264`		`- fbxDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.GetFbxAbsoluteSavePath();`
	`264`	`+ fbxDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.FbxAbsoluteSavePath;`
`265`	`265`	`} else {`
`266`	`266`	`fbxDirectoryFullPath = Path.GetFullPath (fbxDirectoryFullPath);`
`267`	`267`	`}`
`@@ -374,7 +374,7 @@ public static GameObject ApplyOrCreatePrefab(GameObject instance,`
`374`	`374`	`if (string.IsNullOrEmpty(prefabFullPath)) {`
`375`	`375`	`// Generate a unique filename.`
`376`	`376`	`if (string.IsNullOrEmpty (prefabDirectoryFullPath)) {`
`377`		`- prefabDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.GetPrefabAbsoluteSavePath();`
	`377`	`+ prefabDirectoryFullPath = UnityEditor.Formats.Fbx.Exporter.ExportSettings.PrefabAbsoluteSavePath;`
`378`	`378`	`} else {`
`379`	`379`	`prefabDirectoryFullPath = Path.GetFullPath (prefabDirectoryFullPath);`
`380`	`380`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ protected override void OnEnable()`
`86`	`86`	`base.OnEnable();`
`87`	`87`	`if (!InnerEditor)`
`88`	`88`	`{`
`89`		`- InnerEditor = UnityEditor.Editor.CreateEditor(ExportSettings.instance.convertToPrefabSettings);`
	`89`	`+ InnerEditor = UnityEditor.Editor.CreateEditor(ExportSettings.instance.ConvertToPrefabSettings);`
`90`	`90`	`}`
`91`	`91`	`m_prefabExtLabelWidth = FbxExtLabelStyle.CalcSize(new GUIContent(".prefab")).x;`
`92`	`92`	`}`
`@@ -118,10 +118,10 @@ protected override bool Export()`
`118`	`118`	`return false;`
`119`	`119`	`}`
`120`	`120`
`121`		`- var fbxDirPath = ExportSettings.GetFbxAbsoluteSavePath();`
	`121`	`+ var fbxDirPath = ExportSettings.FbxAbsoluteSavePath;`
`122`	`122`	`var fbxPath = System.IO.Path.Combine(fbxDirPath, ExportFileName + ".fbx");`
`123`	`123`
`124`		`- var prefabDirPath = ExportSettings.GetPrefabAbsoluteSavePath();`
	`124`	`+ var prefabDirPath = ExportSettings.PrefabAbsoluteSavePath;`
`125`	`125`	`var prefabPath = System.IO.Path.Combine(prefabDirPath, m_prefabFileName + ".prefab");`
`126`	`126`
`127`	`127`	`if (ToExport == null)`
`@@ -175,7 +175,7 @@ protected override bool Export()`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`ConvertToModel.Convert(`
`178`		`- go, fbxFullPath: fbxPath, prefabFullPath: prefabPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info`
	`178`	`+ go, fbxFullPath: fbxPath, prefabFullPath: prefabPath, exportOptions: ExportSettings.instance.ConvertToPrefabSettings.info`
`179`	`179`	`);`
`180`	`180`	`return true;`
`181`	`181`	`}`
`@@ -185,20 +185,20 @@ protected override bool Export()`
`185`	`185`	`// Convert, automatically choosing a file path that won't clobber any existing files.`
`186`	`186`	`var go = ModelExporter.GetGameObject(obj);`
`187`	`187`	`ConvertToModel.Convert(`
`188`		`- go, fbxDirectoryFullPath: fbxDirPath, prefabDirectoryFullPath: prefabDirPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info`
	`188`	`+ go, fbxDirectoryFullPath: fbxDirPath, prefabDirectoryFullPath: prefabDirPath, exportOptions: ExportSettings.instance.ConvertToPrefabSettings.info`
`189`	`189`	`);`
`190`	`190`	`}`
`191`	`191`	`return true;`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`protected override ExportOptionsSettingsSerializeBase SettingsObject`
`195`	`195`	`{`
`196`		`- get { return ExportSettings.instance.convertToPrefabSettings.info; }`
	`196`	`+ get { return ExportSettings.instance.ConvertToPrefabSettings.info; }`
`197`	`197`	`}`
`198`	`198`	`#if UNITY_2018_1_OR_NEWER`
`199`	`199`	`protected override void ShowPresetReceiver()`
`200`	`200`	`{`
`201`		`- ShowPresetReceiver(ExportSettings.instance.convertToPrefabSettings);`
	`201`	`+ ShowPresetReceiver(ExportSettings.instance.ConvertToPrefabSettings);`
`202`	`202`	`}`
`203`	`203`	`#endif`
`204`	`204`	`protected override void CreateCustomUI()`
Original file line number	Diff line number	Diff line change
`@@ -478,8 +478,8 @@ protected bool IsTimelineAnim {`
`478`	`478`	`set{`
`479`	`479`	`m_isTimelineAnim = value;`
`480`	`480`	`if (m_isTimelineAnim) {`
`481`		`- m_previousInclude = ExportSettings.instance.exportModelSettings.info.ModelAnimIncludeOption;`
`482`		`- ExportSettings.instance.exportModelSettings.info.SetModelAnimIncludeOption(ExportSettings.Include.Anim);`
	`481`	`+ m_previousInclude = ExportSettings.instance.ExportModelSettings.info.ModelAnimIncludeOption;`
	`482`	`+ ExportSettings.instance.ExportModelSettings.info.SetModelAnimIncludeOption(ExportSettings.Include.Anim);`
`483`	`483`	`}`
`484`	`484`	`if (InnerEditor) {`
`485`	`485`	`var exportModelSettingsEditor = InnerEditor as ExportModelSettingsEditor;`
`@@ -507,7 +507,7 @@ protected bool SingleHierarchyExport {`
`507`	`507`
`508`	`508`	`protected override ExportOptionsSettingsSerializeBase SettingsObject`
`509`	`509`	`{`
`510`		`- get { return ExportSettings.instance.exportModelSettings.info; }`
	`510`	`+ get { return ExportSettings.instance.ExportModelSettings.info; }`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`private ExportSettings.Include m_previousInclude = ExportSettings.Include.ModelAndAnim;`
`@@ -572,7 +572,7 @@ protected override void OnEnable ()`
`572`	`572`	`{`
`573`	`573`	`base.OnEnable ();`
`574`	`574`	`if (!InnerEditor) {`
`575`		`- InnerEditor = UnityEditor.Editor.CreateEditor (ExportSettings.instance.exportModelSettings);`
	`575`	`+ InnerEditor = UnityEditor.Editor.CreateEditor (ExportSettings.instance.ExportModelSettings);`
`576`	`576`	`this.SingleHierarchyExport = m_singleHierarchyExport;`
`577`	`577`	`this.IsTimelineAnim = m_isTimelineAnim;`
`578`	`578`	`}`
`@@ -589,7 +589,7 @@ protected void OnDisable()`
`589`	`589`	`protected virtual void RestoreSettings()`
`590`	`590`	`{`
`591`	`591`	`if (IsTimelineAnim) {`
`592`		`- ExportSettings.instance.exportModelSettings.info.SetModelAnimIncludeOption(m_previousInclude);`
	`592`	`+ ExportSettings.instance.ExportModelSettings.info.SetModelAnimIncludeOption(m_previousInclude);`
`593`	`593`	`SaveExportSettings ();`
`594`	`594`	`}`
`595`	`595`	`}`
`@@ -600,7 +600,7 @@ protected override bool Export(){`
`600`	`600`	`Debug.LogError ("FbxExporter: Please specify an fbx filename");`
`601`	`601`	`return false;`
`602`	`602`	`}`
`603`		`- var folderPath = ExportSettings.GetFbxAbsoluteSavePath ();`
	`603`	`+ var folderPath = ExportSettings.FbxAbsoluteSavePath;`
`604`	`604`	`var filePath = System.IO.Path.Combine (folderPath, ExportFileName + ".fbx");`
`605`	`605`
`606`	`606`	`if (!OverwriteExistingFile (filePath)) {`
`@@ -618,7 +618,7 @@ protected override bool Export(){`
`618`	`618`	`#if UNITY_2018_1_OR_NEWER`
`619`	`619`	`protected override void ShowPresetReceiver ()`
`620`	`620`	`{`
`621`		`- ShowPresetReceiver (ExportSettings.instance.exportModelSettings);`
	`621`	`+ ShowPresetReceiver (ExportSettings.instance.ExportModelSettings);`
`622`	`622`	`}`
`623`	`623`	`#endif`
`624`	`624`	`}`