diff --git a/Assets/Plugin/WBase.Core.dll b/Assets/Plugin/WBase.Core.dll index 84ee008..abd86b1 100644 Binary files a/Assets/Plugin/WBase.Core.dll and b/Assets/Plugin/WBase.Core.dll differ diff --git a/Assets/Plugin/WBase.Core.dll.mdb b/Assets/Plugin/WBase.Core.dll.mdb index 7d71826..4299877 100644 Binary files a/Assets/Plugin/WBase.Core.dll.mdb and b/Assets/Plugin/WBase.Core.dll.mdb differ diff --git a/Assets/Plugin/WBase.Unity.dll b/Assets/Plugin/WBase.Unity.dll index 767525c..43128dc 100644 Binary files a/Assets/Plugin/WBase.Unity.dll and b/Assets/Plugin/WBase.Unity.dll differ diff --git a/Assets/Plugin/WBase.Unity.dll.mdb b/Assets/Plugin/WBase.Unity.dll.mdb index 47c19f3..2c991d0 100644 Binary files a/Assets/Plugin/WBase.Unity.dll.mdb and b/Assets/Plugin/WBase.Unity.dll.mdb differ diff --git a/Assets/Tests.meta b/Assets/Tests.meta deleted file mode 100644 index 64a6be0..0000000 --- a/Assets/Tests.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: a4ffdd6288cb842a8ac2b31823ceaab0 -folderAsset: yes -timeCreated: 1490606291 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tests/NavMeshSurfaceAgentTests.cs b/Assets/Tests/NavMeshSurfaceAgentTests.cs deleted file mode 100644 index 2eb011d..0000000 --- a/Assets/Tests/NavMeshSurfaceAgentTests.cs +++ /dev/null @@ -1,102 +0,0 @@ -#if UNITY_EDITOR || UNITY_STANDALONE -using UnityEngine; -using UnityEngine.AI; -using UnityEngine.TestTools; -using NUnit.Framework; -using System.Collections; - -public class NavMeshSurfaceAgentTests -{ - [Test] - public void AgentIdentifiesSurfaceOwner() - { - var surface = GameObject.CreatePrimitive(PrimitiveType.Plane).AddComponent(); - surface.BuildNavMesh(); - - var agent = new GameObject("Agent").AddComponent(); - Assert.AreEqual(surface, agent.navMeshOwner); - Assert.IsTrue(agent.isOnNavMesh); - - GameObject.DestroyImmediate(agent.gameObject); - GameObject.DestroyImmediate(surface.gameObject); - } - - [Test] - public void AgentDetachesAndAttachesToSurface() - { - var surface = GameObject.CreatePrimitive(PrimitiveType.Plane).AddComponent(); - surface.BuildNavMesh(); - - var agent = new GameObject("Agent").AddComponent(); - Assert.AreEqual(surface, agent.navMeshOwner); - Assert.IsTrue(agent.isOnNavMesh); - - surface.enabled = false; - Assert.IsNull(agent.navMeshOwner); - Assert.IsFalse(agent.isOnNavMesh); - - surface.enabled = true; - Assert.AreEqual(surface, agent.navMeshOwner); - Assert.IsTrue(agent.isOnNavMesh); - - GameObject.DestroyImmediate(agent.gameObject); - GameObject.DestroyImmediate(surface.gameObject); - } - -/* - [Test] - public void AgentIsOnNavMeshWhenMatchingAgentTypeID() - { - var surface = GameObject.CreatePrimitive(PrimitiveType.Plane).AddComponent(); - surface.agentTypeID = 1234; - surface.BuildNavMesh(); - - var agent = new GameObject("Agent").AddComponent(); - Assert.IsFalse(agent.isOnNavMesh); - - agent.agentTypeID = 1234; - Assert.IsTrue(agent.isOnNavMesh); - - GameObject.DestroyImmediate(agent.gameObject); - GameObject.DestroyImmediate(surface.gameObject); - } -*/ - - [UnityTest] - public IEnumerator AgentAlignsToSurfaceNextFrame() - { - var surface = GameObject.CreatePrimitive(PrimitiveType.Plane).AddComponent(); - surface.transform.rotation = new Quaternion(-0.679622f, 0.351242f, -0.373845f, 0.524388f); - surface.BuildNavMesh(); - - var agent = new GameObject("Agent").AddComponent(); - - yield return null; - - var residual = surface.transform.up - agent.transform.up; - Assert.IsTrue(residual.magnitude < 0.01f); - - GameObject.DestroyImmediate(agent.gameObject); - GameObject.DestroyImmediate(surface.gameObject); - } - - [UnityTest] - public IEnumerator AgentDoesNotAlignToSurfaceNextFrame() - { - var surface = GameObject.CreatePrimitive(PrimitiveType.Plane).AddComponent(); - surface.transform.rotation = new Quaternion(-0.679622f, 0.351242f, -0.373845f, 0.524388f); - surface.BuildNavMesh(); - - var agent = new GameObject("Agent").AddComponent(); - agent.updateUpAxis = false; - - yield return null; - - var residual = Vector3.up - agent.transform.up; - Assert.IsTrue(residual.magnitude < 0.01f); - - GameObject.DestroyImmediate(agent.gameObject); - GameObject.DestroyImmediate(surface.gameObject); - } -} -#endif diff --git a/Assets/Tests/NavMeshSurfaceAgentTests.cs.meta b/Assets/Tests/NavMeshSurfaceAgentTests.cs.meta deleted file mode 100644 index 0e21157..0000000 --- a/Assets/Tests/NavMeshSurfaceAgentTests.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 45e898f1334e740678c21331ac30d746 -timeCreated: 1490606318 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tests/NavMeshSurfaceLinkTests.cs b/Assets/Tests/NavMeshSurfaceLinkTests.cs deleted file mode 100644 index 0197b90..0000000 --- a/Assets/Tests/NavMeshSurfaceLinkTests.cs +++ /dev/null @@ -1,145 +0,0 @@ -#if UNITY_EDITOR || UNITY_STANDALONE -using UnityEngine; -using UnityEngine.AI; -using UnityEngine.TestTools; -using NUnit.Framework; -using System.Collections; - -[TestFixture] -public class NavMeshSurfaceLinkTests -{ - public GameObject plane1, plane2; - public NavMeshLink link; - public NavMeshSurface surface; - - [SetUp] - public void CreatesPlanesAndLink() - { - plane1 = GameObject.CreatePrimitive(PrimitiveType.Plane); - plane2 = GameObject.CreatePrimitive(PrimitiveType.Plane); - plane1.transform.position = 11.0f * Vector3.right; - - surface = new GameObject().AddComponent(); - surface.BuildNavMesh(); - - Assert.IsFalse(HasPathConnecting(plane1, plane2)); - Assert.IsFalse(HasPathConnecting(plane2, plane1)); - - link = new GameObject().AddComponent(); - link.startPoint = plane1.transform.position; - link.endPoint = plane2.transform.position; - - Assert.IsTrue(HasPathConnecting(plane1, plane2)); - Assert.IsTrue(HasPathConnecting(plane2, plane1)); - } - - [TearDown] - public void DestroyPlanesAndLink() - { - GameObject.DestroyImmediate(surface.gameObject); - GameObject.DestroyImmediate(link.gameObject); - GameObject.DestroyImmediate(plane1); - GameObject.DestroyImmediate(plane2); - } - - [Test] - public void NavMeshLinkCanConnectTwoSurfaces() - { - Assert.IsTrue(HasPathConnecting(plane1, plane2)); - } - - [Test] - public void DisablingBidirectionalMakesTheLinkOneWay() - { - link.bidirectional = false; - Assert.IsTrue(HasPathConnecting(plane1, plane2)); - Assert.IsFalse(HasPathConnecting(plane2, plane1)); - } - - [Test] - public void ChangingAreaTypeCanBlockPath() - { - var areaMask = ~(1 << 4); - Assert.IsTrue(HasPathConnecting(plane1, plane2, areaMask)); - - link.area = 4; - Assert.IsFalse(HasPathConnecting(plane1, plane2, areaMask)); - } - - [Test] - public void EndpointsMoveRelativeToLinkOnUpdate() - { - link.transform.position += Vector3.forward; - Assert.IsFalse(HasPathConnectingViaPoint(plane1, plane2, plane1.transform.position + Vector3.forward)); - Assert.IsFalse(HasPathConnectingViaPoint(plane1, plane2, plane2.transform.position + Vector3.forward)); - - link.UpdateLink(); - - Assert.IsTrue(HasPathConnectingViaPoint(plane1, plane2, plane1.transform.position + Vector3.forward)); - Assert.IsTrue(HasPathConnectingViaPoint(plane1, plane2, plane2.transform.position + Vector3.forward)); - } - - [UnityTest] - public IEnumerator EndpointsMoveRelativeToLinkNextFrameWhenAutoUpdating() - { - link.transform.position += Vector3.forward; - link.autoUpdate = true; - - Assert.IsFalse(HasPathConnectingViaPoint(plane1, plane2, plane1.transform.position + Vector3.forward)); - Assert.IsFalse(HasPathConnectingViaPoint(plane1, plane2, plane2.transform.position + Vector3.forward)); - - yield return null; - - Assert.IsTrue(HasPathConnectingViaPoint(plane1, plane2, plane1.transform.position + Vector3.forward)); - Assert.IsTrue(HasPathConnectingViaPoint(plane1, plane2, plane2.transform.position + Vector3.forward)); - } - - [Test] - public void ChangingCostModifierAffectsRoute() - { - var link1 = link; - link1.startPoint = plane1.transform.position; - link1.endPoint = plane2.transform.position + Vector3.forward; - - var link2 = link.gameObject.AddComponent(); - link2.startPoint = plane1.transform.position; - link2.endPoint = plane2.transform.position - Vector3.forward; - - link1.costModifier = -1; - link2.costModifier = 100; - Assert.IsTrue(HasPathConnectingViaPoint(plane1, plane2, link1.endPoint)); - Assert.IsFalse(HasPathConnectingViaPoint(plane1, plane2, link2.endPoint)); - - link1.costModifier = 100; - link2.costModifier = -1; - Assert.IsFalse(HasPathConnectingViaPoint(plane1, plane2, link1.endPoint)); - Assert.IsTrue(HasPathConnectingViaPoint(plane1, plane2, link2.endPoint)); - } - - public static bool HasPathConnecting(GameObject a, GameObject b, int areaMask = NavMesh.AllAreas, int agentTypeID = 0) - { - var path = new NavMeshPath(); - var filter = new NavMeshQueryFilter(); - filter.areaMask = areaMask; - filter.agentTypeID = agentTypeID; - NavMesh.CalculatePath(a.transform.position, b.transform.position, filter, path); - return path.status == NavMeshPathStatus.PathComplete; - } - - public static bool HasPathConnectingViaPoint(GameObject a, GameObject b, Vector3 point, int areaMask = NavMesh.AllAreas, int agentTypeID = 0) - { - var path = new NavMeshPath(); - var filter = new NavMeshQueryFilter(); - filter.areaMask = areaMask; - filter.agentTypeID = agentTypeID; - NavMesh.CalculatePath(a.transform.position, b.transform.position, filter, path); - if (path.status != NavMeshPathStatus.PathComplete) - return false; - - for (int i = 0; i < path.corners.Length; ++i) - if (Vector3.Distance(path.corners[i], point) < 0.1f) - return true; - return false; - } -} -#endif diff --git a/Assets/Tests/NavMeshSurfaceLinkTests.cs.meta b/Assets/Tests/NavMeshSurfaceLinkTests.cs.meta deleted file mode 100644 index 440d1e4..0000000 --- a/Assets/Tests/NavMeshSurfaceLinkTests.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 264ca61ae1b6e4c16bcfc55f84300402 -timeCreated: 1490606318 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tests/NavMeshSurfaceModifierTests.cs b/Assets/Tests/NavMeshSurfaceModifierTests.cs deleted file mode 100644 index 1878572..0000000 --- a/Assets/Tests/NavMeshSurfaceModifierTests.cs +++ /dev/null @@ -1,112 +0,0 @@ -#if UNITY_EDITOR || UNITY_STANDALONE -using UnityEngine; -using UnityEngine.AI; -using UnityEngine.TestTools; -using NUnit.Framework; -using System.Collections; - -[TestFixture] -public class NavMeshSurfaceModifierTests -{ - NavMeshSurface surface; - NavMeshModifier modifier; - - [SetUp] - public void CreatePlaneWithModifier() - { - var plane = GameObject.CreatePrimitive(PrimitiveType.Plane); - surface = plane.AddComponent(); - modifier = plane.AddComponent(); - } - - [TearDown] - public void DestroyPlaneWithModifier() - { - GameObject.DestroyImmediate(modifier.gameObject); - } - - [Test] - public void ModifierIgnoreAffectsSelf() - { - modifier.ignoreFromBuild = true; - - surface.BuildNavMesh(); - - Assert.IsFalse(NavMeshSurfaceTests.HasNavMeshAtOrigin()); - } - - [Test] - public void ModifierIgnoreAffectsChild() - { - modifier.ignoreFromBuild = true; - modifier.GetComponent().enabled = false; - - var childPlane = GameObject.CreatePrimitive(PrimitiveType.Plane); - childPlane.transform.SetParent(modifier.transform); - - surface.BuildNavMesh(); - - Assert.IsFalse(NavMeshSurfaceTests.HasNavMeshAtOrigin()); - GameObject.DestroyImmediate(childPlane); - } - - [Test] - public void ModifierIgnoreDoesNotAffectSibling() - { - modifier.ignoreFromBuild = true; - modifier.GetComponent().enabled = false; - - var siblingPlane = GameObject.CreatePrimitive(PrimitiveType.Plane); - - surface.BuildNavMesh(); - - Assert.IsTrue(NavMeshSurfaceTests.HasNavMeshAtOrigin()); - GameObject.DestroyImmediate(siblingPlane); - } - - [Test] - public void ModifierOverrideAreaAffectsSelf() - { - modifier.area = 4; - modifier.overrideArea = true; - - surface.BuildNavMesh(); - - var expectedAreaMask = 1 << 4; - Assert.IsTrue(NavMeshSurfaceTests.HasNavMeshAtOrigin(expectedAreaMask)); - } - - [Test] - public void ModifierOverrideAreaAffectsChild() - { - modifier.area = 4; - modifier.overrideArea = true; - modifier.GetComponent().enabled = false; - - var childPlane = GameObject.CreatePrimitive(PrimitiveType.Plane); - childPlane.transform.SetParent(modifier.transform); - - surface.BuildNavMesh(); - - var expectedAreaMask = 1 << 4; - Assert.IsTrue(NavMeshSurfaceTests.HasNavMeshAtOrigin(expectedAreaMask)); - GameObject.DestroyImmediate(childPlane); - } - - [Test] - public void ModifierOverrideAreaDoesNotAffectSibling() - { - modifier.area = 4; - modifier.overrideArea = true; - modifier.GetComponent().enabled = false; - - var siblingPlane = GameObject.CreatePrimitive(PrimitiveType.Plane); - - surface.BuildNavMesh(); - - var expectedAreaMask = 1; - Assert.IsTrue(NavMeshSurfaceTests.HasNavMeshAtOrigin(expectedAreaMask)); - GameObject.DestroyImmediate(siblingPlane); - } -} -#endif diff --git a/Assets/Tests/NavMeshSurfaceModifierTests.cs.meta b/Assets/Tests/NavMeshSurfaceModifierTests.cs.meta deleted file mode 100644 index 1521197..0000000 --- a/Assets/Tests/NavMeshSurfaceModifierTests.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: f9fe5cff05af44c0fb71a8dcc44efc41 -timeCreated: 1490606318 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tests/NavMeshSurfaceModifierVolumeTests.cs b/Assets/Tests/NavMeshSurfaceModifierVolumeTests.cs deleted file mode 100644 index 670568a..0000000 --- a/Assets/Tests/NavMeshSurfaceModifierVolumeTests.cs +++ /dev/null @@ -1,71 +0,0 @@ -#if UNITY_EDITOR || UNITY_STANDALONE -using UnityEngine; -using UnityEngine.AI; -using UnityEngine.TestTools; -using NUnit.Framework; -using System.Collections; - -[TestFixture] -public class NavMeshSurfaceModifierVolumeTests -{ - NavMeshSurface surface; - NavMeshModifierVolume modifier; - - [SetUp] - public void CreatePlaneAndModifierVolume() - { - var go = GameObject.CreatePrimitive(PrimitiveType.Plane); - surface = go.AddComponent(); - - modifier = new GameObject().AddComponent(); - } - - [TearDown] - public void DestroyPlaneAndModifierVolume() - { - GameObject.DestroyImmediate(surface.gameObject); - GameObject.DestroyImmediate(modifier.gameObject); - } - - [Test] - public void AreaAffectsNavMeshOverlapping() - { - modifier.center = Vector3.zero; - modifier.size = Vector3.one; - modifier.area = 4; - - surface.BuildNavMesh(); - - var expectedAreaMask = 1 << 4; - Assert.IsTrue(NavMeshSurfaceTests.HasNavMeshAtOrigin(expectedAreaMask)); - } - - [Test] - public void AreaDoesNotAffectsNavMeshWhenNotOverlapping() - { - modifier.center = 1.1f * Vector3.right; - modifier.size = Vector3.one; - modifier.area = 4; - - surface.BuildNavMesh(); - - var expectedAreaMask = 1; - Assert.IsTrue(NavMeshSurfaceTests.HasNavMeshAtOrigin(expectedAreaMask)); - } - - [Test] - public void BuildUsesOnlyIncludedModifierVolume() - { - modifier.center = Vector3.zero; - modifier.size = Vector3.one; - modifier.area = 4; - modifier.gameObject.layer = 7; - - surface.layerMask = ~(1 << 7); - surface.BuildNavMesh(); - - var expectedAreaMask = 1; - Assert.IsTrue(NavMeshSurfaceTests.HasNavMeshAtOrigin(expectedAreaMask)); - } -} -#endif diff --git a/Assets/Tests/NavMeshSurfaceModifierVolumeTests.cs.meta b/Assets/Tests/NavMeshSurfaceModifierVolumeTests.cs.meta deleted file mode 100644 index 7ab2d13..0000000 --- a/Assets/Tests/NavMeshSurfaceModifierVolumeTests.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: f5d873c779b014234ba92f3cb7476da6 -timeCreated: 1490606318 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Tests/NavMeshSurfaceTests.cs b/Assets/Tests/NavMeshSurfaceTests.cs deleted file mode 100644 index 02ca1f6..0000000 --- a/Assets/Tests/NavMeshSurfaceTests.cs +++ /dev/null @@ -1,202 +0,0 @@ -#if UNITY_EDITOR || UNITY_STANDALONE -using UnityEngine; -using UnityEngine.AI; -using UnityEngine.TestTools; -using NUnit.Framework; -using System.Collections; - -[TestFixture] -public class NavMeshSurfaceTests -{ - GameObject plane; - NavMeshSurface surface; - - [SetUp] - public void CreatePlaneWithSurface() - { - plane = GameObject.CreatePrimitive(PrimitiveType.Plane); - surface = new GameObject().AddComponent(); - Assert.IsFalse(HasNavMeshAtOrigin()); - } - - [TearDown] - public void DestroyPlaneWithSurface() - { - GameObject.DestroyImmediate(plane); - GameObject.DestroyImmediate(surface.gameObject); - Assert.IsFalse(HasNavMeshAtOrigin()); - } - - [Test] - public void NavMeshIsAvailableAfterBuild() - { - surface.BuildNavMesh(); - Assert.IsTrue(HasNavMeshAtOrigin()); - } - - [Test] - public void NavMeshCanBeRemovedAndAdded() - { - surface.BuildNavMesh(); - Assert.IsTrue(HasNavMeshAtOrigin()); - - surface.RemoveData(); - Assert.IsFalse(HasNavMeshAtOrigin()); - - surface.AddData(); - Assert.IsTrue(HasNavMeshAtOrigin()); - } - - [Test] - public void NavMeshIsNotAvailableWhenDisabled() - { - surface.BuildNavMesh(); - - surface.enabled = false; - Assert.IsFalse(HasNavMeshAtOrigin()); - - surface.enabled = true; - Assert.IsTrue(HasNavMeshAtOrigin()); - } - - [Test] - public void CanBuildWithCustomArea() - { - surface.defaultArea = 4; - var expectedAreaMask = 1 << 4; - - surface.BuildNavMesh(); - Assert.IsTrue(HasNavMeshAtOrigin(expectedAreaMask)); - } - - [Test] - public void CanBuildWithCustomAgentTypeID() - { - surface.agentTypeID = 1234; - surface.BuildNavMesh(); - - Assert.IsTrue(HasNavMeshAtOrigin(NavMesh.AllAreas, 1234)); - } - - [Test] - public void CanBuildCollidersAndIgnoreRenderMeshes() - { - plane.GetComponent().enabled = false; - - surface.useGeometry = NavMeshCollectGeometry.PhysicsColliders; - surface.BuildNavMesh(); - Assert.IsTrue(HasNavMeshAtOrigin()); - - surface.useGeometry = NavMeshCollectGeometry.RenderMeshes; - surface.BuildNavMesh(); - Assert.IsFalse(HasNavMeshAtOrigin()); - } - - [Test] - public void CanBuildRenderMeshesAndIgnoreColliders() - { - plane.GetComponent().enabled = false; - - surface.useGeometry = NavMeshCollectGeometry.PhysicsColliders; - surface.BuildNavMesh(); - Assert.IsFalse(HasNavMeshAtOrigin()); - - surface.useGeometry = NavMeshCollectGeometry.RenderMeshes; - surface.BuildNavMesh(); - Assert.IsTrue(HasNavMeshAtOrigin()); - } - - [Test] - public void BuildIgnoresGeometryOutsideBounds() - { - surface.collectObjects = CollectObjects.Volume; - surface.center = new Vector3(20, 0, 0); - surface.size = new Vector3(10, 10, 10); - - surface.BuildNavMesh(); - Assert.IsFalse(HasNavMeshAtOrigin()); - } - - [Test] - public void BuildIgnoresGeometrySiblings() - { - surface.collectObjects = CollectObjects.Children; - - surface.BuildNavMesh(); - Assert.IsFalse(HasNavMeshAtOrigin()); - } - - [Test] - public void BuildUsesOnlyIncludedLayers() - { - plane.layer = 4; - surface.layerMask = ~(1 << 4); - - surface.BuildNavMesh(); - Assert.IsFalse(HasNavMeshAtOrigin()); - } - - [Test] - public void DefaultSettingsMatchBuiltinSettings() - { - var bs = surface.GetBuildSettings(); - Assert.AreEqual(NavMesh.GetSettingsByIndex(0), bs); - } - - [Test] - public void ActiveSurfacesContainsOnlyActiveAndEnabledSurface() - { - Assert.IsTrue(NavMeshSurface.activeSurfaces.Contains(surface)); - Assert.AreEqual(1, NavMeshSurface.activeSurfaces.Count); - - surface.enabled = false; - Assert.IsFalse(NavMeshSurface.activeSurfaces.Contains(surface)); - Assert.AreEqual(0, NavMeshSurface.activeSurfaces.Count); - - surface.enabled = true; - surface.gameObject.SetActive(false); - Assert.IsFalse(NavMeshSurface.activeSurfaces.Contains(surface)); - Assert.AreEqual(0, NavMeshSurface.activeSurfaces.Count); - } - - [UnityTest] - public IEnumerator NavMeshMovesToSurfacePositionNextFrame() - { - plane.transform.position = new Vector3(100, 0, 0); - surface.transform.position = new Vector3(100, 0, 0); - surface.BuildNavMesh(); - Assert.IsFalse(HasNavMeshAtOrigin()); - - surface.transform.position = Vector3.zero; - Assert.IsFalse(HasNavMeshAtOrigin()); - - yield return null; - - Assert.IsTrue(HasNavMeshAtOrigin()); - } - - [UnityTest] - public IEnumerator UpdatingAndAddingNavMesh() - { - var navmeshData = new NavMeshData(); - var oper = surface.UpdateNavMesh(navmeshData); - Assert.IsFalse(HasNavMeshAtOrigin()); - - do { yield return null; } while (!oper.isDone); - surface.RemoveData(); - surface.navMeshData = navmeshData; - surface.AddData(); - - Assert.IsTrue(HasNavMeshAtOrigin()); - } - - public static bool HasNavMeshAtOrigin(int areaMask = NavMesh.AllAreas, int agentTypeID = 0) - { - var hit = new NavMeshHit(); - var filter = new NavMeshQueryFilter(); - filter.areaMask = areaMask; - filter.agentTypeID = agentTypeID; - return NavMesh.SamplePosition(Vector3.zero, out hit, 0.1f, filter); - } -} -#endif diff --git a/Assets/Tests/NavMeshSurfaceTests.cs.meta b/Assets/Tests/NavMeshSurfaceTests.cs.meta deleted file mode 100644 index 59770ea..0000000 --- a/Assets/Tests/NavMeshSurfaceTests.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 925111c157b314873b97f89e0f03d570 -timeCreated: 1490606318 -licenseType: Pro -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 6dc24f7..b43697c 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,4 +4,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/Jack.unity + guid: 81b2f1001ef5f9843b3ae63aef0b4f2e diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 74d7b53..9e432d1 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -35,6 +35,8 @@ GraphicsSettings: - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index 61807da..ddd512d 100644 --- a/ProjectSettings/UnityConnectSettings.asset +++ b/ProjectSettings/UnityConnectSettings.asset @@ -3,7 +3,7 @@ --- !u!310 &1 UnityConnectSettings: m_ObjectHideFlags: 0 - m_Enabled: 0 + m_Enabled: 1 m_TestMode: 0 m_TestEventUrl: m_TestConfigUrl: diff --git a/WBase b/WBase index 6314c1c..8a1427b 160000 --- a/WBase +++ b/WBase @@ -1 +1 @@ -Subproject commit 6314c1c8ca199566c9094f30c078ed75158c54a1 +Subproject commit 8a1427be5b76152554080c9b34308ee3a54a767b