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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
View File

@@ -115,7 +115,7 @@ namespace Content.Server.Solar.EntitySystems
foreach (var panel in EntityManager.EntityQuery<SolarPanelComponent>())
{
TotalPanelPower += panel.MaxSupply * panel.Coverage;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(panel.Owner.Uid).WorldRotation = TargetPanelRotation;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(panel.Owner).WorldRotation = TargetPanelRotation;
_updateQueue.Enqueue(panel);
}
}
@@ -136,7 +136,7 @@ namespace Content.Server.Solar.EntitySystems
// directly downwards (abs(theta) = pi) = coverage -1
// as TowardsSun + = CCW,
// panelRelativeToSun should - = CW
var panelRelativeToSun = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).WorldRotation - TowardsSun;
var panelRelativeToSun = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).WorldRotation - TowardsSun;
// essentially, given cos = X & sin = Y & Y is 'downwards',
// then for the first 90 degrees of rotation in either direction,
// this plots the lower-right quadrant of a circle.
@@ -154,12 +154,12 @@ namespace Content.Server.Solar.EntitySystems
if (coverage > 0)
{
// Determine if the solar panel is occluded, and zero out coverage if so.
var ray = new CollisionRay(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).WorldPosition, TowardsSun.ToWorldVec(), (int) CollisionGroup.Opaque);
var ray = new CollisionRay(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).WorldPosition, TowardsSun.ToWorldVec(), (int) CollisionGroup.Opaque);
var rayCastResults = _physicsSystem.IntersectRayWithPredicate(
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).MapID,
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).MapID,
ray,
SunOcclusionCheckDistance,
e => !IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(e.Uid).Anchored || e == entity);
e => !IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(e).Anchored || e == entity);
if (rayCastResults.Any())
coverage = 0;
}