From bdfdaac0925d5897cbf35d23962d07fa12071a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 24 Aug 2013 10:03:09 +0200 Subject: [PATCH 1/6] sync effects --- OpenRA.Game/Network/SyncReport.cs | 89 +++++++++++++++++++++---------- OpenRA.Game/World.cs | 8 +++ 2 files changed, 69 insertions(+), 28 deletions(-) diff --git a/OpenRA.Game/Network/SyncReport.cs b/OpenRA.Game/Network/SyncReport.cs index e8b911f7cf..9850b2cbff 100755 --- a/OpenRA.Game/Network/SyncReport.cs +++ b/OpenRA.Game/Network/SyncReport.cs @@ -8,40 +8,42 @@ */ #endregion +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; using System.Reflection.Emit; -using System; using OpenRA.FileFormats; namespace OpenRA.Network { class SyncReport { - static Cache>> dumpFuncCache = new Cache>>( t => GenerateDumpFunc( t ) ); + const int NumSyncReports = 5; + + static Cache>> dumpFuncCache = new Cache>>(t => GenerateDumpFunc(t)); readonly OrderManager orderManager; - const int numSyncReports = 5; - Report[] syncReports = new Report[numSyncReports]; + + Report[] syncReports = new Report[NumSyncReports]; int curIndex = 0; - public SyncReport( OrderManager orderManager ) + public SyncReport(OrderManager orderManager) { this.orderManager = orderManager; - for (var i = 0; i < numSyncReports; i++) + for (var i = 0; i < NumSyncReports; i++) syncReports[i] = new SyncReport.Report(); } internal void UpdateSyncReport() { GenerateSyncReport(syncReports[curIndex]); - curIndex = ++curIndex % numSyncReports; + curIndex = ++curIndex % NumSyncReports; } - public static Dictionary DumpSyncTrait( object obj ) + public static Dictionary DumpSyncTrait(object obj) { - return dumpFuncCache[ obj.GetType() ]( obj ); + return dumpFuncCache[obj.GetType()](obj); } public static Func> GenerateDumpFunc(Type t) @@ -66,8 +68,8 @@ namespace OpenRA.Network il.Emit(OpCodes.Newobj, dictCtor_); il.Emit(OpCodes.Stloc, dict_); - const BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance; - foreach (var field in t.GetFields(bf).Where(x => x.HasAttribute())) + const BindingFlags Flags = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance; + foreach (var field in t.GetFields(Flags).Where(x => x.HasAttribute())) { if (field.IsLiteral || field.IsStatic) continue; @@ -94,7 +96,7 @@ namespace OpenRA.Network il.MarkLabel(lblNull); } - foreach (var prop in t.GetProperties(bf).Where(x => x.HasAttribute())) + foreach (var prop in t.GetProperties(Flags).Where(x => x.HasAttribute())) { var lblNull = il.DefineLabel(); @@ -121,7 +123,7 @@ namespace OpenRA.Network il.Emit(OpCodes.Ldloc, dict_); il.Emit(OpCodes.Ret); - return (Func>) d.CreateDelegate(typeof(Func>)); + return (Func>)d.CreateDelegate(typeof(Func>)); } void GenerateSyncReport(Report report) @@ -136,23 +138,44 @@ namespace OpenRA.Network if (sync != 0) { var tr = new TraitReport() - { - ActorID = a.Actor.ActorID, - Type = a.Actor.Info.Name, - Owner = (a.Actor.Owner == null) ? "null" : a.Actor.Owner.PlayerName, - Trait = a.Trait.GetType().Name, - Hash = sync - }; + { + ActorID = a.Actor.ActorID, + Type = a.Actor.Info.Name, + Owner = (a.Actor.Owner == null) ? "null" : a.Actor.Owner.PlayerName, + Trait = a.Trait.GetType().Name, + Hash = sync + }; tr.Fields = DumpSyncTrait(a.Trait); report.Traits.Add(tr); } } + + foreach (var e in orderManager.world.Effects) + { + var sync = e as ISync; + if (sync != null) + { + var hash = Sync.CalculateSyncHash(sync); + if (hash != 0) + { + var er = new EffectReport() + { + Name = sync.ToString().Split('.').Last(), + Hash = hash + }; + + er.Fields = DumpSyncTrait(sync); + report.Effects.Add(er); + } + } + } } internal void DumpSyncReport(int frame) { foreach (var r in syncReports) + { if (r.Frame == frame) { Log.Write("sync", "Sync for net frame {0} -------------", r.Frame); @@ -160,21 +183,24 @@ namespace OpenRA.Network Log.Write("sync", "Synced Traits:"); foreach (var a in r.Traits) { - Log.Write("sync", "\t {0} {1} {2} {3} ({4})".F( - a.ActorID, - a.Type, - a.Owner, - a.Trait, - a.Hash - )); + Log.Write("sync", "\t {0} {1} {2} {3} ({4})".F(a.ActorID, a.Type, a.Owner, a.Trait, a.Hash)); foreach (var f in a.Fields) Log.Write("sync", "\t\t {0}: {1}".F(f.Key, f.Value)); + } + Log.Write("sync", "Synced Effects:"); + foreach (var e in r.Effects) + { + Log.Write("sync", "\t {0} ({1})", e.Name, e.Hash); + foreach (var f in e.Fields) + Log.Write("sync", "\t\t {0}: {1}".F(f.Key, f.Value)); } return; } - Log.Write("sync", "No sync report available!"); + + Log.Write("sync", "No sync report available!"); + } } class Report @@ -183,6 +209,7 @@ namespace OpenRA.Network public int SyncedRandom; public int TotalCount; public List Traits = new List(); + public List Effects = new List(); } struct TraitReport @@ -195,5 +222,11 @@ namespace OpenRA.Network public Dictionary Fields; } + struct EffectReport + { + public string Name; + public int Hash; + public Dictionary Fields; + } } } diff --git a/OpenRA.Game/World.cs b/OpenRA.Game/World.cs index 1ba2aa50e0..8934ba0c3e 100644 --- a/OpenRA.Game/World.cs +++ b/OpenRA.Game/World.cs @@ -246,6 +246,14 @@ namespace OpenRA foreach (var x in traitDict.ActorsWithTraitMultiple(this)) ret += n++ * (int)(1+x.Actor.ActorID) * Sync.CalculateSyncHash(x.Trait); + // TODO: don't go over all effects + foreach (var e in Effects) + { + var sync = e as ISync; + if (sync != null) + ret += n++ * Sync.CalculateSyncHash(sync); + } + // Hash the shared rng ret += SharedRandom.Last; From 5f8d8beec1116dac39915b82fdfca2638530c196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 24 Aug 2013 10:08:13 +0200 Subject: [PATCH 2/6] sync bullets and missiles to investigate desyncs StyleCop clean WeaponInfo and friends --- OpenRA.Game/GameRules/WeaponInfo.cs | 53 ++++++++++---------- OpenRA.Mods.RA/Armament.cs | 22 ++++----- OpenRA.Mods.RA/CarpetBomb.cs | 16 +++--- OpenRA.Mods.RA/Effects/Bullet.cs | 45 +++++++++-------- OpenRA.Mods.RA/Effects/GravityBomb.cs | 6 +-- OpenRA.Mods.RA/Effects/LaserZap.cs | 12 ++--- OpenRA.Mods.RA/Effects/Missile.cs | 71 ++++++++++++++------------- OpenRA.Mods.RA/Effects/TeslaZap.cs | 8 +-- 8 files changed, 119 insertions(+), 114 deletions(-) mode change 100755 => 100644 OpenRA.Mods.RA/Armament.cs mode change 100755 => 100644 OpenRA.Mods.RA/Effects/GravityBomb.cs mode change 100755 => 100644 OpenRA.Mods.RA/Effects/LaserZap.cs mode change 100755 => 100644 OpenRA.Mods.RA/Effects/TeslaZap.cs diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index 91efe67c56..ae67d887e7 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -9,10 +9,10 @@ #endregion using System.Collections.Generic; +using System.Linq; using OpenRA.Effects; using OpenRA.FileFormats; using OpenRA.Traits; -using System.Linq; namespace OpenRA.GameRules { @@ -20,7 +20,7 @@ namespace OpenRA.GameRules { [Desc("Distance (in pixels) from the explosion center at which damage is 1/2.")] public readonly int Spread = 1; - [FieldLoader.LoadUsing( "LoadVersus" )] + [FieldLoader.LoadUsing("LoadVersus")] [Desc("Damage vs each armortype. 0% = can't target.")] public readonly Dictionary Versus; [Desc("Can this damage ore?")] @@ -62,17 +62,17 @@ namespace OpenRA.GameRules return Versus.TryGetValue(armor.Type, out versus) ? versus : 1; } - public WarheadInfo( MiniYaml yaml ) + public WarheadInfo(MiniYaml yaml) { - FieldLoader.Load( this, yaml ); + FieldLoader.Load(this, yaml); } - static object LoadVersus( MiniYaml y ) + static object LoadVersus(MiniYaml y) { - return y.NodesDict.ContainsKey( "Versus" ) - ? y.NodesDict[ "Versus" ].NodesDict.ToDictionary( + return y.NodesDict.ContainsKey("Versus") + ? y.NodesDict["Versus"].NodesDict.ToDictionary( a => a.Key, - a => FieldLoader.GetValue( "(value)", a.Value.Value ) ) + a => FieldLoader.GetValue("(value)", a.Value.Value)) : new Dictionary(); } } @@ -85,13 +85,13 @@ namespace OpenRA.GameRules public class ProjectileArgs { - public WeaponInfo weapon; - public float firepowerModifier = 1.0f; - public int facing; - public WPos source; - public Actor sourceActor; - public WPos passiveTarget; - public Target guidedTarget; + public WeaponInfo Weapon; + public float FirepowerModifier = 1.0f; + public int Facing; + public WPos Source; + public Actor SourceActor; + public WPos PassiveTarget; + public Target GuidedTarget; } public interface IProjectileInfo { IEffect Create(ProjectileArgs args); } @@ -109,30 +109,30 @@ namespace OpenRA.GameRules public readonly int BurstDelay = 5; public readonly float MinRange = 0; - [FieldLoader.LoadUsing( "LoadProjectile" )] public IProjectileInfo Projectile; - [FieldLoader.LoadUsing( "LoadWarheads" )] public List Warheads; + [FieldLoader.LoadUsing("LoadProjectile")] public IProjectileInfo Projectile; + [FieldLoader.LoadUsing("LoadWarheads")] public List Warheads; public WeaponInfo(string name, MiniYaml content) { - FieldLoader.Load( this, content ); + FieldLoader.Load(this, content); } - static object LoadProjectile( MiniYaml yaml ) + static object LoadProjectile(MiniYaml yaml) { MiniYaml proj; - if( !yaml.NodesDict.TryGetValue( "Projectile", out proj ) ) + if (!yaml.NodesDict.TryGetValue("Projectile", out proj)) return null; - var ret = Game.CreateObject( proj.Value + "Info" ); - FieldLoader.Load( ret, proj ); + var ret = Game.CreateObject(proj.Value + "Info"); + FieldLoader.Load(ret, proj); return ret; } - static object LoadWarheads( MiniYaml yaml ) + static object LoadWarheads(MiniYaml yaml) { var ret = new List(); - foreach( var w in yaml.Nodes ) - if( w.Key.Split( '@' )[ 0 ] == "Warhead" ) - ret.Add( new WarheadInfo( w.Value ) ); + foreach (var w in yaml.Nodes) + if (w.Key.Split('@')[0] == "Warhead") + ret.Add(new WarheadInfo(w.Value)); return ret; } @@ -161,7 +161,6 @@ namespace OpenRA.GameRules return true; } - public bool IsValidAgainst(Target target, World world) { if (target.Type == TargetType.Actor) diff --git a/OpenRA.Mods.RA/Armament.cs b/OpenRA.Mods.RA/Armament.cs old mode 100755 new mode 100644 index b888a08757..a4c1914c3a --- a/OpenRA.Mods.RA/Armament.cs +++ b/OpenRA.Mods.RA/Armament.cs @@ -125,28 +125,28 @@ namespace OpenRA.Mods.RA var args = new ProjectileArgs { - weapon = Weapon, - facing = legacyFacing, - firepowerModifier = self.TraitsImplementing() + Weapon = Weapon, + Facing = legacyFacing, + FirepowerModifier = self.TraitsImplementing() .Select(a => a.GetFirepowerModifier()) .Product(), - source = muzzlePosition, - sourceActor = self, - passiveTarget = target.CenterPosition, - guidedTarget = target + Source = muzzlePosition, + SourceActor = self, + PassiveTarget = target.CenterPosition, + GuidedTarget = target }; attack.ScheduleDelayedAction(Info.FireDelay, () => { - if (args.weapon.Projectile != null) + if (args.Weapon.Projectile != null) { - var projectile = args.weapon.Projectile.Create(args); + var projectile = args.Weapon.Projectile.Create(args); if (projectile != null) self.World.Add(projectile); - if (args.weapon.Report != null && args.weapon.Report.Any()) - Sound.Play(args.weapon.Report.Random(self.World.SharedRandom), self.CenterPosition); + if (args.Weapon.Report != null && args.Weapon.Report.Any()) + Sound.Play(args.Weapon.Report.Random(self.World.SharedRandom), self.CenterPosition); } }); diff --git a/OpenRA.Mods.RA/CarpetBomb.cs b/OpenRA.Mods.RA/CarpetBomb.cs index e0a9c037be..c6c34c5627 100644 --- a/OpenRA.Mods.RA/CarpetBomb.cs +++ b/OpenRA.Mods.RA/CarpetBomb.cs @@ -59,18 +59,18 @@ namespace OpenRA.Mods.RA var pos = self.CenterPosition; var args = new ProjectileArgs { - weapon = weapon, - facing = self.Trait().Facing, + Weapon = weapon, + Facing = self.Trait().Facing, - source = pos, - sourceActor = self, - passiveTarget = pos - new WVec(0, 0, pos.Z) + Source = pos, + SourceActor = self, + PassiveTarget = pos - new WVec(0, 0, pos.Z) }; - self.World.Add(args.weapon.Projectile.Create(args)); + self.World.Add(args.Weapon.Projectile.Create(args)); - if (args.weapon.Report != null && args.weapon.Report.Any()) - Sound.Play(args.weapon.Report.Random(self.World.SharedRandom), self.CenterPosition); + if (args.Weapon.Report != null && args.Weapon.Report.Any()) + Sound.Play(args.Weapon.Report.Random(self.World.SharedRandom), self.CenterPosition); } } } diff --git a/OpenRA.Mods.RA/Effects/Bullet.cs b/OpenRA.Mods.RA/Effects/Bullet.cs index 082744711f..8d5aaaf583 100755 --- a/OpenRA.Mods.RA/Effects/Bullet.cs +++ b/OpenRA.Mods.RA/Effects/Bullet.cs @@ -41,41 +41,44 @@ namespace OpenRA.Mods.RA.Effects public IEffect Create(ProjectileArgs args) { return new Bullet(this, args); } } - public class Bullet : IEffect + public class Bullet : IEffect, ISync { readonly BulletInfo info; readonly ProjectileArgs args; ContrailRenderable trail; Animation anim; - WAngle angle; - WPos pos, target; - int length; - int facing; - int ticks, smokeTicks; + + [Sync] WAngle angle; + [Sync] WPos pos, target; + [Sync] int length; + [Sync] int facing; + [Sync] int ticks, smokeTicks; + + [Sync] public Actor SourceActor { get { return args.SourceActor; } } public Bullet(BulletInfo info, ProjectileArgs args) { this.info = info; this.args = args; - this.pos = args.source; + this.pos = args.Source; // Convert ProjectileArg definitions to world coordinates // TODO: Change the yaml definitions so we don't need this - var range = new WRange((int)(1024 * args.weapon.Range)); // Range in world units + var range = new WRange((int)(1024 * args.Weapon.Range)); // Range in world units var inaccuracy = new WRange((int)(info.Inaccuracy * 1024 / Game.CellSize)); // Offset in world units at max range var speed = (int)(info.Speed * 4 * 1024 / (10 * Game.CellSize)); // Speed in world units per tick angle = WAngle.ArcTan((int)(info.Angle * 4 * 1024), 1024); // Angle in world angle - target = args.passiveTarget; + target = args.PassiveTarget; if (info.Inaccuracy > 0) { - var maxOffset = inaccuracy.Range * (target - args.source).Length / range.Range; - target += WVec.FromPDF(args.sourceActor.World.SharedRandom, 2) * maxOffset / 1024; + var maxOffset = inaccuracy.Range * (target - pos).Length / range.Range; + target += WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * maxOffset / 1024; } - facing = Traits.Util.GetFacing(target - args.source, 0); - length = Math.Max((target - args.source).Length / speed, 1); + facing = Traits.Util.GetFacing(target - pos, 0); + length = Math.Max((target - pos).Length / speed, 1); if (info.Image != null) { @@ -85,8 +88,8 @@ namespace OpenRA.Mods.RA.Effects if (info.ContrailLength > 0) { - var color = info.ContrailUsePlayerColor ? ContrailRenderable.ChooseColor(args.sourceActor) : info.ContrailColor; - trail = new ContrailRenderable(args.sourceActor.World, color, info.ContrailLength, info.ContrailDelay, 0); + var color = info.ContrailUsePlayerColor ? ContrailRenderable.ChooseColor(args.SourceActor) : info.ContrailColor; + trail = new ContrailRenderable(args.SourceActor.World, color, info.ContrailLength, info.ContrailDelay, 0); } smokeTicks = info.TrailDelay; @@ -117,11 +120,11 @@ namespace OpenRA.Mods.RA.Effects if (anim != null) anim.Tick(); - pos = WPos.LerpQuadratic(args.source, target, angle, ticks, length); + pos = WPos.LerpQuadratic(args.Source, target, angle, ticks, length); if (info.Trail != null && --smokeTicks < 0) { - var delayedPos = WPos.LerpQuadratic(args.source, target, angle, ticks - info.TrailDelay, length); + var delayedPos = WPos.LerpQuadratic(args.Source, target, angle, ticks - info.TrailDelay, length); world.AddFrameEndTask(w => w.Add(new Smoke(w, delayedPos, info.Trail))); smokeTicks = info.TrailInterval; } @@ -130,7 +133,7 @@ namespace OpenRA.Mods.RA.Effects trail.Update(pos); if (ticks++ >= length || (!info.High && world.ActorMap - .GetUnitsAt(pos.ToCPos()).Any(a => a.HasTrait()))) + .GetUnitsAt(pos.ToCPos()).Any(a => a.HasTrait()))) { Explode(world); } @@ -145,7 +148,7 @@ namespace OpenRA.Mods.RA.Effects yield break; var cell = pos.ToCPos(); - if (!args.sourceActor.World.FogObscures(cell)) + if (!args.SourceActor.World.FogObscures(cell)) { if (info.Shadow) { @@ -154,7 +157,7 @@ namespace OpenRA.Mods.RA.Effects yield return r; } - var palette = wr.Palette(args.weapon.Underwater ? "shadow" : "effect"); + var palette = wr.Palette(args.Weapon.Underwater ? "shadow" : "effect"); foreach (var r in anim.Render(pos, palette)) yield return r; } @@ -167,7 +170,7 @@ namespace OpenRA.Mods.RA.Effects else world.AddFrameEndTask(w => w.Remove(this)); - Combat.DoImpacts(target, args.sourceActor, args.weapon, args.firepowerModifier); + Combat.DoImpacts(target, args.SourceActor, args.Weapon, args.FirepowerModifier); } } } diff --git a/OpenRA.Mods.RA/Effects/GravityBomb.cs b/OpenRA.Mods.RA/Effects/GravityBomb.cs old mode 100755 new mode 100644 index 96d11b5858..edeb784b8e --- a/OpenRA.Mods.RA/Effects/GravityBomb.cs +++ b/OpenRA.Mods.RA/Effects/GravityBomb.cs @@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA.Effects { this.info = info; this.args = args; - pos = args.source; + pos = args.Source; velocity = new WVec(WRange.Zero, WRange.Zero, -info.Velocity); anim = new Animation(info.Image); @@ -52,10 +52,10 @@ namespace OpenRA.Mods.RA.Effects velocity -= new WVec(WRange.Zero, WRange.Zero, info.Acceleration); pos += velocity; - if (pos.Z <= args.passiveTarget.Z) + if (pos.Z <= args.PassiveTarget.Z) { world.AddFrameEndTask(w => w.Remove(this)); - Combat.DoImpacts(args.passiveTarget, args.sourceActor, args.weapon, args.firepowerModifier); + Combat.DoImpacts(args.PassiveTarget, args.SourceActor, args.Weapon, args.FirepowerModifier); } anim.Tick(); diff --git a/OpenRA.Mods.RA/Effects/LaserZap.cs b/OpenRA.Mods.RA/Effects/LaserZap.cs old mode 100755 new mode 100644 index f11caddeec..8092416e2d --- a/OpenRA.Mods.RA/Effects/LaserZap.cs +++ b/OpenRA.Mods.RA/Effects/LaserZap.cs @@ -29,7 +29,7 @@ namespace OpenRA.Mods.RA.Effects public IEffect Create(ProjectileArgs args) { - var c = UsePlayerColor ? args.sourceActor.Owner.Color.RGB : Color; + var c = UsePlayerColor ? args.SourceActor.Owner.Color.RGB : Color; return new LaserZap(args, this, c); } } @@ -50,7 +50,7 @@ namespace OpenRA.Mods.RA.Effects this.args = args; this.info = info; this.color = color; - this.target = args.passiveTarget; + this.target = args.PassiveTarget; if (info.HitAnim != null) this.hitanim = new Animation(info.HitAnim); @@ -59,15 +59,15 @@ namespace OpenRA.Mods.RA.Effects public void Tick(World world) { // Beam tracks target - if (args.guidedTarget.IsValidFor(args.sourceActor)) - target = args.guidedTarget.CenterPosition; + if (args.GuidedTarget.IsValidFor(args.SourceActor)) + target = args.GuidedTarget.CenterPosition; if (!doneDamage) { if (hitanim != null) hitanim.PlayThen("idle", () => animationComplete = true); - Combat.DoImpacts(target, args.sourceActor, args.weapon, args.firepowerModifier); + Combat.DoImpacts(target, args.SourceActor, args.Weapon, args.FirepowerModifier); doneDamage = true; } @@ -83,7 +83,7 @@ namespace OpenRA.Mods.RA.Effects if (ticks < info.BeamDuration) { var rc = Color.FromArgb((info.BeamDuration - ticks) * 255 / info.BeamDuration, color); - yield return new BeamRenderable(args.source, 0, target - args.source, info.BeamWidth, rc); + yield return new BeamRenderable(args.Source, 0, target - args.Source, info.BeamWidth, rc); } if (hitanim != null) diff --git a/OpenRA.Mods.RA/Effects/Missile.cs b/OpenRA.Mods.RA/Effects/Missile.cs index 15cc87aa42..536e95fd86 100755 --- a/OpenRA.Mods.RA/Effects/Missile.cs +++ b/OpenRA.Mods.RA/Effects/Missile.cs @@ -45,32 +45,38 @@ namespace OpenRA.Mods.RA.Effects public IEffect Create(ProjectileArgs args) { return new Missile(this, args); } } - class Missile : IEffect + class Missile : IEffect, ISync { + static readonly WRange MissileCloseEnough = new WRange(7 * 1024 / Game.CellSize); + readonly MissileInfo info; readonly ProjectileArgs args; readonly Animation anim; - - ContrailRenderable trail; - WPos pos; - int facing; - - WPos target; - WVec offset; - int ticks; - bool exploded; - readonly int speed; + int ticksToNextSmoke; + ContrailRenderable trail; + + [Sync] WPos pos; + [Sync] int facing; + + [Sync] WPos targetPosition; + [Sync] WVec offset; + [Sync] int ticks; + [Sync] bool exploded; + + [Sync] public Actor SourceActor { get { return args.SourceActor; } } + [Sync] public Target GuidedTarget { get { return args.GuidedTarget; } } + public Missile(MissileInfo info, ProjectileArgs args) { this.info = info; this.args = args; - pos = args.source; - facing = args.facing; + pos = args.Source; + facing = args.Facing; - target = args.passiveTarget; + targetPosition = args.PassiveTarget; // Convert ProjectileArg definitions to world coordinates // TODO: Change the yaml definitions so we don't need this @@ -78,7 +84,7 @@ namespace OpenRA.Mods.RA.Effects speed = info.Speed * 1024 / (5 * Game.CellSize); if (info.Inaccuracy > 0) - offset = WVec.FromPDF(args.sourceActor.World.SharedRandom, 2) * inaccuracy / 1024; + offset = WVec.FromPDF(args.SourceActor.World.SharedRandom, 2) * inaccuracy / 1024; if (info.Image != null) { @@ -88,20 +94,17 @@ namespace OpenRA.Mods.RA.Effects if (info.ContrailLength > 0) { - var color = info.ContrailUsePlayerColor ? ContrailRenderable.ChooseColor(args.sourceActor) : info.ContrailColor; - trail = new ContrailRenderable(args.sourceActor.World, color, info.ContrailLength, info.ContrailDelay, 0); + var color = info.ContrailUsePlayerColor ? ContrailRenderable.ChooseColor(args.SourceActor) : info.ContrailColor; + trail = new ContrailRenderable(args.SourceActor.World, color, info.ContrailLength, info.ContrailDelay, 0); } } - static readonly WRange MissileCloseEnough = new WRange(7 * 1024 / Game.CellSize); - int ticksToNextSmoke; - bool JammedBy(TraitPair tp) { if ((tp.Actor.CenterPosition - pos).HorizontalLengthSquared > tp.Trait.Range * tp.Trait.Range) return false; - if (tp.Actor.Owner.Stances[args.sourceActor.Owner] == Stance.Ally && !tp.Trait.AlliedMissiles) + if (tp.Actor.Owner.Stances[args.SourceActor.Owner] == Stance.Ally && !tp.Trait.AlliedMissiles) return false; return tp.Actor.World.SharedRandom.Next(100 / tp.Trait.Chance) == 0; @@ -120,12 +123,12 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); // Missile tracks target - if (args.guidedTarget.IsValidFor(args.sourceActor)) - target = args.guidedTarget.CenterPosition; + if (args.GuidedTarget.IsValidFor(args.SourceActor)) + targetPosition = args.GuidedTarget.CenterPosition; - var dist = target + offset - pos; + var dist = targetPosition + offset - pos; var desiredFacing = Traits.Util.GetFacing(dist, facing); - var desiredAltitude = target.Z; + var desiredAltitude = targetPosition.Z; var jammed = info.Jammable && world.ActorsWithTrait().Any(j => JammedBy(j)); if (jammed) @@ -133,18 +136,18 @@ namespace OpenRA.Mods.RA.Effects desiredFacing = facing + world.SharedRandom.Next(-20, 21); desiredAltitude = world.SharedRandom.Next(-43, 86); } - else if (!args.guidedTarget.IsValidFor(args.sourceActor)) + else if (!args.GuidedTarget.IsValidFor(args.SourceActor)) desiredFacing = facing; facing = Traits.Util.TickFacing(facing, desiredFacing, info.ROT); var move = new WVec(0, -1024, 0).Rotate(WRot.FromFacing(facing)) * speed / 1024; - if (target.Z > 0 && info.TurboBoost) + if (targetPosition.Z > 0 && info.TurboBoost) move = (move * 3) / 2; if (pos.Z != desiredAltitude) { var delta = move.HorizontalLength * info.MaximumPitch.Tan() / 1024; - var dz = (target.Z - pos.Z).Clamp(-delta, delta); + var dz = (targetPosition.Z - pos.Z).Clamp(-delta, delta); move += new WVec(0, 0, dz); } @@ -159,9 +162,9 @@ namespace OpenRA.Mods.RA.Effects if (info.ContrailLength > 0) trail.Update(pos); - var shouldExplode = pos.Z < 0 // Hit the ground - || dist.LengthSquared < MissileCloseEnough.Range * MissileCloseEnough.Range // Within range - || info.RangeLimit != 0 && ticks > info.RangeLimit // Ran out of fuel + var shouldExplode = (pos.Z < 0) // Hit the ground + || (dist.LengthSquared < MissileCloseEnough.Range * MissileCloseEnough.Range) // Within range + || (info.RangeLimit != 0 && ticks > info.RangeLimit) // Ran out of fuel || (!info.High && world.ActorMap.GetUnitsAt(pos.ToCPos()) .Any(a => a.HasTrait())); // Hit a wall @@ -182,7 +185,7 @@ namespace OpenRA.Mods.RA.Effects if (ticks <= info.Arm) return; - Combat.DoImpacts(pos, args.sourceActor, args.weapon, args.firepowerModifier); + Combat.DoImpacts(pos, args.SourceActor, args.Weapon, args.FirepowerModifier); } public IEnumerable Render(WorldRenderer wr) @@ -190,9 +193,9 @@ namespace OpenRA.Mods.RA.Effects if (info.ContrailLength > 0) yield return trail; - if (!args.sourceActor.World.FogObscures(pos.ToCPos())) + if (!args.SourceActor.World.FogObscures(pos.ToCPos())) { - var palette = wr.Palette(args.weapon.Underwater ? "shadow" : "effect"); + var palette = wr.Palette(args.Weapon.Underwater ? "shadow" : "effect"); foreach (var r in anim.Render(pos, palette)) yield return r; } diff --git a/OpenRA.Mods.RA/Effects/TeslaZap.cs b/OpenRA.Mods.RA/Effects/TeslaZap.cs old mode 100755 new mode 100644 index f4c4a5eae7..73ed23e442 --- a/OpenRA.Mods.RA/Effects/TeslaZap.cs +++ b/OpenRA.Mods.RA/Effects/TeslaZap.cs @@ -48,8 +48,8 @@ namespace OpenRA.Mods.RA.Effects if (!doneDamage) { - var pos = Args.guidedTarget.IsValidFor(Args.sourceActor) ? Args.guidedTarget.CenterPosition : Args.passiveTarget; - Combat.DoImpacts(pos, Args.sourceActor, Args.weapon, Args.firepowerModifier); + var pos = Args.GuidedTarget.IsValidFor(Args.SourceActor) ? Args.GuidedTarget.CenterPosition : Args.PassiveTarget; + Combat.DoImpacts(pos, Args.SourceActor, Args.Weapon, Args.FirepowerModifier); doneDamage = true; } } @@ -58,8 +58,8 @@ namespace OpenRA.Mods.RA.Effects { if (!initialized) { - var pos = Args.guidedTarget.IsValidFor(Args.sourceActor) ? Args.guidedTarget.CenterPosition : Args.passiveTarget; - zap = new TeslaZapRenderable(Args.source, 0, pos - Args.source, Info.Image, Info.BrightZaps, Info.DimZaps); + var pos = Args.GuidedTarget.IsValidFor(Args.SourceActor) ? Args.GuidedTarget.CenterPosition : Args.PassiveTarget; + zap = new TeslaZapRenderable(Args.Source, 0, pos - Args.Source, Info.Image, Info.BrightZaps, Info.DimZaps); } yield return zap; } From aa86eb47aa97ce2a8beeed9b47a8a791cce2a630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 24 Aug 2013 12:10:42 +0200 Subject: [PATCH 3/6] hash Target --- OpenRA.Game/Sync.cs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/OpenRA.Game/Sync.cs b/OpenRA.Game/Sync.cs index 9029849e16..285450fe61 100755 --- a/OpenRA.Game/Sync.cs +++ b/OpenRA.Game/Sync.cs @@ -14,6 +14,7 @@ using System.Linq; using System.Reflection; using System.Reflection.Emit; using OpenRA.FileFormats; +using OpenRA.Traits; namespace OpenRA { @@ -45,6 +46,7 @@ namespace OpenRA {typeof(TypeDictionary), ((Func)hash_tdict).Method}, {typeof(Actor), ((Func)hash_actor).Method}, {typeof(Player), ((Func)hash_player).Method}, + {typeof(Target), ((Func)hash_target).Method}, }; static void EmitSyncOpcodes(Type type, ILGenerator il) @@ -146,6 +148,25 @@ namespace OpenRA return 0; } + public static int hash_target(Target t) + { + switch (t.Type) + { + case TargetType.Actor: + return (int)(t.Actor.ActorID << 16) * 0x567; + + case TargetType.FrozenActor: + return (int)(t.FrozenActor.Actor.ActorID << 16) * 0x567; + + case TargetType.Terrain: + return hash(t.CenterPosition); + + default: + case TargetType.Invalid: + return 0; + } + } + public static int hash(T t) { return t.GetHashCode(); From 8e4ef0462dfbd9a4070912a369c2656f64b44a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 24 Aug 2013 13:13:33 +0200 Subject: [PATCH 4/6] StyleCop clean Actor --- OpenRA.Game/Actor.cs | 76 ++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index 936e4a0b9d..e9adebf8dd 100755 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -26,7 +26,7 @@ namespace OpenRA public readonly uint ActorID; Lazy occupySpace; - Lazy Facing; + Lazy facing; public Cached Bounds; public Cached ExtendedBounds; @@ -42,8 +42,8 @@ namespace OpenRA get { // TODO: Support non-zero pitch/roll in IFacing (IOrientation?) - var facing = Facing.Value != null ? Facing.Value.Facing : 0; - return new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facing)); + var facingValue = facing.Value != null ? facing.Value.Facing : 0; + return new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facingValue)); } } @@ -60,7 +60,7 @@ namespace OpenRA World = world; ActorID = world.NextAID(); if (initDict.Contains()) - Owner = init.Get(); + Owner = init.Get(); occupySpace = Lazy.New(() => TraitOrDefault()); @@ -74,9 +74,9 @@ namespace OpenRA AddTrait(trait.Create(init)); } - Facing = Lazy.New(() => TraitOrDefault()); + facing = Lazy.New(() => TraitOrDefault()); - Size = Lazy.New(() => + size = Lazy.New(() => { var si = Info.Traits.GetOrDefault(); if (si != null && si.Bounds != null) @@ -85,8 +85,8 @@ namespace OpenRA return TraitsImplementing().Select(x => x.SelectionSize(this)).FirstOrDefault(); }); - ApplyIRender = (x, wr) => x.Render(this, wr); - ApplyRenderModifier = (m, p, wr) => p.ModifyRender(this, wr, m); + applyIRender = (x, wr) => x.Render(this, wr); + applyRenderModifier = (m, p, wr) => p.ModifyRender(this, wr, m); Bounds = Cached.New(() => CalculateBounds(false)); ExtendedBounds = Cached.New(() => CalculateBounds(true)); @@ -105,16 +105,16 @@ namespace OpenRA get { return currentActivity == null; } } - OpenRA.FileFormats.Lazy Size; + OpenRA.FileFormats.Lazy size; // note: these delegates are cached to avoid massive allocation. - Func> ApplyIRender; - Func, IRenderModifier, WorldRenderer, IEnumerable> ApplyRenderModifier; + Func> applyIRender; + Func, IRenderModifier, WorldRenderer, IEnumerable> applyRenderModifier; public IEnumerable Render(WorldRenderer wr) { var mods = TraitsImplementing(); - var sprites = TraitsImplementing().SelectMany(x => ApplyIRender(x, wr)); - return mods.Aggregate(sprites, (m,p) => ApplyRenderModifier(m,p,wr)); + var sprites = TraitsImplementing().SelectMany(x => applyIRender(x, wr)); + return mods.Aggregate(sprites, (m, p) => applyRenderModifier(m, p, wr)); } // When useAltitude = true, the bounding box is extended @@ -123,8 +123,8 @@ namespace OpenRA // at its current altitude Rectangle CalculateBounds(bool useAltitude) { - var size = (PVecInt)(Size.Value); - var loc = CenterLocation - size / 2; + var sizeVector = (PVecInt)size.Value; + var loc = CenterLocation - sizeVector / 2; var si = Info.Traits.GetOrDefault(); if (si != null && si.Bounds != null && si.Bounds.Length > 2) @@ -139,33 +139,33 @@ namespace OpenRA loc -= new PVecInt(0, altitude); if (useAltitude) - size = new PVecInt(size.X, size.Y + altitude); + sizeVector = new PVecInt(sizeVector.X, sizeVector.Y + altitude); } - return new Rectangle(loc.X, loc.Y, size.X, size.Y); + return new Rectangle(loc.X, loc.Y, sizeVector.X, sizeVector.Y); } public bool IsInWorld { get; internal set; } - public void QueueActivity( bool queued, Activity nextActivity ) + public void QueueActivity(bool queued, Activity nextActivity) { - if( !queued ) + if (!queued) CancelActivity(); - QueueActivity( nextActivity ); + QueueActivity(nextActivity); } - public void QueueActivity( Activity nextActivity ) + public void QueueActivity(Activity nextActivity) { - if( currentActivity == null ) + if (currentActivity == null) currentActivity = nextActivity; else - currentActivity.Queue( nextActivity ); + currentActivity.Queue(nextActivity); } public void CancelActivity() { - if( currentActivity != null ) - currentActivity.Cancel( this ); + if (currentActivity != null) + currentActivity.Cancel(this); } public Activity GetCurrentActivity() @@ -178,54 +178,54 @@ namespace OpenRA return (int)ActorID; } - public override bool Equals( object obj ) + public override bool Equals(object obj) { var o = obj as Actor; - return ( o != null && o.ActorID == ActorID ); + return o != null && o.ActorID == ActorID; } public override string ToString() { - return "{0} {1}{2}".F( Info.Name, ActorID, IsInWorld ? "" : " (not in world)" ); + return "{0} {1}{2}".F(Info.Name, ActorID, IsInWorld ? "" : " (not in world)"); } public T Trait() { - return World.traitDict.Get( this ); + return World.traitDict.Get(this); } public T TraitOrDefault() { - return World.traitDict.GetOrDefault( this ); + return World.traitDict.GetOrDefault(this); } public IEnumerable TraitsImplementing() { - return World.traitDict.WithInterface( this ); + return World.traitDict.WithInterface(this); } public bool HasTrait() { - return World.traitDict.Contains( this ); + return World.traitDict.Contains(this); } - public void AddTrait( object trait ) + public void AddTrait(object trait) { - World.traitDict.AddTrait( this, trait ); + World.traitDict.AddTrait(this, trait); } public bool Destroyed { get; private set; } public void Destroy() { - World.AddFrameEndTask( w => + World.AddFrameEndTask(w => { if (Destroyed) return; - World.Remove( this ); - World.traitDict.RemoveActor( this ); + World.Remove(this); + World.traitDict.RemoveActor(this); Destroyed = true; - } ); + }); } // TODO: move elsewhere. From 4fd647bc5d8df1ee3145d3da782da564871ca3f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 24 Aug 2013 13:26:07 +0200 Subject: [PATCH 5/6] ToString() for Target --- OpenRA.Game/Traits/Target.cs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/OpenRA.Game/Traits/Target.cs b/OpenRA.Game/Traits/Target.cs index 50e17d9fab..0dd0997faa 100644 --- a/OpenRA.Game/Traits/Target.cs +++ b/OpenRA.Game/Traits/Target.cs @@ -141,5 +141,24 @@ namespace OpenRA.Traits return Positions.Any(t => (t - origin).HorizontalLengthSquared <= rangeSquared); } + public override string ToString() + { + switch (Type) + { + case TargetType.Actor: + return actor.ToString(); + + case TargetType.FrozenActor: + return frozen.ToString(); + + case TargetType.Terrain: + return pos.ToString(); + + default: + case TargetType.Invalid: + return "Invalid"; + } + } + } } From aa9408ca9e78e9a8bec260cb3752975d3665545d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 24 Aug 2013 13:26:38 +0200 Subject: [PATCH 6/6] ToString() for FrozenActor --- OpenRA.Game/Traits/Player/FrozenActorLayer.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/OpenRA.Game/Traits/Player/FrozenActorLayer.cs b/OpenRA.Game/Traits/Player/FrozenActorLayer.cs index bbb099ca2d..20521cd096 100755 --- a/OpenRA.Game/Traits/Player/FrozenActorLayer.cs +++ b/OpenRA.Game/Traits/Player/FrozenActorLayer.cs @@ -86,6 +86,11 @@ namespace OpenRA.Traits } public bool HasRenderables { get { return Renderables != null; } } + + public override string ToString() + { + return "{0} {1}{2}".F(Info.Name, ID, IsValid ? "" : " (invalid)"); + } } public class FrozenActorLayer : IRender, ITick, ISync