epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use IRender.ScreenBounds in ScreenMap.

Browse Source 
Traits are now required to trigger a ScreenMap update whenever they
believe that their ScreenBounds have changed.
This commit is contained in:
Paul Chote
2017-12-09 19:09:17 +00:00
committed by reaperrr
parent fa65fef4d1
commit 8fcc80b05a
8 changed files with 141 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/Carryall.cs
View File

@@ -61,6 +61,7 @@ namespace OpenRA.Mods.Common.Traits
[Sync] public Actor Carryable { get; private set; }
public CarryallState State { get; private set; }
int cachedFacing;
IActorPreview[] carryablePreview = null;
/// <summary>Offset between the carryall's and the carried actor's CenterPositions</summary>
@@ -84,6 +85,15 @@ namespace OpenRA.Mods.Common.Traits
// Cargo may be killed in the same tick as, but after they are attached
if (Carryable != null && Carryable.IsDead)
DetachCarryable(self);
// HACK: We don't have an efficient way to know when the preview
// bounds change, so assume that we need to update the screen map
// (only) when the facing changes
if (facing.Facing != cachedFacing && carryablePreview != null)
{
self.World.ScreenMap.AddOrUpdate(self);
cachedFacing = facing.Facing;
}
}
void INotifyActorDisposing.Disposing(Actor self)
@@ -126,6 +136,7 @@ namespace OpenRA.Mods.Common.Traits
Carryable = carryable;
State = CarryallState.Carrying;
self.World.ScreenMap.AddOrUpdate(self);
CarryableOffset = OffsetForCarryable(self, carryable);
return true;
@@ -134,6 +145,7 @@ namespace OpenRA.Mods.Common.Traits
public virtual void DetachCarryable(Actor self)
{
UnreserveCarryable(self);
self.World.ScreenMap.AddOrUpdate(self);
carryablePreview = null;
CarryableOffset = WVec.Zero;