From c603f77f5325ff795eb84c5302e5090e4db10961 Mon Sep 17 00:00:00 2001 From: Adrian T Date: Fri, 18 May 2018 11:12:25 +0200 Subject: [PATCH] Use the public PrefabStageUtility.GetCurrentPrefabStage() instead of the internal StageNavigationManager. --- .../Editor/NavMeshSurfaceInPrefabTests.cs | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/Assets/Tests/Editor/NavMeshSurfaceInPrefabTests.cs b/Assets/Tests/Editor/NavMeshSurfaceInPrefabTests.cs index 9958aa7..d2c664f 100644 --- a/Assets/Tests/Editor/NavMeshSurfaceInPrefabTests.cs +++ b/Assets/Tests/Editor/NavMeshSurfaceInPrefabTests.cs @@ -8,6 +8,7 @@ using System.IO; using UnityEditor; using UnityEditor.AI; +using UnityEditor.Experimental.SceneManagement; using UnityEditor.SceneManagement; using UnityEngine.AI; using UnityEngine.SceneManagement; @@ -108,7 +109,7 @@ public IEnumerator TearDown() //{ // var prefab = AssetDatabase.LoadAssetAtPath(m_PrefabPath); // AssetDatabase.OpenAsset(prefab); - // var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + // var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); // if (prefabStage != null && prefabStage.prefabContentsRoot != null) // { // var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); @@ -162,7 +163,7 @@ public IEnumerator NavMeshSurfacePrefab_AfterEditing_LeavesMainSceneUntouched() var prefab = AssetDatabase.LoadAssetAtPath(m_PrefabPath); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); Assert.IsNotNull(prefabStage); Assert.IsNotNull(prefabStage.prefabContentsRoot); @@ -207,7 +208,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenInstantiated_ReferencesTheSameNavMes var instanceCloneNavMeshData = instanceCloneSurface.navMeshData; AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); Assert.IsNotNull(prefabStage); Assert.IsNotNull(prefabStage.prefabContentsRoot); @@ -235,7 +236,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenEmptyAndInstantiated_InstanceHasEmpt Assert.IsNotNull(instanceSurface.navMeshData); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); NavMeshSurfaceEditor.ClearSurfaces(new Object[] { prefabSurface }); prefabStage.SavePrefab(); @@ -260,7 +261,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenBakesNewNavMesh_UpdatesTheInstance() TestNavMeshExistsAloneAtPosition(k_PrefabDefaultArea, Vector3.zero); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); TestNavMeshExistsAloneAtPosition(k_PrefabDefaultArea, Vector3.zero); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); @@ -321,7 +322,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenInstanceRebaked_HasDifferentNavMeshD var instanceCloneNavMeshData = instanceCloneSurface.navMeshData; AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); var prefabNavMeshData = prefabSurface.navMeshData; Assert.AreNotSame(instanceNavMeshData, prefabNavMeshData); @@ -364,7 +365,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenInstanceCleared_InstanceHasEmptyNavM var instanceCloneNavMeshData = instanceCloneSurface.navMeshData; AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); var prefabNavMeshData = prefabSurface.navMeshData; Assert.AreNotSame(prefabNavMeshData, instanceSurface.navMeshData); @@ -396,7 +397,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenInstanceCleared_PrefabKeepsNavMeshDa Assert.IsFalse(HasNavMeshAtPosition(Vector3.zero, expectedAreaMask)); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); var prefabNavMeshData = prefabSurface.navMeshData; Assert.IsNotNull(prefabNavMeshData); @@ -425,7 +426,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenRebakedButInstanceModified_DoesNotCh TestNavMeshExistsAloneAtPosition(k_RedArea, Vector3.zero); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); var initialPrefabNavMeshData = prefabSurface.navMeshData; yield return BakeNavMeshAsync(() => prefabSurface, k_GrayArea); @@ -433,7 +434,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenRebakedButInstanceModified_DoesNotCh StageNavigationManager.instance.GoToMainStage(); AssetDatabase.OpenAsset(prefab); - var prefabStageReopened = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStageReopened = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurfaceReopened = prefabStageReopened.prefabContentsRoot.GetComponent(); var prefabNavMeshData = prefabSurfaceReopened.navMeshData; Assert.IsNotNull(prefabNavMeshData); @@ -453,7 +454,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenRebakedButNotSaved_RevertsToTheIniti { var prefab = AssetDatabase.LoadAssetAtPath(m_PrefabPath); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); var initialPrefabNavMeshData = prefabSurface.navMeshData; yield return BakeNavMeshAsync(() => prefabSurface, k_GrayArea); @@ -464,7 +465,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenRebakedButNotSaved_RevertsToTheIniti StageNavigationManager.instance.GoToMainStage(); AssetDatabase.OpenAsset(prefab); - var prefabStageReopened = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStageReopened = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurfaceReopened = prefabStageReopened.prefabContentsRoot.GetComponent(); var prefabNavMeshData = prefabSurfaceReopened.navMeshData; Assert.AreSame(initialPrefabNavMeshData, prefabNavMeshData); @@ -481,7 +482,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenRebakedButNotSaved_TheRebakedAssetNo { var prefab = AssetDatabase.LoadAssetAtPath(m_PrefabPath); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); yield return BakeNavMeshAsync(() => prefabSurface, k_GrayArea); var assetFolderPath = NavMeshSurfaceEditor.GetAndEnsureTargetPath(prefabSurface); @@ -502,7 +503,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenRebaked_TheOldAssetExistsUntilSaving { var prefab = AssetDatabase.LoadAssetAtPath(m_PrefabPath); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); var initialAssetPath = AssetDatabase.GetAssetPath(prefabSurface.navMeshData); @@ -528,7 +529,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenRebakedAndAutoSaved_InstanceHasTheNe var prefab = AssetDatabase.LoadAssetAtPath(m_PrefabPath); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); var initialPrefabNavMeshData = prefabSurface.navMeshData; yield return BakeNavMeshAsync(() => prefabSurface, k_GrayArea); @@ -539,7 +540,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenRebakedAndAutoSaved_InstanceHasTheNe StageNavigationManager.instance.GoToMainStage(); AssetDatabase.OpenAsset(prefab); - var prefabStageReopened = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStageReopened = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurfaceReopened = prefabStageReopened.prefabContentsRoot.GetComponent(); var prefabNavMeshData = prefabSurfaceReopened.navMeshData; Assert.AreNotSame(initialPrefabNavMeshData, prefabNavMeshData); @@ -617,7 +618,7 @@ public IEnumerator NavMeshSurfacePrefab_AfterModifiedInstanceAppliedBack_Updated TestNavMeshExistsAloneAtPosition(k_RedArea, instanceTwo.transform.position); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); yield return BakeNavMeshAsync(() => prefabSurface, k_GrayArea); prefabStage.SavePrefab(); @@ -652,7 +653,7 @@ public IEnumerator NavMeshSurfacePrefab_AfterClearedInstanceAppliedBack_HasEmpty PrefabUtility.ApplyPrefabInstance(instance); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); Assert.IsNull(prefabSurface.navMeshData); @@ -733,7 +734,7 @@ public IEnumerator NavMeshSurfacePrefab_WhenBakingInPreviewScene_CollectsOnlyPre var prefab = AssetDatabase.LoadAssetAtPath(m_PrefabPath); AssetDatabase.OpenAsset(prefab); - var prefabStage = StageNavigationManager.instance.GetCurrentPrefabStage(); + var prefabStage = PrefabStageUtility.GetCurrentPrefabStage(); var prefabSurface = prefabStage.prefabContentsRoot.GetComponent(); prefabSurface.collectObjects = CollectObjects.All; -- GitLab