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

Dissolve Render namespace

Browse Source
This commit is contained in:
reaperrr
2014-12-25 23:40:40 +01:00
parent 51fe951cd6
commit 2054e41552
42 changed files with 43 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs
View File

@@ -14,7 +14,6 @@ using OpenRA.GameRules;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits

2
OpenRA.Mods.Cnc/Traits/Render/WithDeliveryAnimation.cs
View File

@@ -8,7 +8,7 @@
*/
#endregion
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -170,7 +170,9 @@
<Compile Include="Traits\Render\RenderUnit.cs" />
<Compile Include="Traits\Render\TimedUpgradeBar.cs" />
<Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
<Compile Include="Traits\Render\WithCrateBody.cs" />
<Compile Include="Traits\Render\WithDeathAnimation.cs" />
<Compile Include="Traits\Render\WithHarvestAnimation.cs" />
<Compile Include="Traits\Render\WithResources.cs" />
<Compile Include="Traits\Render\WithRotor.cs" />
<Compile Include="Traits\Render\WithShadow.cs" />

3
OpenRA.Mods.RA/Render/WithCrateBody.cs → OpenRA.Mods.Common/Traits/Render/WithCrateBody.cs Executable file → Normal file
View File

@@ -11,10 +11,9 @@
using System;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.Common.Traits
{
[Desc("Renders crates with both water and land variants.")]
class WithCrateBodyInfo : ITraitInfo, Requires<RenderSpritesInfo>

11
OpenRA.Mods.RA/Render/WithHarvestAnimation.cs → OpenRA.Mods.Common/Traits/Render/WithHarvestAnimation.cs
View File

@@ -10,10 +10,9 @@
using OpenRA.Graphics;
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.Common.Traits
{
[Desc("Displays an overlay whenever resources are harvested by the actor.")]
class WithHarvestAnimationInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
@@ -45,7 +44,7 @@ namespace OpenRA.Mods.RA.Render
() => body.LocalToWorld(info.Offset.Rotate(body.QuantizeOrientation(self, self.Orientation))),
() => !visible,
() => false,
p => WithTurret.ZOffsetFromCenter(self, p, 0)));
p => ZOffsetFromCenter(self, p, 0)));
}
public void Harvested(Actor self, ResourceType resource)
@@ -60,5 +59,11 @@ namespace OpenRA.Mods.RA.Render
public void MovingToResources(Actor self, CPos targetCell, Activity next) { }
public void MovingToRefinery(Actor self, CPos targetCell, Activity next) { }
public void MovementCancelled(Actor self) { }
static public int ZOffsetFromCenter(Actor self, WPos pos, int offset)
{
var delta = self.CenterPosition - pos;
return delta.Y + delta.Z + offset;
}
}
}

1
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -21,6 +21,7 @@ namespace OpenRA.Mods.Common.Traits
}
public interface INotifyChat { bool OnChat(string from, string message); }
public interface INotifyParachuteLanded { void OnLanded(); }
public interface IRenderActorPreviewInfo { IEnumerable<IActorPreview> RenderPreview(ActorPreviewInitializer init); }
public interface ICruiseAltitudeInfo { WRange GetCruiseAltitude(); }

1
OpenRA.Mods.RA/Activities/Leap.cs
View File

@@ -13,7 +13,6 @@ using System.Linq;
using OpenRA.Activities;
using OpenRA.GameRules;
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities

2
OpenRA.Mods.RA/Activities/Rearm.cs
View File

@@ -10,7 +10,7 @@
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Activities

1
OpenRA.Mods.RA/Activities/Teleport.cs
View File

@@ -12,7 +12,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Activities;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;

2
OpenRA.Mods.RA/Attack/AttackCharge.cs
View File

@@ -10,7 +10,7 @@
using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

2
OpenRA.Mods.RA/Attack/AttackGarrisoned.cs
View File

@@ -14,7 +14,7 @@ using System.Linq;
using OpenRA.Activities;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

1
OpenRA.Mods.RA/Buildings/Building.cs
View File

@@ -12,7 +12,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Primitives;
using OpenRA.Traits;

1
OpenRA.Mods.RA/Effects/Parachute.cs
View File

@@ -12,6 +12,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Effects

2
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -336,7 +336,6 @@
<Compile Include="Render\WithTurret.cs" />
<Compile Include="Render\WithBarrel.cs" />
<Compile Include="Widgets\Logic\CreditsLogic.cs" />
<Compile Include="Render\WithHarvestAnimation.cs" />
<Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
<Compile Include="Widgets\Logic\WorldTooltipLogic.cs" />
<Compile Include="Buildings\Bib.cs" />
@@ -347,7 +346,6 @@
<Compile Include="AI\States\AirStates.cs" />
<Compile Include="Widgets\Logic\InstallLogic.cs" />
<Compile Include="CombatDebugOverlay.cs" />
<Compile Include="Render\WithCrateBody.cs" />
<Compile Include="Widgets\Logic\GameTimerLogic.cs" />
<Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
<Compile Include="Attack\AttackFollow.cs" />

3
OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
View File

@@ -14,10 +14,9 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Orders
{

3
OpenRA.Mods.RA/Parachutable.cs
View File

@@ -9,7 +9,8 @@
#endregion
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.RA.Render;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA

3
OpenRA.Mods.RA/Render/Hovers.cs
View File

@@ -13,10 +13,9 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Changes the visual Z position periodically.")]
class HoversInfo : ITraitInfo, Requires<IMoveInfo>

3
OpenRA.Mods.RA/Render/RenderBuilding.cs
View File

@@ -13,10 +13,9 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
public class RenderBuildingInfo : RenderSimpleInfo, Requires<BuildingInfo>, IPlaceBuildingDecoration
{

2
OpenRA.Mods.RA/Render/RenderBuildingCharge.cs
View File

@@ -8,7 +8,7 @@
*/
#endregion
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Used for tesla coil and obelisk.")]
public class RenderBuildingChargeInfo : RenderBuildingInfo

4
OpenRA.Mods.RA/Render/RenderBuildingSilo.cs
View File

@@ -10,11 +10,11 @@
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
using OpenRA.Mods.Common.Graphics;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
class RenderBuildingSiloInfo : RenderBuildingInfo
{

2
OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
class RenderBuildingTurretedInfo : RenderBuildingInfo, Requires<TurretedInfo>
{

2
OpenRA.Mods.RA/Render/RenderBuildingWall.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
class RenderBuildingWallInfo : RenderBuildingInfo
{

3
OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
View File

@@ -13,10 +13,9 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
class RenderBuildingWarFactoryInfo : RenderBuildingInfo
{

2
OpenRA.Mods.RA/Render/RenderDisguise.cs
View File

@@ -10,7 +10,7 @@
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
class RenderDisguiseInfo : RenderInfantryInfo, Requires<DisguiseInfo>
{

3
OpenRA.Mods.RA/Render/RenderHarvester.cs
View File

@@ -11,10 +11,9 @@
using OpenRA.Activities;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
class RenderHarvesterInfo : RenderUnitInfo, Requires<HarvesterInfo>
{

4
OpenRA.Mods.RA/Render/RenderInfantry.cs
View File

@@ -10,12 +10,12 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
public class RenderInfantryInfo : RenderSimpleInfo, Requires<IMoveInfo>
{

2
OpenRA.Mods.RA/Render/RenderLandingCraft.cs
View File

@@ -12,7 +12,7 @@ using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
public class RenderLandingCraftInfo : RenderUnitInfo, Requires<IMoveInfo>, Requires<CargoInfo>
{

2
OpenRA.Mods.RA/Render/RenderUnitReload.cs
View File

@@ -12,7 +12,7 @@ using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
class RenderUnitReloadInfo : RenderUnitInfo, Requires<ArmamentInfo>, Requires<AttackBaseInfo>
{

2
OpenRA.Mods.RA/Render/WithActiveAnimation.cs
View File

@@ -13,7 +13,7 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Replaces the idle animation of a building.")]
public class WithActiveAnimationInfo : ITraitInfo, Requires<RenderBuildingInfo>

2
OpenRA.Mods.RA/Render/WithBarrel.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Renders barrels for units with the Turreted trait.")]
class WithBarrelInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>

3
OpenRA.Mods.RA/Render/WithBuildingExplosion.cs
View File

@@ -8,11 +8,10 @@
*/
#endregion
using OpenRA.Mods.RA.Traits;
using OpenRA.Mods.Common.Effects;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Display explosions over the building footprint when it is destroyed.")]
class WithBuildingExplosionInfo : ITraitInfo, Requires<BuildingInfo>

3
OpenRA.Mods.RA/Render/WithIdleOverlay.cs
View File

@@ -13,10 +13,9 @@ using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Renders a decorative animation on units and buildings.")]
public class WithIdleOverlayInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>

3
OpenRA.Mods.RA/Render/WithMakeAnimation.cs
View File

@@ -13,10 +13,9 @@ using System.Linq;
using OpenRA.Activities;
using OpenRA.Graphics;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
public class WithMakeAnimationInfo : ITraitInfo, Requires<BuildingInfo>, Requires<RenderBuildingInfo>
{

3
OpenRA.Mods.RA/Render/WithMuzzleFlash.cs
View File

@@ -13,10 +13,9 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Renders the MuzzleSequence from the Armament trait.")]
class WithMuzzleFlashInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<AttackBaseInfo>, Requires<ArmamentInfo>

2
OpenRA.Mods.RA/Render/WithRepairAnimation.cs
View File

@@ -12,7 +12,7 @@ using System.Collections.Generic;
using System.Linq;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Replaces the building animation when it repairs a unit.")]
public class WithRepairAnimationInfo : ITraitInfo, Requires<RenderBuildingInfo>

3
OpenRA.Mods.RA/Render/WithRepairOverlay.cs
View File

@@ -12,10 +12,9 @@ using System.Linq;
using OpenRA.Effects;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Displays an overlay when the building is being repaired by the player.")]
public class WithRepairOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>

2
OpenRA.Mods.RA/Render/WithTurret.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Render
namespace OpenRA.Mods.RA.Traits
{
[Desc("Renders turrets for units with the Turreted trait.")]
class WithTurretInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<TurretedInfo>, Requires<IBodyOrientationInfo>

1
OpenRA.Mods.RA/Sellable.cs
View File

@@ -11,7 +11,6 @@
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits

1
OpenRA.Mods.RA/SupportPowers/GrantUpgradePower.cs
View File

@@ -13,7 +13,6 @@ using System.Drawing;
using System.Linq;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits

1
OpenRA.Mods.RA/Traits/Buildings/OreRefinery.cs
View File

@@ -14,7 +14,6 @@ using OpenRA.Activities;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Effects;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits

1
OpenRA.Mods.RA/TraitsInterfaces.cs
View File

@@ -27,6 +27,5 @@ namespace OpenRA.Mods.RA
void OnDock(Actor self, Actor harv, DeliverResources dockOrder);
}
public interface INotifyParachuteLanded { void OnLanded(); }
public interface INotifyAttack { void Attacking(Actor self, Target target, Armament a, Barrel barrel); }
}

1
OpenRA.Mods.RA/Transforms.cs
View File

@@ -13,7 +13,6 @@ using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Orders;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Render;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits