Container light occlusion (#687)

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2020-07-26 08:25:53 -04:00
parent 8e08c64fcf
commit d3866a3372
3 changed files with 182 additions and 1 deletions
--- a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
+++ b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
@@ -0,0 +1,155 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Content.Server.GameObjects.Components;
+using NUnit.Framework;
+using Robust.Client.GameObjects;
+using Robust.Server.Interfaces.Player;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Interfaces.Map;
+using Robust.Shared.IoC;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+
+namespace Content.IntegrationTests.Tests
+{
+    public class ContainerOcclusionTest : ContentIntegrationTest
+    {
+        private const string ExtraPrototypes = @"
+- type: entity
+  id: ContainerOcclusionA
+  components:
+  - type: EntityStorage
+    occludesLight: true
+
+- type: entity
+  id: ContainerOcclusionB
+  components:
+  - type: EntityStorage
+    showContents: true
+    occludesLight: false
+
+- type: entity
+  id: ContainerOcclusionDummy
+  components:
+  - type: Sprite
+  - type: PointLight
+";
+
+        private async Task<(ClientIntegrationInstance c, ServerIntegrationInstance s)> Start()
+        {
+            var optsServer = new ServerIntegrationOptions {ExtraPrototypes = ExtraPrototypes};
+            var optsClient = new ClientIntegrationOptions {ExtraPrototypes = ExtraPrototypes};
+
+            var (c, s) = await StartConnectedServerDummyTickerClientPair(optsClient, optsServer);
+
+            s.Post(() =>
+            {
+                IoCManager.Resolve<IPlayerManager>()
+                    .GetAllPlayers().Single()
+                    .JoinGame();
+
+                var mapMan = IoCManager.Resolve<IMapManager>();
+
+                mapMan.CreateMap(new MapId(1));
+            });
+
+            return (c, s);
+        }
+
+        [Test]
+        public async Task TestA()
+        {
+            var (c, s) = await Start();
+
+            EntityUid dummyUid = default;
+            s.Post(() =>
+            {
+                var pos = new MapCoordinates(Vector2.Zero, new MapId(1));
+                var ent = IoCManager.Resolve<IEntityManager>();
+                var container = ent.SpawnEntity("ContainerOcclusionA", pos);
+                var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
+                dummyUid = dummy.Uid;
+
+                container.GetComponent<EntityStorageComponent>().Insert(dummy);
+            });
+
+            await RunTicksSync(c, s, 5);
+
+            c.Assert(() =>
+            {
+                var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
+                var sprite = dummy.GetComponent<SpriteComponent>();
+                var light = dummy.GetComponent<PointLightComponent>();
+                Assert.True(sprite.ContainerOccluded);
+                Assert.True(light.ContainerOccluded);
+            });
+
+            await Task.WhenAll(c.WaitIdleAsync(), s.WaitIdleAsync());
+        }
+
+        [Test]
+        public async Task TestB()
+        {
+            var (c, s) = await Start();
+
+            EntityUid dummyUid = default;
+            s.Post(() =>
+            {
+                var pos = new MapCoordinates(Vector2.Zero, new MapId(1));
+                var ent = IoCManager.Resolve<IEntityManager>();
+                var container = ent.SpawnEntity("ContainerOcclusionB", pos);
+                var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
+                dummyUid = dummy.Uid;
+
+                container.GetComponent<EntityStorageComponent>().Insert(dummy);
+            });
+
+            await RunTicksSync(c, s, 5);
+
+            c.Assert(() =>
+            {
+                var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
+                var sprite = dummy.GetComponent<SpriteComponent>();
+                var light = dummy.GetComponent<PointLightComponent>();
+                Assert.False(sprite.ContainerOccluded);
+                Assert.False(light.ContainerOccluded);
+            });
+
+            await Task.WhenAll(c.WaitIdleAsync(), s.WaitIdleAsync());
+        }
+
+        [Test]
+        public async Task TestAb()
+        {
+            var (c, s) = await Start();
+
+            EntityUid dummyUid = default;
+            s.Post(() =>
+            {
+                var pos = new MapCoordinates(Vector2.Zero, new MapId(1));
+                var ent = IoCManager.Resolve<IEntityManager>();
+                var containerA = ent.SpawnEntity("ContainerOcclusionA", pos);
+                var containerB = ent.SpawnEntity("ContainerOcclusionB", pos);
+                var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
+                dummyUid = dummy.Uid;
+
+                containerA.GetComponent<EntityStorageComponent>().Insert(containerB);
+                containerB.GetComponent<EntityStorageComponent>().Insert(dummy);
+            });
+
+            await RunTicksSync(c, s, 5);
+
+            c.Assert(() =>
+            {
+                var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
+                var sprite = dummy.GetComponent<SpriteComponent>();
+                var light = dummy.GetComponent<PointLightComponent>();
+                Assert.True(sprite.ContainerOccluded);
+                Assert.True(light.ContainerOccluded);
+            });
+
+            await Task.WhenAll(c.WaitIdleAsync(), s.WaitIdleAsync());
+        }
+    }
+}