diff --git a/ReleaseConsumerProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs b/ReleaseConsumerProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs index 25b2fa7..9f58eac 100644 --- a/ReleaseConsumerProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs +++ b/ReleaseConsumerProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs @@ -441,18 +441,22 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests } Assert.That(mapRenderers, Is.Not.Empty, "The live provider prefab has no renderer assigned to its advertised map channel."); + target = new RenderTexture(640, 360, 24, RenderTextureFormat.ARGB32); + camera.targetTexture = target; var cameraRig = cameraObject.AddComponent(); cameraRig.Host = host; cameraRig.CameraTransform = camera.transform; cameraRig.RenderPolicySource = provider; Assert.That(cameraRig.ApplyRig(0f), Is.True); Assert.That(camera.cullingMask & (1 << mapLayer), Is.Zero); + Assert.That(camera.fieldOfView, Is.EqualTo(60f).Within(0.001f)); + var playerViewport = camera.WorldToViewportPoint(playerMarker.transform.position); + Assert.That(playerViewport.x, Is.EqualTo(0.9f).Within(0.01f)); + Assert.That(playerViewport.y, Is.EqualTo(0.55f).Within(0.01f)); var mapCamera = mapCameraObject.AddComponent(); mapCamera.cullingMask = 1 << mapLayer; Assert.That(mapCamera.cullingMask, Is.EqualTo(1 << mapLayer)); - target = new RenderTexture(640, 360, 24, RenderTextureFormat.ARGB32); - camera.targetTexture = target; yield return null; camera.Render(); RenderTexture.active = target; diff --git a/ReleaseConsumerProject/Packages/manifest.json b/ReleaseConsumerProject/Packages/manifest.json index b5d1e9e..f146c06 100644 --- a/ReleaseConsumerProject/Packages/manifest.json +++ b/ReleaseConsumerProject/Packages/manifest.json @@ -9,7 +9,7 @@ "org.gamecult.cultlib": "https://github.com/GameCult/CultLib.git?path=/unity/org.gamecult.cultlib#cultlib-unity-v1.0.13", "org.gamecult.eve.plugin-fields": "https://github.com/GameCult/EvePlugins.git?path=/plugins/eve-plugin-fields/unity/org.gamecult.eve.plugin-fields#eve-plugin-fields-unity-v0.1.1", "org.gamecult.eve.surface": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.surface#eveunity-surface-v0.2.1", - "org.gamecult.eve.unity-scene": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.21", + "org.gamecult.eve.unity-scene": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.23", "org.gamecult.eve.unity-uitoolkit": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-uitoolkit#eveunity-uitoolkit-v0.1.0" }, "testables": [ diff --git a/ReleaseConsumerProject/Packages/packages-lock.json b/ReleaseConsumerProject/Packages/packages-lock.json index 9c46abe..bae8c86 100644 --- a/ReleaseConsumerProject/Packages/packages-lock.json +++ b/ReleaseConsumerProject/Packages/packages-lock.json @@ -142,7 +142,7 @@ "hash": "d0aa50d31f3b6da96bffc194fdc3aa358f37e332" }, "org.gamecult.eve.unity-scene": { - "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.21", + "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-scene#eveunity-scene-v0.3.23", "depth": 0, "source": "git", "dependencies": { @@ -151,7 +151,7 @@ "org.gamecult.eve.surface": "0.2.1", "com.unity.mathematics": "1.3.2" }, - "hash": "c662f11618e4dbb2bf36b02c54c2932bba360a4b" + "hash": "e43f2d74557dcbf2cc408893c7b7d7ac708a44a8" }, "org.gamecult.eve.unity-uitoolkit": { "version": "https://github.com/GameCult/EveUnity.git?path=/packages/org.gamecult.eve.unity-uitoolkit#eveunity-uitoolkit-v0.1.0", diff --git a/TestProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs b/TestProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs index 25b2fa7..9f58eac 100644 --- a/TestProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs +++ b/TestProject/Assets/Tests/PlayMode/GenericWorldCaptureTests.cs @@ -441,18 +441,22 @@ namespace GameCult.EveUnity.GenericClient.PlayModeTests } Assert.That(mapRenderers, Is.Not.Empty, "The live provider prefab has no renderer assigned to its advertised map channel."); + target = new RenderTexture(640, 360, 24, RenderTextureFormat.ARGB32); + camera.targetTexture = target; var cameraRig = cameraObject.AddComponent(); cameraRig.Host = host; cameraRig.CameraTransform = camera.transform; cameraRig.RenderPolicySource = provider; Assert.That(cameraRig.ApplyRig(0f), Is.True); Assert.That(camera.cullingMask & (1 << mapLayer), Is.Zero); + Assert.That(camera.fieldOfView, Is.EqualTo(60f).Within(0.001f)); + var playerViewport = camera.WorldToViewportPoint(playerMarker.transform.position); + Assert.That(playerViewport.x, Is.EqualTo(0.9f).Within(0.01f)); + Assert.That(playerViewport.y, Is.EqualTo(0.55f).Within(0.01f)); var mapCamera = mapCameraObject.AddComponent(); mapCamera.cullingMask = 1 << mapLayer; Assert.That(mapCamera.cullingMask, Is.EqualTo(1 << mapLayer)); - target = new RenderTexture(640, 360, 24, RenderTextureFormat.ARGB32); - camera.targetTexture = target; yield return null; camera.Render(); RenderTexture.active = target; diff --git a/scripts/run-aetheria-daemon-world-witness.ps1 b/scripts/run-aetheria-daemon-world-witness.ps1 index a4edd57..213d96f 100644 --- a/scripts/run-aetheria-daemon-world-witness.ps1 +++ b/scripts/run-aetheria-daemon-world-witness.ps1 @@ -13,7 +13,7 @@ param( ) $ErrorActionPreference = "Stop" -$expectedEveUnityCommit = "c662f11618e4dbb2bf36b02c54c2932bba360a4b" +$expectedEveUnityCommit = "e43f2d74557dcbf2cc408893c7b7d7ac708a44a8" $expectedCultLibCommit = "feb5c71513e71d681699f462fe3682b3168c6f73" $repoRoot = Split-Path -Parent $PSScriptRoot $projectRoot = $ClientProject