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

Refactor per-player shrouds & fix shellmap shroud.

Browse Source
This commit is contained in:
Paul Chote
2013-04-10 00:35:39 +12:00
parent 66eff85aa4
commit c428cad70c
33 changed files with 146 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.RA/Buildings/BaseProvider.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Mods.RA.Buildings
public void RenderBeforeWorld(WorldRenderer wr, Actor self)
{
// Visible to player and allies
if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
return;
wr.DrawRangeCircleWithContrast(
@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA.Buildings
public float GetValue()
{
// Visible to player and allies
if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
return 0f;
// Ready or delay disabled

2
OpenRA.Mods.RA/Buildings/BibLayer.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.RA.Buildings
{
if (!cliprect.Contains(kv.Key.X, kv.Key.Y))
continue;
if (!world.RenderedShroud.IsExplored(kv.Key))
if (world.ShroudObscures(kv.Key))
continue;
bibSprites[kv.Value.type - 1][kv.Value.index].DrawAt(wr, kv.Key.ToPPos().ToFloat2(), "terrain");

13
OpenRA.Mods.RA/Cloak.cs
View File

@@ -73,7 +73,7 @@ namespace OpenRA.Mods.RA
if (remainingTime > 0)
return r;
if (Cloaked && IsVisible(self.World.RenderedShroud, self))
if (Cloaked && IsVisible(self, self.World.RenderPlayer))
if (string.IsNullOrEmpty(info.Palette))
return r;
else
@@ -97,17 +97,12 @@ namespace OpenRA.Mods.RA
}
}
public bool IsVisible(Shroud s, Actor self)
public bool IsVisible(Actor self, Player byPlayer)
{
if (!Cloaked)
if (!Cloaked || self.Owner.IsAlliedWith(byPlayer))
return true;
if (s.Observing)
return true;
if (s.Owner != null)
if (self.Owner == s.Owner || self.Owner.Stances[s.Owner] == Stance.Ally)
return true;
// TODO: Change this to be per-player? A cloak detector revealing to everyone is dumb
return self.World.ActorsWithTrait<DetectCloaked>().Any(a =>
a.Actor.Owner.Stances[self.Owner] != Stance.Ally &&
(self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);

3
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -160,7 +160,8 @@ namespace OpenRA.Mods.RA.Effects
var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at);
var pos = float2.Lerp(Args.src.ToFloat2(), Args.dest.ToFloat2(), at) - new float2(0, altitude);
if (Args.firedBy.World.RenderedShroud.IsVisible(((PPos) pos.ToInt2()).ToCPos()))
var cell = ((PPos)pos.ToInt2()).ToCPos();
if (!Args.firedBy.World.FogObscures(cell))
{
if (Info.High || Info.Angle > 0)
{

4
OpenRA.Mods.RA/Effects/Contrail.cs
View File

@@ -93,8 +93,8 @@ namespace OpenRA.Mods.RA
var conPos = WPos.Average(positions[i], positions[i-1], positions[i-2], positions[i-3]);
var nextPos = WPos.Average(positions[i-1], positions[i-2], positions[i-3], positions[i-4]);
if (self.World.RenderedShroud.IsVisible(new CPos(conPos)) ||
self.World.RenderedShroud.IsVisible(new CPos(nextPos)))
if (!self.World.FogObscures(new CPos(conPos)) &&
!self.World.FogObscures(new CPos(nextPos)))
{
Game.Renderer.WorldLineRenderer.DrawLine(wr.ScreenPosition(conPos), wr.ScreenPosition(nextPos), trailStart, trailEnd);

2
OpenRA.Mods.RA/Effects/GpsDot.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.RA.Effects
}
var hasGps = (watcher != null && (watcher.Granted || watcher.GrantedAllies));
var hasDot = (huf != null && !huf.IsVisible(self.World.RenderedShroud, self)); // WRONG (why?)
var hasDot = (huf != null && !huf.IsVisible(self, self.World.RenderPlayer));
var dotHidden = (cloak != null && cloak.Cloaked) || (spy != null && spy.Disguised);
show = hasGps && hasDot && !dotHidden;

2
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -158,7 +158,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (Args.firedBy.World.RenderedShroud.IsVisible(PxPosition.ToCPos()))
if (!Args.firedBy.World.FogObscures(PxPosition.ToCPos()))
yield return new Renderable(anim.Image, PxPosition.ToFloat2() - 0.5f * anim.Image.size - new float2(0, Altitude),
wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y);

9
OpenRA.Mods.RA/MPStartLocations.cs
View File

@@ -47,10 +47,11 @@ namespace OpenRA.Mods.RA
}
// Explore allied shroud
foreach (var p in Start)
if ((world.LocalPlayer != null ) &&(p.Key == world.LocalPlayer || p.Key.Stances[world.LocalPlayer] == Stance.Ally))
world.WorldActor.Trait<Shroud>().Explore(world, p.Value,
world.WorldActor.Info.Traits.Get<MPStartLocationsInfo>().InitialExploreRange);
var explore = world.WorldActor.Info.Traits.Get<MPStartLocationsInfo>().InitialExploreRange;
foreach (var p in Start.Keys)
foreach (var q in world.Players)
if (p.IsAlliedWith(q))
q.Shroud.Explore(world, Start[p], explore);
// Set viewport
if (world.LocalPlayer != null && Start.ContainsKey(world.LocalPlayer))

6
OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs
View File

@@ -19,15 +19,15 @@ namespace OpenRA.Mods.RA
class FrozenUnderFog : IRenderModifier, IVisibilityModifier
{
public bool IsVisible(Shroud s, Actor self)
public bool IsVisible(Actor self, Player byPlayer)
{
return Shroud.GetVisOrigins(self).Any(o => s.IsVisible(o));
return byPlayer == null || Shroud.GetVisOrigins(self).Any(o => byPlayer.Shroud.IsVisible(o));
}
Renderable[] cache = { };
public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r)
{
if (IsVisible(self.World.RenderedShroud, self))
if (IsVisible(self, self.World.RenderPlayer))
cache = r.ToArray();
return cache;
}

6
OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs
View File

@@ -19,15 +19,15 @@ namespace OpenRA.Mods.RA
class HiddenUnderFog : IRenderModifier, IVisibilityModifier
{
public bool IsVisible(Shroud s, Actor self)
public bool IsVisible(Actor self, Player byPlayer)
{
return Shroud.GetVisOrigins(self).Any(o => s.IsVisible(o));
return byPlayer == null || Shroud.GetVisOrigins(self).Any(o => byPlayer.Shroud.IsVisible(o));
}
static Renderable[] Nothing = { };
public IEnumerable<Renderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<Renderable> r)
{
return IsVisible(self.World.RenderedShroud, self) ? r : Nothing;
return IsVisible(self, self.World.RenderPlayer) ? r : Nothing;
}
}
}

2
OpenRA.Mods.RA/ProductionBar.cs
View File

@@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA
public float GetValue()
{
// only people we like should see our production status.
if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
if (!self.Owner.IsAlliedWith(self.World.RenderPlayer))
return 0;
var queue = self.TraitsImplementing<ProductionQueue>().FirstOrDefault(q => q.CurrentItem() != null);

2
OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA
{
var position = self.CenterPosition;
if (position.Z > 0 && self.GetDamageState() >= DamageState.Heavy &&
self.World.RenderedShroud.IsVisible(new CPos(position)))
!self.World.FogObscures(new CPos(position)))
{
var offset = info.Offset.Rotate(coords.QuantizeOrientation(self, self.Orientation));
var pos = PPos.FromWPosHackZ(position + coords.LocalToWorld(offset));

10
OpenRA.Mods.RA/Widgets/Logic/ObserverShroudSelectorLogic.cs
View File

@@ -40,16 +40,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
var views = world.Players.Where(p => !p.NonCombatant).ToDictionary(p => p.PlayerName,
p => new CameraOption("{0}'s view".F(p.PlayerName),
() => world.RenderedPlayer == p,
() => { world.RenderedPlayer = p; world.RenderedShroud.Dirty(); }
() => world.RenderPlayer == p,
() => world.RenderPlayer = p
));
views.Add("", new CameraOption("World view",
() => world.RenderedPlayer == null,
() => { world.RenderedPlayer = null; world.RenderedShroud.Dirty(); }
() => world.RenderPlayer == null,
() => world.RenderPlayer = null
));
var shroudSelector = widget.Get<DropDownButtonWidget>("SHROUD_SELECTOR");
shroudSelector.GetText = () => views[world.RenderedPlayer == null ? "" : world.RenderedPlayer.PlayerName].Label;
shroudSelector.GetText = () => views[world.RenderPlayer == null ? "" : world.RenderPlayer.PlayerName].Label;
shroudSelector.OnMouseDown = _ =>
{
Func<CameraOption, ScrollItemWidget, ScrollItemWidget> setupItem = (option, template) =>

2
OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Widgets
var cell = Game.viewport.ViewToWorld(Viewport.LastMousePos);
if (!world.Map.IsInMap(cell)) return;
if (world.LocalPlayer != null && !world.RenderedShroud.IsExplored(cell))
if (world.LocalPlayer != null && world.ShroudObscures(cell))
{
var utext = "Unexplored Terrain";
var usz = Game.Renderer.Fonts["Bold"].Measure(utext) + new int2(20, 24);

4
OpenRA.Mods.RA/World/SmudgeLayer.cs
View File

@@ -78,12 +78,12 @@ namespace OpenRA.Mods.RA
public void Render( WorldRenderer wr )
{
var cliprect = Game.viewport.WorldBounds(world);
var localPlayer = world.LocalPlayer;
foreach (var kv in tiles)
{
if (!cliprect.Contains(kv.Key.X,kv.Key.Y))
continue;
if (localPlayer != null && !world.RenderedShroud.IsExplored(kv.Key))
if (world.ShroudObscures(kv.Key))
continue;
smudgeSprites[kv.Value.type- 1][kv.Value.index].DrawAt(wr, kv.Key.ToPPos().ToFloat2(), "terrain");