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

SnapGridComponent Removal (#3884)

Browse Source 
* Removed SnapGridOffset, there is only center now.

* SnapGridComponent methods are now static.

* Removed SnapGridComponent.OnPositionChanged.

* Refactored static functions off SnapGridComponent to MapGrid.
Refactored away usages of SnapGridComponent.Position.

* Added Transform.Anchored for checking if an entity is a tile entity.
More refactoring for static MapGrid functions.

* Static snapgrid methods on MapGrid are no longer static.

* Add setter to ITransformComponent.Anchored.
Removed direct references to SnapGridComponent from content.

* Grid functions now deal with EntityUids instead of SnapGridComponents.
Began renaming public API functions from SnapGrid to Anchor.

* Remove the SnapGridComponent 'Offset' field from all yaml files. This was removed in code previously, so the yaml linter was upset.

* Update engine submodule to v0.4.46.
This commit is contained in:
Acruid
2021-04-28 10:49:37 -07:00
committed by GitHub
parent 578b767791
commit 00e01d51fd
74 changed files with 306 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Client/GameObjects/Components/WindowVisualizer.cs
View File

@@ -1,9 +1,11 @@
using System;
using System;
using Content.Shared.GameObjects.Components;
using Content.Shared.Utility;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
namespace Content.Client.GameObjects.Components
{
@@ -15,10 +17,10 @@ namespace Content.Client.GameObjects.Components
base.OnChangeData(component);
var sprite = component.Owner.GetComponent<ISpriteComponent>();
if (!component.Owner.TryGetComponent(out SnapGridComponent? snapGrid))
if (!component.Owner.Transform.Anchored)
return;
var lowWall = FindLowWall(snapGrid);
var lowWall = FindLowWall(IoCManager.Resolve<IMapManager>(), component.Owner.Transform);
if (lowWall == null)
return;
@@ -48,11 +50,13 @@ namespace Content.Client.GameObjects.Components
}
}
private static LowWallComponent? FindLowWall(SnapGridComponent snapGrid)
private static LowWallComponent? FindLowWall(IMapManager mapManager, ITransformComponent transform)
{
foreach (var entity in snapGrid.GetLocal())
var grid = mapManager.GetGrid(transform.GridID);
var coords = transform.Coordinates;
foreach (var entity in grid.GetLocal(coords))
{
if (entity.TryGetComponent(out LowWallComponent? lowWall))
if (transform.Owner.EntityManager.ComponentManager.TryGetComponent(entity, out LowWallComponent? lowWall))
{
return lowWall;
}