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

Introducing per-player shrouds.

Browse Source 
- Each player has their own shroud and their visibility does not extend outside of the shroud. 
- Units and buildings can no longer target other units outside of their visibility. Buildings can still be targetted if they have been explored.
- GPS will provide visibility in the fog-of-war.
- Spies that infiltrate radar domes will gain their victim's exploration and reset it on all clients (if the victim does not have GPS)
This commit is contained in:
Kenny
2012-12-13 15:16:56 -08:00
parent 5249a17d48
commit f41fb32d60
48 changed files with 351 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Game/Actor.cs
View File

@@ -43,6 +43,8 @@ namespace OpenRA
return HasLocation.PxPosition;
}
}
public Shroud.ActorVisibility Sight;
[Sync]
public Player Owner;
@@ -85,6 +87,16 @@ namespace OpenRA
return (firstSprite.Sprite.size * firstSprite.Scale).ToInt2();
});
if(this.HasTrait<RevealsShroud>())
{
Sight = new Shroud.ActorVisibility
{
range = this.Trait<RevealsShroud>().RevealRange,
vis = Shroud.GetVisOrigins(this).ToArray()
};
}
ApplyIRender = x => x.Render(this);
ApplyRenderModifier = (m, p) => p.ModifyRender(this, m);
@@ -99,6 +111,11 @@ namespace OpenRA
currentActivity = Util.RunActivity( this, currentActivity );
}
public void UpdateSight()
{
Sight.vis = Shroud.GetVisOrigins(this).ToArray();
}
public bool IsIdle
{

8
OpenRA.Game/Graphics/Minimap.cs
View File

@@ -139,7 +139,7 @@ namespace OpenRA.Graphics
foreach (var t in world.ActorsWithTrait<IRadarSignature>())
{
if (!world.LocalShroud.IsVisible(t.Actor))
if (!world.RenderedShroud.IsVisible(t.Actor))
continue;
var color = t.Trait.RadarSignatureColor(t.Actor);
@@ -158,7 +158,7 @@ namespace OpenRA.Graphics
var map = world.Map;
var size = Exts.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
var bitmap = new Bitmap(size, size);
if (world.LocalShroud.Disabled)
if (world.RenderedShroud.Disabled)
return bitmap;
var bitmapData = bitmap.LockBits(bitmap.Bounds(),
@@ -176,9 +176,9 @@ namespace OpenRA.Graphics
{
var mapX = x + map.Bounds.Left;
var mapY = y + map.Bounds.Top;
if (!world.LocalShroud.IsExplored(mapX, mapY))
if (!world.RenderedShroud.IsExplored(mapX, mapY))
*(c + (y * bitmapData.Stride >> 2) + x) = shroud;
else if (!world.LocalShroud.IsVisible(mapX,mapY))
else if (!world.RenderedShroud.IsVisible(mapX,mapY))
*(c + (y * bitmapData.Stride >> 2) + x) = fog;
}
}

16
OpenRA.Game/Graphics/ShroudRenderer.cs
View File

@@ -15,21 +15,25 @@ namespace OpenRA.Graphics
{
public class ShroudRenderer
{
Traits.Shroud shroud;
World world;
Traits.Shroud shroud {
get {
return world.RenderedShroud;
}
}
Sprite[] shadowBits = Game.modData.SpriteLoader.LoadAllSprites("shadow");
Sprite[,] sprites, fogSprites;
bool dirty = true;
Map map;
public ShroudRenderer(World world)
{
this.shroud = world.LocalShroud;
this.world = world;
this.map = world.Map;
sprites = new Sprite[map.MapSize.X, map.MapSize.Y];
fogSprites = new Sprite[map.MapSize.X, map.MapSize.Y];
shroud.Dirty += () => dirty = true;
}
static readonly byte[][] SpecialShroudTiles =
@@ -103,9 +107,9 @@ namespace OpenRA.Graphics
internal void Draw( WorldRenderer wr )
{
if (dirty)
if (shroud != null && shroud.dirty)
{
dirty = false;
shroud.dirty = false;
for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
sprites[i, j] = ChooseShroud(i, j);

4
OpenRA.Game/Graphics/TerrainRenderer.cs
View File

@@ -72,9 +72,9 @@ namespace OpenRA.Graphics
if (firstRow < 0) firstRow = 0;
if (lastRow > map.Bounds.Height) lastRow = map.Bounds.Height;
if (world.LocalPlayer != null && !world.LocalShroud.Disabled && world.LocalShroud.Bounds.HasValue)
if (world.RenderedPlayer != null && !world.RenderedShroud.Disabled && world.RenderedShroud.Bounds.HasValue)
{
var r = world.LocalShroud.Bounds.Value;
var r = world.RenderedShroud.Bounds.Value;
if (firstRow < r.Top - map.Bounds.Top)
firstRow = r.Top - map.Bounds.Top;

2
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -202,7 +202,7 @@ namespace OpenRA.Graphics
cachedScroll = scrollPosition;
}
var b = world.LocalShroud.Bounds;
var b = world.RenderedShroud.Bounds;
return (b.HasValue) ? Rectangle.Intersect(cachedRect, b.Value) : cachedRect;
}
}

3
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -198,8 +198,7 @@ namespace OpenRA.Network
{
var oldStance = p.Stances[target];
p.Stances[target] = s;
if (target == w.LocalPlayer)
w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, p, oldStance, s);
target.Shroud.UpdatePlayerStance(w, p, oldStance, s);
foreach (var nsc in w.ActorsWithTrait<INotifyStanceChanged>())
nsc.Trait.StanceChanged(nsc.Actor, p, target, oldStance, s);

7
OpenRA.Game/Player.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA
public readonly PlayerReference PlayerReference;
public bool IsBot;
public Shroud Shroud { get { return World.LocalShroud; } }
public Shroud Shroud;
public World World { get; private set; }
static CountryInfo ChooseCountry(World world, string name)
@@ -68,7 +68,7 @@ namespace OpenRA
else
{
// Map player
ClientIndex = 0; // Owned by the host (todo: fix this)
ClientIndex = -1; // Owned by the host (todo: fix this)
ColorRamp = pr.ColorRamp;
PlayerName = pr.Name;
NonCombatant = pr.NonCombatant;
@@ -76,7 +76,8 @@ namespace OpenRA
Country = ChooseCountry(world, pr.Race);
}
PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });
Shroud = PlayerActor.Trait<Shroud>();
Shroud.Owner = this;
// Enable the bot logic on the host
IsBot = botType != null;
if (IsBot && Game.IsHost)

8
OpenRA.Game/Traits/CreatesShroud.cs
View File

@@ -29,8 +29,12 @@ namespace OpenRA.Traits
public void Tick(Actor self)
{
if (!self.IsDisabled())
self.World.WorldActor.Trait<Shroud>().HideActor(self, Info.Range);
if (!self.TraitsImplementing<IDisable>().Any(d => d.Disabled)) {
var shrouds = self.World.ActorsWithTrait<Traits.Shroud>().Select(s => s.Actor.Owner.Shroud);
foreach (var shroud in shrouds) {
shroud.HideActor(self, Info.Range);
}
}
}
}
}

4
OpenRA.Game/Traits/Player/DeveloperMode.cs
View File

@@ -77,7 +77,7 @@ namespace OpenRA.Traits
{
DisableShroud ^= true;
if (self.World.LocalPlayer == self.Owner)
self.World.LocalShroud.Disabled = DisableShroud;
self.World.RenderedShroud.Disabled = DisableShroud;
break;
}
case "DevPathDebug":
@@ -88,7 +88,7 @@ namespace OpenRA.Traits
case "DevGiveExploration":
{
if (self.World.LocalPlayer == self.Owner)
self.World.WorldActor.Trait<Shroud>().ExploreAll(self.World);
self.World.LocalPlayer.Shroud.ExploreAll(self.World);
break;
}
case "DevUnlimitedPower":

15
OpenRA.Game/Traits/RevealsShroud.cs
View File

@@ -29,11 +29,22 @@ namespace OpenRA.Traits
public void Tick(Actor self)
{
// todo: don't tick all the time.
World w = self.World;
if(self.Owner == null) return;
if (previousLocation != self.Location)
{
previousLocation = self.Location;
self.World.WorldActor.Trait<Shroud>().UpdateActor(self);
var actors = w.ActorsWithTrait<Shroud>();
foreach( var s in actors )
s.Actor.Owner.Shroud.RemoveActor(self);
self.UpdateSight();
foreach( var s in actors )
s.Actor.Owner.Shroud.AddActor(self);
}
}

4
OpenRA.Game/Traits/SelectionDecorations.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Traits
void DrawPips(WorldRenderer wr, Actor self, float2 basePosition)
{
if (self.Owner != self.World.LocalPlayer) return;
if (self.Owner != self.World.RenderedPlayer) return;
var pipSources = self.TraitsImplementing<IPips>();
if (pipSources.Count() == 0)
@@ -95,7 +95,7 @@ namespace OpenRA.Traits
void DrawTags(WorldRenderer wr, Actor self, float2 basePosition)
{
if (self.Owner != self.World.LocalPlayer) return;
if (self.Owner != self.World.RenderedPlayer) return;
// If a mod wants to implement a unit with multiple tags, then they are placed on multiple rows
var tagxyBase = basePosition + new float2(-16, 2); // Correct for the offset in the shp file

4
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Traits
Color RadarSignatureColor(Actor self);
}
public interface IVisibilityModifier { bool IsVisible(Actor self); }
public interface IVisibilityModifier { bool IsVisible(Shroud s, Actor self); }
public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
public interface IHasLocation { PPos PxPosition { get; } }
@@ -226,7 +226,7 @@ namespace OpenRA.Traits
public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning); }
public interface IObjectivesPanel { string ObjectivesPanel { get; } }
public static class DisableExts
{
public static bool IsDisabled(this Actor a)

2
OpenRA.Game/Traits/World/ResourceLayer.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Traits
for (int x = clip.Left; x < clip.Right; x++)
for (int y = clip.Top; y < clip.Bottom; y++)
{
if (!world.LocalShroud.IsExplored(new CPos(x, y)))
if (!world.RenderedShroud.IsExplored(new CPos(x, y)))
continue;
var c = content[x, y];

99
OpenRA.Game/Traits/World/Shroud.cs
View File

@@ -25,16 +25,23 @@ namespace OpenRA.Traits
Map map;
World world;
public Player Owner;
public int[,] visibleCells;
public bool[,] exploredCells;
Rectangle? exploredBounds;
public Rectangle? exploredBounds;
bool disabled = false;
public bool dirty = true;
public bool Disabled
{
get { return disabled || world.LocalPlayer == null; }
get { return disabled; }
set { disabled = value; Dirty(); }
}
public bool Observing
{
get { return world.IsShellmap || (world.LocalPlayer == null && Owner == null);; }
}
public Rectangle? Bounds
{
get { return Disabled ? null : exploredBounds; }
@@ -42,6 +49,12 @@ namespace OpenRA.Traits
public event Action Dirty = () => { };
public void Jank()
{
Dirty();
}
public Shroud(World world)
{
this.world = world;
@@ -50,12 +63,13 @@ namespace OpenRA.Traits
exploredCells = new bool[map.MapSize.X, map.MapSize.Y];
world.ActorAdded += AddActor;
world.ActorRemoved += RemoveActor;
Dirty += () => dirty = true;
}
// cache of positions that were added, so no matter what crazy trait code does, it
// can't make us invalid.
class ActorVisibility { public int range; public CPos[] vis; }
Dictionary<Actor, ActorVisibility> vis = new Dictionary<Actor, ActorVisibility>();
public class ActorVisibility { public int range; public CPos[] vis; }
public Dictionary<Actor, ActorVisibility> vis = new Dictionary<Actor, ActorVisibility>();
static IEnumerable<CPos> FindVisibleTiles(World world, CPos a, int r)
{
@@ -72,25 +86,13 @@ namespace OpenRA.Traits
yield return new CPos(i, j);
}
void AddActor(Actor a)
public void AddActor(Actor a)
{
if (!a.HasTrait<RevealsShroud>())
return;
if (a.Owner.World.LocalPlayer == null
|| a.Owner.Stances[a.Owner.World.LocalPlayer] != Stance.Ally) return;
if (vis.ContainsKey(a))
{
Game.Debug("Warning: Actor {0}:{1} at {2} bad vis".F(a.Info.Name, a.ActorID, a.Location));
RemoveActor(a);
}
var v = new ActorVisibility
{
range = a.Trait<RevealsShroud>().RevealRange,
vis = GetVisOrigins(a).ToArray()
};
if (!a.HasTrait<RevealsShroud>()) return;
if (a.Owner == null || Owner == null) return;
if(a.Owner.Stances[Owner] != Stance.Ally) return;
ActorVisibility v = a.Sight;
if (v.range == 0) return; // don't bother for things that can't see
@@ -106,8 +108,6 @@ namespace OpenRA.Traits
exploredBounds = (exploredBounds.HasValue) ? Rectangle.Union(exploredBounds.Value, box) : box;
}
vis[a] = v;
if (!Disabled)
Dirty();
}
@@ -129,6 +129,16 @@ namespace OpenRA.Traits
if (!Disabled)
Dirty();
}
public void MergeShroud(Shroud s) {
for (int i = map.Bounds.Left; i < map.Bounds.Right; i++) {
for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++) {
if (s.exploredCells[i,j] == true)
exploredCells[i, j] = true;
}
exploredBounds = Rectangle.Union(exploredBounds.Value, s.exploredBounds.Value);
}
}
public void UpdatePlayerStance(World w, Player player, Stance oldStance, Stance newStance)
{
@@ -138,7 +148,7 @@ namespace OpenRA.Traits
// No longer our ally; remove unit vis
if (oldStance == Stance.Ally)
{
var toRemove = vis.Select(a => a.Key).Where(a => a.Owner == player).ToList();
var toRemove = w.Actors.Where(a => a.Owner == player).ToList();
foreach (var a in toRemove)
RemoveActor(a);
}
@@ -147,6 +157,16 @@ namespace OpenRA.Traits
foreach (var a in w.Actors.Where( a => a.Owner == player ))
AddActor(a);
}
public int Explored()
{
int seen = 0;
for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
if(exploredCells[i, j]) seen++;
return seen;
}
public static IEnumerable<CPos> GetVisOrigins(Actor a)
{
@@ -160,17 +180,18 @@ namespace OpenRA.Traits
return new[] { a.CenterLocation.ToCPos() };
}
void RemoveActor(Actor a)
public void RemoveActor(Actor a)
{
ActorVisibility v;
if (!vis.TryGetValue(a, out v)) return;
if (!a.HasTrait<RevealsShroud>())return;
if (a.Owner == null || Owner == null) return;
if(a.Owner.Stances[Owner] != Stance.Ally) return;
ActorVisibility v = a.Sight;
foreach (var p in v.vis)
foreach (var q in FindVisibleTiles(a.World, p, v.range))
--visibleCells[q.X, q.Y];
vis.Remove(a);
if (!Disabled)
Dirty();
}
@@ -222,7 +243,7 @@ namespace OpenRA.Traits
if (!map.IsInMap(x, y))
return false;
if (Disabled)
if (Disabled || Observing)
return true;
return exploredCells[x,y];
@@ -231,7 +252,7 @@ namespace OpenRA.Traits
public bool IsVisible(CPos xy) { return IsVisible(xy.X, xy.Y); }
public bool IsVisible(int x, int y)
{
if (Disabled)
if (Disabled || Observing)
return true;
// Visibility is allowed to extend beyond the map cordon so that
@@ -245,10 +266,20 @@ namespace OpenRA.Traits
// Actors are hidden under shroud, but not under fog by default
public bool IsVisible(Actor a)
{
if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a)))
// I need to pass in the current shroud, otherwise we're just checking that true==true
if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(this, a)))
return false;
return Disabled || a.Owner == a.World.LocalPlayer || GetVisOrigins(a).Any(o => IsExplored(o));
if(Owner == null) return true;
return Disabled || Observing || a.Owner.Stances[Owner] == Stance.Ally || GetVisOrigins(a).Any(o => IsExplored(o));
}
public bool IsTargetable(Actor a) {
if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(this, a)))
return false;
return GetVisOrigins(a).Any(o => IsVisible(o));
}
}
}

2
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -164,7 +164,7 @@ namespace OpenRA.Widgets
IEnumerable<Actor> SelectActorsInBox(World world, PPos a, PPos b, Func<Actor, bool> cond)
{
return world.FindUnits(a, b)
.Where( x => x.HasTrait<Selectable>() && world.LocalShroud.IsVisible(x) && cond(x) )
.Where( x => x.HasTrait<Selectable>() && world.RenderedShroud.IsVisible(x) && cond(x) )
.GroupBy(x => x.GetSelectionPriority())
.OrderByDescending(g => g.Key)
.Select( g => g.AsEnumerable() )

22
OpenRA.Game/World.cs
View File

@@ -41,10 +41,29 @@ namespace OpenRA
public Player LocalPlayer { get; private set; }
public readonly Shroud LocalShroud;
public Player RenderedPlayer;
public Shroud RenderedShroud {
get {
if(RenderedPlayer == null)
{
return LocalShroud;
}else{
return RenderedPlayer.Shroud;
}
}
}
public void SetLocalPlayer(string pr)
{
if (!(orderManager.Connection is ReplayConnection))
LocalPlayer = Players.FirstOrDefault(p => p.InternalName == pr);
{
LocalPlayer = Players.FirstOrDefault(p => p.InternalName == pr);
RenderedPlayer = LocalPlayer;
}else{
}
}
public readonly Actor WorldActor;
@@ -138,6 +157,7 @@ namespace OpenRA
a.IsInWorld = false;
actors.Remove(a);
ActorRemoved(a);
}
public void Add(IEffect b) { effects.Add(b); }

2
OpenRA.Game/WorldUtils.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA
public static IEnumerable<Actor> FindUnitsAtMouse(this World world, int2 mouseLocation)
{
var loc = Game.viewport.ViewToWorldPx(mouseLocation);
return FindUnits(world, loc, loc).Where(a => world.LocalShroud.IsVisible(a));
return FindUnits(world, loc, loc).Where(a => world.RenderedShroud.IsVisible(a));
}
public static IEnumerable<Actor> FindUnits(this World world, PPos a, PPos b)