Explicitly using ExportType with its entire namespace b/c conflicts

Sander van Rossen · Sander van Rossen · commit 074586cde91f · 2021-04-21T10:34:35.000+02:00
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/API/Foundation/Editor/Version.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/API/Foundation/Editor/Version.cs
@@ -2,7 +2,7 @@ namespace RealtimeCSG.Foundation
 {
     internal static class Versioning
     {
-        public const string PluginVersion       = "1_568";
+        public const string PluginVersion       = "1_569";
         public const string PluginDLLVersion    = "1_559";
     }
 }
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Control/Managers/MeshInstanceManager.Export.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/Control/Managers/MeshInstanceManager.Export.cs
@@ -10,19 +10,19 @@ namespace InternalRealtimeCSG
 {
 	internal sealed partial class MeshInstanceManager
 	{
-		public static void Export(CSGModel model, ExportType exportType, bool exportColliders)
+		public static void Export(CSGModel model, RealtimeCSG.Components.ExportType exportType, bool exportColliders)
 		{
 			string typeName;
 			string extension;
 			switch (exportType)
 			{
-				case ExportType.FBX: typeName = "FBX"; extension = @"fbx"; break;
+				case RealtimeCSG.Components.ExportType.FBX: typeName = "FBX"; extension = @"fbx"; break;
 				default:
-				//case ExportType.UnityMesh:
-					typeName = "Mesh"; extension = @"prefab"; exportType = ExportType.UnityMesh; break;
+				//case RealtimeCSG.Components.ExportType.UnityMesh:
+					typeName = "Mesh"; extension = @"prefab"; exportType = RealtimeCSG.Components.ExportType.UnityMesh; break;
 			}
 			var newPath = model.exportPath;
-			if (exportType != ExportType.UnityMesh)
+			if (exportType != RealtimeCSG.Components.ExportType.UnityMesh)
 			{
 				newPath = UnityFBXExporter.ExporterMenu.GetNewPath(model.gameObject, typeName, extension, model.exportPath);
 				if (string.IsNullOrEmpty(newPath))
@@ -232,7 +232,7 @@ public static void Export(CSGModel model, ExportType exportType, bool exportColl
 				GameObject modelGameObject;
 				switch (exportType)
 				{
-					case ExportType.FBX:
+					case RealtimeCSG.Components.ExportType.FBX:
 					{
 						if (!UnityFBXExporter.FBXExporter.ExportGameObjToFBX(tempExportObject, newPath, exportColliders: exportColliders))
 						{
@@ -260,7 +260,7 @@ public static void Export(CSGModel model, ExportType exportType, bool exportColl
 						break;
 					}
 					default:
-					//case ExportType.UnityMesh:
+					//case RealtimeCSG.Components.ExportType.UnityMesh:
 					{
 						prefabObj = tempExportObject;// AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(newPath);
 						modelGameObject = tempExportObject;
@@ -278,7 +278,7 @@ public static void Export(CSGModel model, ExportType exportType, bool exportColl
 
 				model.exportPath = newPath;
 
-				if (exportType == ExportType.FBX && prefabObj)
+				if (exportType == RealtimeCSG.Components.ExportType.FBX && prefabObj)
 				{
 					foreach (var meshRenderer in prefabObj.GetComponentsInChildren<MeshRenderer>())
 					{
@@ -373,7 +373,7 @@ public static void Export(CSGModel model, ExportType exportType, bool exportColl
 			{
 				switch (exportType)
 				{
-					case ExportType.FBX:
+					case RealtimeCSG.Components.ExportType.FBX:
 					{
 						UnityEngine.Object.DestroyImmediate(tempExportObject);
 						break;
diff --git a/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/ComponentEditorWindows/CSGModelComponent.Inspector.GUI.cs b/RealtimeCSG/Assets/Plugins/RealtimeCSG/Editor/Scripts/View/GUI/ComponentEditorWindows/CSGModelComponent.Inspector.GUI.cs
@@ -194,7 +194,7 @@ public static void OnInspectorGUI(UnityEngine.Object[] targets)
 #if UNITY_2017_3_OR_NEWER
             var     CookingOptions          = models[0].MeshColliderCookingOptions;
 #endif
-            ExportType? ExportType			= models[0].exportType;
+            RealtimeCSG.Components.ExportType? ExportType = models[0].exportType;
             OriginType? OriginType			= models[0].originType;
 #if UNITY_2019_2_OR_NEWER
             ReceiveGI?  MeshReceiveGI		= models[0].ReceiveGI;
@@ -244,7 +244,7 @@ public static void OnInspectorGUI(UnityEngine.Object[] targets)
 #else
                 var currGenerateLightMaps           = (currStaticFlags & StaticEditorFlags.LightmapStatic) == StaticEditorFlags.LightmapStatic;
 #endif
-                ExportType currExportType			= models[i].exportType;
+                RealtimeCSG.Components.ExportType currExportType = models[i].exportType;
                 OriginType  currOriginType			= models[i].originType;
 #if UNITY_2019_2_OR_NEWER
                 ReceiveGI   currReceiveGI           = models[i].ReceiveGI;
@@ -437,7 +437,7 @@ public static void OnInspectorGUI(UnityEngine.Object[] targets)
                                 EditorGUI.BeginChangeCheck();
                                 {
                                     EditorGUI.showMixedValue = !ExportType.HasValue;
-                                    ExportType = (ExportType)EditorGUILayout.EnumPopup(ExportType ?? Components.ExportType.FBX, popupStyle);
+                                    ExportType = (RealtimeCSG.Components.ExportType)EditorGUILayout.EnumPopup(ExportType ?? RealtimeCSG.Components.ExportType.FBX, popupStyle);
                                     EditorGUI.showMixedValue = false;
                                 }
                                 if (EditorGUI.EndChangeCheck() && ExportType.HasValue)

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ namespace RealtimeCSG.Foundation`
`2`	`2`	`{`
`3`	`3`	`internal static class Versioning`
`4`	`4`	`{`
`5`		`- public const string PluginVersion = "1_568";`
	`5`	`+ public const string PluginVersion = "1_569";`
`6`	`6`	`public const string PluginDLLVersion = "1_559";`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,19 +10,19 @@ namespace InternalRealtimeCSG`
`10`	`10`	`{`
`11`	`11`	`internal sealed partial class MeshInstanceManager`
`12`	`12`	`{`
`13`		`- public static void Export(CSGModel model, ExportType exportType, bool exportColliders)`
	`13`	`+ public static void Export(CSGModel model, RealtimeCSG.Components.ExportType exportType, bool exportColliders)`
`14`	`14`	`{`
`15`	`15`	`string typeName;`
`16`	`16`	`string extension;`
`17`	`17`	`switch (exportType)`
`18`	`18`	`{`
`19`		`- case ExportType.FBX: typeName = "FBX"; extension = @"fbx"; break;`
	`19`	`+ case RealtimeCSG.Components.ExportType.FBX: typeName = "FBX"; extension = @"fbx"; break;`
`20`	`20`	`default:`
`21`		`- //case ExportType.UnityMesh:`
`22`		`- typeName = "Mesh"; extension = @"prefab"; exportType = ExportType.UnityMesh; break;`
	`21`	`+ //case RealtimeCSG.Components.ExportType.UnityMesh:`
	`22`	`+ typeName = "Mesh"; extension = @"prefab"; exportType = RealtimeCSG.Components.ExportType.UnityMesh; break;`
`23`	`23`	`}`
`24`	`24`	`var newPath = model.exportPath;`
`25`		`- if (exportType != ExportType.UnityMesh)`
	`25`	`+ if (exportType != RealtimeCSG.Components.ExportType.UnityMesh)`
`26`	`26`	`{`
`27`	`27`	`newPath = UnityFBXExporter.ExporterMenu.GetNewPath(model.gameObject, typeName, extension, model.exportPath);`
`28`	`28`	`if (string.IsNullOrEmpty(newPath))`
`@@ -232,7 +232,7 @@ public static void Export(CSGModel model, ExportType exportType, bool exportColl`
`232`	`232`	`GameObject modelGameObject;`
`233`	`233`	`switch (exportType)`
`234`	`234`	`{`
`235`		`- case ExportType.FBX:`
	`235`	`+ case RealtimeCSG.Components.ExportType.FBX:`
`236`	`236`	`{`
`237`	`237`	`if (!UnityFBXExporter.FBXExporter.ExportGameObjToFBX(tempExportObject, newPath, exportColliders: exportColliders))`
`238`	`238`	`{`
`@@ -260,7 +260,7 @@ public static void Export(CSGModel model, ExportType exportType, bool exportColl`
`260`	`260`	`break;`
`261`	`261`	`}`
`262`	`262`	`default:`
`263`		`- //case ExportType.UnityMesh:`
	`263`	`+ //case RealtimeCSG.Components.ExportType.UnityMesh:`
`264`	`264`	`{`
`265`	`265`	`prefabObj = tempExportObject;// AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(newPath);`
`266`	`266`	`modelGameObject = tempExportObject;`
`@@ -278,7 +278,7 @@ public static void Export(CSGModel model, ExportType exportType, bool exportColl`
`278`	`278`
`279`	`279`	`model.exportPath = newPath;`
`280`	`280`
`281`		`- if (exportType == ExportType.FBX && prefabObj)`
	`281`	`+ if (exportType == RealtimeCSG.Components.ExportType.FBX && prefabObj)`
`282`	`282`	`{`
`283`	`283`	`foreach (var meshRenderer in prefabObj.GetComponentsInChildren<MeshRenderer>())`
`284`	`284`	`{`
`@@ -373,7 +373,7 @@ public static void Export(CSGModel model, ExportType exportType, bool exportColl`
`373`	`373`	`{`
`374`	`374`	`switch (exportType)`
`375`	`375`	`{`
`376`		`- case ExportType.FBX:`
	`376`	`+ case RealtimeCSG.Components.ExportType.FBX:`
`377`	`377`	`{`
`378`	`378`	`UnityEngine.Object.DestroyImmediate(tempExportObject);`
`379`	`379`	`break;`