tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update clickmap test for world rotation preservation (#7069)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-11 18:21:27 +13:00
committed by GitHub
parent 6bf24e748b
commit a0c1453c01
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.IntegrationTests/Tests/ClickableTest.cs
View File

@@ -68,21 +68,16 @@ namespace Content.IntegrationTests.Tests
[TestCase("ClickTestRotatingCornerInvisibleNoRot", 0.25f, 0.25f, DirSouthEastJustShy, 1, ExpectedResult = true)] [TestCase("ClickTestRotatingCornerInvisibleNoRot", 0.25f, 0.25f, DirSouthEastJustShy, 1, ExpectedResult = true)]
public async Task<bool> Test(string prototype, float clickPosX, float clickPosY, double angle, float scale) public async Task<bool> Test(string prototype, float clickPosX, float clickPosY, double angle, float scale)
{ {
Vector2? worldPos = null;
EntityUid entity = default; EntityUid entity = default;
var clientEntManager = _client.ResolveDependency<IEntityManager>(); var clientEntManager = _client.ResolveDependency<IEntityManager>();
var serverEntManager = _server.ResolveDependency<IEntityManager>(); var serverEntManager = _server.ResolveDependency<IEntityManager>();
var eyeManager = _client.ResolveDependency<IEyeManager>(); var eyeManager = _client.ResolveDependency<IEyeManager>();
var mapManager = _server.ResolveDependency<IMapManager>(); var mapManager = _server.ResolveDependency<IMapManager>();
var gameTicker = _server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<GameTicker>();
await _server.WaitPost(() => await _server.WaitPost(() =>
{ {
var gridEnt = mapManager.GetAllGrids().First().GridEntityId; var ent = serverEntManager.SpawnEntity(prototype, GetMainEntityCoordinates(mapManager));
worldPos = serverEntManager.GetComponent<TransformComponent>(gridEnt).WorldPosition; serverEntManager.GetComponent<TransformComponent>(ent).WorldRotation = angle;
var ent = serverEntManager.SpawnEntity(prototype, new EntityCoordinates(gridEnt, 0f, 0f));
serverEntManager.GetComponent<TransformComponent>(ent).LocalRotation = angle;
serverEntManager.GetComponent<SpriteComponent>(ent).Scale = (scale, scale); serverEntManager.GetComponent<SpriteComponent>(ent).Scale = (scale, scale);
entity = ent; entity = ent;
}); });
@@ -97,9 +92,10 @@ namespace Content.IntegrationTests.Tests
// these tests currently all assume player eye is 0 // these tests currently all assume player eye is 0
eyeManager.CurrentEye.Rotation = 0; eyeManager.CurrentEye.Rotation = 0;
var pos = clientEntManager.GetComponent<TransformComponent>(entity).WorldPosition;
var clickable = clientEntManager.GetComponent<ClickableComponent>(entity); var clickable = clientEntManager.GetComponent<ClickableComponent>(entity);
hit = clickable.CheckClick((clickPosX, clickPosY) + worldPos!.Value, out _, out _); hit = clickable.CheckClick((clickPosX, clickPosY) + pos, out _, out _);
}); });
await _server.WaitPost(() => await _server.WaitPost(() =>